From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 1 Jun 2018 13:19:24 +0000 (+0000)
Subject: Merge "objectcache: add setMockTime() method to BagOStuff/WANObjectCache"
X-Git-Tag: 1.34.0-rc.0~5216
X-Git-Url: http://git.cyclocoop.org/%27.%28%24current%20%3E%202?a=commitdiff_plain;h=966e34619bef0b2dd1e275565829ed2030edd564;p=lhc%2Fweb%2Fwiklou.git

Merge "objectcache: add setMockTime() method to BagOStuff/WANObjectCache"
---

966e34619bef0b2dd1e275565829ed2030edd564
diff --cc includes/libs/objectcache/WANObjectCache.php
index 9bdb286966,658b225b44..a2e2fe14ad
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@@ -2057,17 -2064,9 +2060,9 @@@ class WANObjectCache implements IExpiri
  	protected function determineKeyClass( $key ) {
  		$parts = explode( ':', $key );
  
 -		return isset( $parts[1] ) ? $parts[1] : $parts[0]; // sanity
 +		return $parts[1] ?? $parts[0]; // sanity
  	}
  
- 	/**
- 	 * @return float UNIX timestamp
- 	 * @codeCoverageIgnore
- 	 */
- 	protected function getCurrentTime() {
- 		return microtime( true );
- 	}
- 
  	/**
  	 * @param string $value Wrapped value like "PURGED:<timestamp>:<holdoff>"
  	 * @return array|bool Array containing a UNIX timestamp (float) and holdoff period (integer),