From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 4 Dec 2015 12:34:01 +0000 (+0000)
Subject: objectcache: Make protected WANObjectCache::makePurgeValue non-static
X-Git-Tag: 1.31.0-rc.0~8781^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=8065936ec3f6fdb4be0f8b71fe10f4e00e5af6c7;p=lhc%2Fweb%2Fwiklou.git

objectcache: Make protected WANObjectCache::makePurgeValue non-static

It was already used everywhere as non-static via $this.
This is needed in order to allow MessageBlobStore unit tests
to disable the holdoff via a mock (mocks can't override static methods).

Change-Id: I3aad5b6e780addf1b6ce9de56c81b91f5ab358b2
---

diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index 95bf7432dc..8bdafcfa4b 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -1091,7 +1091,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 * @param int $holdoff In seconds
 	 * @return string Wrapped purge value
 	 */
-	protected static function makePurgeValue( $timestamp, $holdoff ) {
+	protected function makePurgeValue( $timestamp, $holdoff ) {
 		return self::PURGE_VAL_PREFIX . (float)$timestamp . ':' . (int)$holdoff;
 	}
 }