From: Timo Tijhof <krinklemail@gmail.com>
Date: Sat, 31 Aug 2019 14:00:29 +0000 (+0100)
Subject: phpunit: Don't bother resetting unused global in UploadFromUrlTestSuite
X-Git-Tag: 1.34.0-rc.0~457^2
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=97f9c99234e5cbf63dce0ebd9759cecf31676b94;p=lhc%2Fweb%2Fwiklou.git

phpunit: Don't bother resetting unused global in UploadFromUrlTestSuite

messageMemc is not used for anything important. Should be removed
soon, but at least don't reset it in tests. If something new depends
on it, it should fail.

Bug: T189966
Change-Id: Id707db028e6eba03242fc9e1541d785a607d9be9
---

diff --git a/tests/phpunit/suites/UploadFromUrlTestSuite.php b/tests/phpunit/suites/UploadFromUrlTestSuite.php
index d340221b8b..2784abdbc2 100644
--- a/tests/phpunit/suites/UploadFromUrlTestSuite.php
+++ b/tests/phpunit/suites/UploadFromUrlTestSuite.php
@@ -18,7 +18,7 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
 	}
 
 	protected function setUp() {
-		global $IP, $messageMemc, $wgMemc, $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory,
+		global $IP, $wgMemc, $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory,
 			$wgParserCacheType, $wgNamespaceAliases, $wgNamespaceProtection;
 
 		$tmpDir = $this->getNewTempDirectory();
@@ -60,7 +60,6 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
 		$wgParserCacheType = CACHE_NONE;
 		DeferredUpdates::clearPendingUpdates();
 		$wgMemc = ObjectCache::getLocalClusterInstance();
-		$messageMemc = wfGetMessageCacheStorage();
 
 		RequestContext::resetMain();
 		$context = RequestContext::getMain();