summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-04-09 10:54:53 +0200
committerLukas Reschke <lukas@owncloud.com>2015-04-09 10:54:53 +0200
commit4ca64194755fb5447885e7d9897c63737ee0d161 (patch)
tree105542dae3c60eb7ac1271fe564fc9e8dea18b82 /apps
parent3aad47c0f0b83f7015d5eccbf4b44f1afaa5d567 (diff)
downloadnextcloud-server-4ca64194755fb5447885e7d9897c63737ee0d161.tar.gz
nextcloud-server-4ca64194755fb5447885e7d9897c63737ee0d161.zip
Fix PHPDoc
Diffstat (limited to 'apps')
-rw-r--r--apps/encryption/appinfo/application.php15
-rw-r--r--apps/encryption/lib/crypto/encryption.php5
-rw-r--r--apps/encryption/lib/hookmanager.php4
-rw-r--r--apps/encryption/lib/session.php4
-rw-r--r--apps/encryption/lib/users/setup.php14
5 files changed, 20 insertions, 22 deletions
diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index 6f4e22bdd68..34845ecf1e8 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -3,6 +3,7 @@
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Lukas Reschke <lukas@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
@@ -49,7 +50,6 @@ class Application extends \OCP\AppFramework\App {
private $config;
/**
- * @param $appName
* @param array $urlParams
*/
public function __construct($urlParams = array()) {
@@ -59,9 +59,6 @@ class Application extends \OCP\AppFramework\App {
$this->registerServices();
}
- /**
- *
- */
public function registerHooks() {
if (!$this->config->getSystemValue('maintenance', false)) {
@@ -89,9 +86,6 @@ class Application extends \OCP\AppFramework\App {
}
}
- /**
- *
- */
public function registerEncryptionModule() {
$container = $this->getContainer();
$container->registerService('EncryptionModule', function (IAppContainer $c) {
@@ -104,9 +98,6 @@ class Application extends \OCP\AppFramework\App {
$this->encryptionManager->registerEncryptionModule($module);
}
- /**
- *
- */
public function registerServices() {
$container = $this->getContainer();
@@ -132,7 +123,6 @@ class Application extends \OCP\AppFramework\App {
);
});
-
$container->registerService('Recovery',
function (IAppContainer $c) {
$server = $c->getServer();
@@ -181,9 +171,6 @@ class Application extends \OCP\AppFramework\App {
}
- /**
- *
- */
public function registerSettings() {
// Register settings scripts
App::registerAdmin('encryption', 'settings/settings-admin');
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 04b7b83b0c2..adf57d35e80 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -3,6 +3,7 @@
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Lukas Reschke <lukas@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
@@ -327,6 +328,10 @@ class Encryption implements IEncryptionModule {
return 6126;
}
+ /**
+ * @param string $path
+ * @return string
+ */
protected function getPathToRealFile($path) {
$realPath = $path;
$parts = explode('/', $path);
diff --git a/apps/encryption/lib/hookmanager.php b/apps/encryption/lib/hookmanager.php
index 0094bc54e7f..4b885cd7f64 100644
--- a/apps/encryption/lib/hookmanager.php
+++ b/apps/encryption/lib/hookmanager.php
@@ -2,6 +2,7 @@
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
@@ -49,9 +50,6 @@ class HookManager {
return true;
}
- /**
- *
- */
public function fireHooks() {
foreach ($this->hookInstances as $instance) {
/**
diff --git a/apps/encryption/lib/session.php b/apps/encryption/lib/session.php
index 2b79e71df49..85d2a7698ef 100644
--- a/apps/encryption/lib/session.php
+++ b/apps/encryption/lib/session.php
@@ -2,6 +2,7 @@
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
@@ -33,6 +34,9 @@ class Session {
const INIT_EXECUTED = '1';
const INIT_SUCCESSFUL = '2';
+ /**
+ * @param ISession $session
+ */
public function __construct(ISession $session) {
$this->session = $session;
}
diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/users/setup.php
index 1c4214f173c..2ec49b5c7fb 100644
--- a/apps/encryption/lib/users/setup.php
+++ b/apps/encryption/lib/users/setup.php
@@ -2,6 +2,7 @@
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
@@ -53,7 +54,10 @@ class Setup {
* @param Crypt $crypt
* @param KeyManager $keyManager
*/
- public function __construct(ILogger $logger, IUserSession $userSession, Crypt $crypt, KeyManager $keyManager) {
+ public function __construct(ILogger $logger,
+ IUserSession $userSession,
+ Crypt $crypt,
+ KeyManager $keyManager) {
$this->logger = $logger;
$this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
$this->crypt = $crypt;
@@ -61,8 +65,8 @@ class Setup {
}
/**
- * @param $uid userid
- * @param $password user password
+ * @param string $uid userid
+ * @param string $password user password
* @return bool
*/
public function setupUser($uid, $password) {
@@ -70,8 +74,8 @@ class Setup {
}
/**
- * @param $uid userid
- * @param $password user password
+ * @param string $uid userid
+ * @param string $password user password
* @return bool
*/
public function setupServerSide($uid, $password) {