Fix PHPDoc

diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index 6f4e22bdd68c35380064be70bfb96caf0a0e73e2..34845ecf1e8b4d07ed1e3cb712424c24bea76013 100644 (file)
--- 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 04b7b83b0c2ae5861efe04a275bef2a139a3e667..adf57d35e80b53cd1acd576432f1ffd9fcec81a3 100644 (file)
--- 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 0094bc54e7ff567db6da4c2b46bd6f2196139f27..4b885cd7f644d1809fcd7f08bd85889df4a39f0a 100644 (file)
--- 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 2b79e71df49d069d8ef2b89fc504679f574fa824..85d2a7698ef579bb32cfbe3fa4f5b69d912c3db0 100644 (file)
--- 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 1c4214f173c4cd46b1c2271ef0ceccccec5a2d83..2ec49b5c7fb0987ebcdc7126742ffa7fc209cbb2 100644 (file)
--- 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) {