jenkins-bot has submitted this change and it was merged.
Change subject: Fix various type and reference issues
......................................................................
Fix various type and reference issues
Change-Id: Iced174d9f94faf80c5fa21e15fa6c81b6d8fa21c
---
M includes/filebackend/SwiftFileBackend.php
M includes/filebackend/TempFSFile.php
M includes/filebackend/lockmanager/FSLockManager.php
M includes/filebackend/lockmanager/LockManager.php
M includes/filebackend/lockmanager/MemcLockManager.php
M includes/filebackend/lockmanager/RedisLockManager.php
6 files changed, 11 insertions(+), 10 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filebackend/SwiftFileBackend.php
b/includes/filebackend/SwiftFileBackend.php
index 5c9fdc2..c5111e2 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -1090,7 +1090,8 @@
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 c0070ca..611fab9 100644
--- a/includes/filebackend/TempFSFile.php
+++ b/includes/filebackend/TempFSFile.php
@@ -85,7 +85,7 @@
/**
* 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 e97ec11..bce6b34 100644
--- a/includes/filebackend/lockmanager/FSLockManager.php
+++ b/includes/filebackend/lockmanager/FSLockManager.php
@@ -102,7 +102,7 @@
/**
* Lock a single resource key
*
- * @param array $path
+ * @param string $path
* @param int $type
* @return Status
*/
@@ -147,7 +147,7 @@
/**
* 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 7e06e48..df8d2d4 100644
--- a/includes/filebackend/lockmanager/LockManager.php
+++ b/includes/filebackend/lockmanager/LockManager.php
@@ -204,8 +204,8 @@
$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 254c693..ccf8613 100644
--- a/includes/filebackend/lockmanager/MemcLockManager.php
+++ b/includes/filebackend/lockmanager/MemcLockManager.php
@@ -100,8 +100,8 @@
? 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 5540f61..9d5612a 100644
--- a/includes/filebackend/lockmanager/RedisLockManager.php
+++ b/includes/filebackend/lockmanager/RedisLockManager.php
@@ -90,8 +90,8 @@
? 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;
}
--
To view, visit https://gerrit.wikimedia.org/r/97323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iced174d9f94faf80c5fa21e15fa6c81b6d8fa21c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: IAlex <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
