From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 8 Jan 2017 00:10:23 +0000 (-0800)
Subject: Avoid IDEA warning about $keys being both a parameter and loop variable
X-Git-Tag: 1.31.0-rc.0~4367
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=02d6133fd8ee092cb6e5e1d2d3457d88eead0f49

Avoid IDEA warning about $keys being both a parameter and loop variable

Change-Id: Id562053a71f135fa863cb88b5f081982c01575cf
---

diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index 8d3c6d96e4..01a914912f 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -275,8 +275,8 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 		$checkKeysForAll = [];
 		$checkKeysByKey = [];
 		$checkKeysFlat = [];
-		foreach ( $checkKeys as $i => $keys ) {
-			$prefixed = self::prefixCacheKeys( (array)$keys, self::TIME_KEY_PREFIX );
+		foreach ( $checkKeys as $i => $checkKeyGroup ) {
+			$prefixed = self::prefixCacheKeys( (array)$checkKeyGroup, self::TIME_KEY_PREFIX );
 			$checkKeysFlat = array_merge( $checkKeysFlat, $prefixed );
 			// Is this check keys for a specific cache key, or for all keys being fetched?
 			if ( is_int( $i ) ) {