From 8065936ec3f6fdb4be0f8b71fe10f4e00e5af6c7 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 4 Dec 2015 12:34:01 +0000 Subject: [PATCH] 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 --- includes/libs/objectcache/WANObjectCache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } } -- 2.20.1