From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 14 Sep 2019 00:12:05 +0000 (+0000)
Subject: Merge "filebackend: rename and simplify header sanitizing methods in SwiftFileBackend"
X-Git-Tag: 1.34.0-rc.0~225
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=e80ff96c373454b1cf6fd65a6af8a9ae282f0f55

Merge "filebackend: rename and simplify header sanitizing methods in SwiftFileBackend"
---

e80ff96c373454b1cf6fd65a6af8a9ae282f0f55
diff --cc includes/libs/filebackend/SwiftFileBackend.php
index 5632d5e63c,c58924bd04..820634cc4a
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@@ -1293,15 -1300,7 +1300,10 @@@ class SwiftFileBackend extends FileBack
  		return $hdrs;
  	}
  
- 	/**
- 	 * @param FileBackendStoreOpHandle[] $fileOpHandles
- 	 *
- 	 * @return StatusValue[]
- 	 */
  	protected function doExecuteOpHandlesInternal( array $fileOpHandles ) {
 +		/** @var SwiftFileOpHandle[] $fileOpHandles */
 +		'@phan-var SwiftFileOpHandle[] $fileOpHandles';
 +
  		/** @var StatusValue[] $statuses */
  		$statuses = [];