diff options
| author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2013-11-23 19:48:43 +0100 |
|---|---|---|
| committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2013-11-23 20:50:02 +0100 |
| commit | 8f90b1cfa8bf0622ed06d796b4f8db684ed59aaf (patch) | |
| tree | 464e8c5887f50f5683d31ec05fec882b9ee6721f /includes/filebackend/lockmanager | |
| parent | de908e1baed206f755d3a911f66a8f073aa1d8da (diff) | |
| download | mediawikicore-8f90b1cfa8bf0622ed06d796b4f8db684ed59aaf.tar.gz mediawikicore-8f90b1cfa8bf0622ed06d796b4f8db684ed59aaf.zip | |
Fix various type and reference issues
Change-Id: Iced174d9f94faf80c5fa21e15fa6c81b6d8fa21c
Diffstat (limited to 'includes/filebackend/lockmanager')
4 files changed, 8 insertions, 8 deletions
diff --git a/includes/filebackend/lockmanager/FSLockManager.php b/includes/filebackend/lockmanager/FSLockManager.php index e97ec114aab5..bce6b34c08e5 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 7e06e489da24..df8d2d4f0c56 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 254c69328fb2..ccf8613f03bc 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 5540f61355b3..9d5612a313ec 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; } |