From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 23 Nov 2013 18:48:43 +0000 (+0100)
Subject: Fix various type and reference issues
X-Git-Tag: 1.31.0-rc.0~17929^2
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=8f90b1cfa8bf0622ed06d796b4f8db684ed59aaf;p=lhc%2Fweb%2Fwiklou.git

Fix various type and reference issues

Change-Id: Iced174d9f94faf80c5fa21e15fa6c81b6d8fa21c
---

diff --git a/includes/filebackend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php
index 5c9fdc2c14..c5111e2c64 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -1090,7 +1090,8 @@ class SwiftFileBackend extends FileBackendStore {
 		try {
 			$container = $this->getContainer( $fullCont );
 			$prefix = ( $dir == '' ) ? null : "{$dir}/";
-			$objects = array(); // list of unfiltered names or CF_Object items
+
+			// $objects will contain a list of unfiltered names or CF_Object items
 			// Non-recursive: only list files right under $dir
 			if ( !empty( $params['topOnly'] ) ) {
 				if ( !empty( $params['adviseStat'] ) ) {
diff --git a/includes/filebackend/TempFSFile.php b/includes/filebackend/TempFSFile.php
index c0070ca850..611fab9afd 100644
--- a/includes/filebackend/TempFSFile.php
+++ b/includes/filebackend/TempFSFile.php
@@ -85,7 +85,7 @@ class TempFSFile extends FSFile {
 	/**
 	 * Clean up the temporary file only after an object goes out of scope
 	 *
-	 * @param Object $object
+	 * @param stdClass $object
 	 * @return TempFSFile This object
 	 */
 	public function bind( $object ) {
diff --git a/includes/filebackend/lockmanager/FSLockManager.php b/includes/filebackend/lockmanager/FSLockManager.php
index e97ec114aa..bce6b34c08 100644
--- a/includes/filebackend/lockmanager/FSLockManager.php
+++ b/includes/filebackend/lockmanager/FSLockManager.php
@@ -102,7 +102,7 @@ class FSLockManager extends LockManager {
 	/**
 	 * Lock a single resource key
 	 *
-	 * @param array $path
+	 * @param string $path
 	 * @param int $type
 	 * @return Status
 	 */
@@ -147,7 +147,7 @@ class FSLockManager extends LockManager {
 	/**
 	 * Unlock a single resource key
 	 *
-	 * @param array $path
+	 * @param string $path
 	 * @param int $type
 	 * @return Status
 	 */
diff --git a/includes/filebackend/lockmanager/LockManager.php b/includes/filebackend/lockmanager/LockManager.php
index 7e06e489da..df8d2d4f0c 100644
--- a/includes/filebackend/lockmanager/LockManager.php
+++ b/includes/filebackend/lockmanager/LockManager.php
@@ -204,8 +204,8 @@ abstract class LockManager {
 				$lockedByType[$type] = $paths;
 			} else {
 				// Release the subset of locks that were acquired
-				foreach ( $lockedByType as $type => $paths ) {
-					$status->merge( $this->doUnlock( $paths, $type ) );
+				foreach ( $lockedByType as $lType => $lPaths ) {
+					$status->merge( $this->doUnlock( $lPaths, $lType ) );
 				}
 				break;
 			}
diff --git a/includes/filebackend/lockmanager/MemcLockManager.php b/includes/filebackend/lockmanager/MemcLockManager.php
index 254c69328f..ccf8613f03 100644
--- a/includes/filebackend/lockmanager/MemcLockManager.php
+++ b/includes/filebackend/lockmanager/MemcLockManager.php
@@ -100,8 +100,8 @@ class MemcLockManager extends QuorumLockManager {
 					? array_merge( $lockedPaths[$type], $paths )
 					: $paths;
 			} else {
-				foreach ( $lockedPaths as $type => $paths ) {
-					$status->merge( $this->doFreeLocksOnServer( $lockSrv, $paths, $type ) );
+				foreach ( $lockedPaths as $lType => $lPaths ) {
+					$status->merge( $this->doFreeLocksOnServer( $lockSrv, $lPaths, $lType ) );
 				}
 				break;
 			}
diff --git a/includes/filebackend/lockmanager/RedisLockManager.php b/includes/filebackend/lockmanager/RedisLockManager.php
index 5540f61355..9d5612a313 100644
--- a/includes/filebackend/lockmanager/RedisLockManager.php
+++ b/includes/filebackend/lockmanager/RedisLockManager.php
@@ -90,8 +90,8 @@ class RedisLockManager extends QuorumLockManager {
 					? array_merge( $lockedPaths[$type], $paths )
 					: $paths;
 			} else {
-				foreach ( $lockedPaths as $type => $paths ) {
-					$status->merge( $this->doFreeLocksOnServer( $lockSrv, $paths, $type ) );
+				foreach ( $lockedPaths as $lType => $lPaths ) {
+					$status->merge( $this->doFreeLocksOnServer( $lockSrv, $lPaths, $lType ) );
 				}
 				break;
 			}