PHPDoc cleanup - clean code \o/

4 files changed, 24 insertions, 22 deletions

diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php
index 54d587715bf..6312d8813e3 100644
--- a/lib/private/encryption/util.php
+++ b/lib/private/encryption/util.php
@@ -57,7 +57,7 @@ class Util {
 	/** @var array */
 	protected $ocHeaderKeys;
 
-	/** @var Manager */
+	/** @var \OC\User\Manager */
 	protected $userManager;
 
 	/** @var IConfig */
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 946e7bfbe40..bc0b5c87adc 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -394,7 +394,7 @@ class Encryption extends Wrapper {
 	}
 
 	/**
-	 * @param string $encryptionModule
+	 * @param string $encryptionModuleId
 	 * @return \OCP\Encryption\Keys\IStorage
 	 */
 	protected function getKeyStorage($encryptionModuleId) {
diff --git a/lib/private/hook.php b/lib/private/hook.php
index 824bb725077..c4ea1999b09 100644
--- a/lib/private/hook.php
+++ b/lib/private/hook.php
@@ -32,38 +32,39 @@ class OC_Hook{
 
 	/**
 	 * connects a function to a hook
-	 * @param string $signalclass class name of emitter
-	 * @param string $signalname name of signal
-	 * @param string $slotclass class name of slot
-	 * @param string $slotname name of slot
+	 *
+	 * @param string $signalClass class name of emitter
+	 * @param string $signalName name of signal
+	 * @param string|object $slotClass class name of slot
+	 * @param string $slotName name of slot
 	 * @return bool
 	 *
 	 * This function makes it very easy to connect to use hooks.
 	 *
 	 * TODO: write example
 	 */
-	static public function connect( $signalclass, $signalname, $slotclass, $slotname ) {
+	static public function connect($signalClass, $signalName, $slotClass, $slotName ) {
 		// If we're trying to connect to an emitting class that isn't
 		// yet registered, register it
-		if( !array_key_exists( $signalclass, self::$registered )) {
-			self::$registered[$signalclass] = array();
+		if( !array_key_exists($signalClass, self::$registered )) {
+			self::$registered[$signalClass] = array();
 		}
 		// If we're trying to connect to an emitting method that isn't
 		// yet registered, register it with the emitting class
-		if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {
-			self::$registered[$signalclass][$signalname] = array();
+		if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
+			self::$registered[$signalClass][$signalName] = array();
 		}
 
 		// dont connect hooks twice
-		foreach (self::$registered[$signalclass][$signalname] as $hook) {
-			if ($hook['class'] === $slotclass and $hook['name'] === $slotname) {
+		foreach (self::$registered[$signalClass][$signalName] as $hook) {
+			if ($hook['class'] === $slotClass and $hook['name'] === $slotName) {
 				return false;
 			}
 		}
 		// Connect the hook handler to the requested emitter
-		self::$registered[$signalclass][$signalname][] = array(
-				"class" => $slotclass,
-				"name" => $slotname
+		self::$registered[$signalClass][$signalName][] = array(
+				"class" => $slotClass,
+				"name" => $slotName
 		);
 
 		// No chance for failure ;-)
diff --git a/lib/public/util.php b/lib/public/util.php
index 37cb1b54485..721bcaadb62 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -394,18 +394,19 @@ class Util {
 
 	/**
 	 * connects a function to a hook
-	 * @param string $signalclass class name of emitter
-	 * @param string $signalname name of signal
-	 * @param string $slotclass class name of slot
-	 * @param string $slotname name of slot
+	 *
+	 * @param string $signalClass class name of emitter
+	 * @param string $signalName name of signal
+	 * @param string|object $slotClass class name of slot
+	 * @param string $slotName name of slot
 	 * @return bool
 	 *
 	 * This function makes it very easy to connect to use hooks.
 	 *
 	 * TODO: write example
 	 */
-	static public function connectHook( $signalclass, $signalname, $slotclass, $slotname ) {
-		return(\OC_Hook::connect( $signalclass, $signalname, $slotclass, $slotname ));
+	static public function connectHook($signalClass, $signalName, $slotClass, $slotName ) {
+		return(\OC_Hook::connect($signalClass, $signalName, $slotClass, $slotName ));
 	}
 
 	/**