From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 29 Dec 2015 09:34:22 +0000 (-0800)
Subject: Fix some FileOpBatch IDEA errors
X-Git-Tag: 1.31.0-rc.0~8511^2
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=d1f9b125f9cbead6aa75cda85ce7d8704114b1b4;p=lhc%2Fweb%2Fwiklou.git

Fix some FileOpBatch IDEA errors

Change-Id: Idd670054b2e257255da18bb8e7048ea9041be269
---

diff --git a/includes/filebackend/FileOpBatch.php b/includes/filebackend/FileOpBatch.php
index faa1314422..95a78977f0 100644
--- a/includes/filebackend/FileOpBatch.php
+++ b/includes/filebackend/FileOpBatch.php
@@ -49,7 +49,7 @@ class FileOpBatch {
 	 *   - a) unexpected operation errors occurred (network partitions, disk full...)
 	 *   - b) significant operation errors occurred and 'force' was not set
 	 *
-	 * @param array $performOps List of FileOp operations
+	 * @param FileOp[] $performOps List of FileOp operations
 	 * @param array $opts Batch operation options
 	 * @param FileJournal $journal Journal to log operations to
 	 * @return Status
@@ -147,6 +147,7 @@ class FileOpBatch {
 	protected static function runParallelBatches( array $pPerformOps, Status $status ) {
 		$aborted = false; // set to true on unexpected errors
 		foreach ( $pPerformOps as $performOpsBatch ) {
+			/** @var FileOp[] $performOpsBatch */
 			if ( $aborted ) { // check batch op abort flag...
 				// We can't continue (even with $ignoreErrors) as $predicates is wrong.
 				// Log the remaining ops as failed for recovery...
@@ -157,6 +158,7 @@ class FileOpBatch {
 				}
 				continue;
 			}
+			/** @var Status[] $statuses */
 			$statuses = array();
 			$opHandles = array();
 			// Get the backend; all sub-batch ops belong to a single backend