X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fsuites%2FUploadFromUrlTestSuite.php;h=d340221b8bb63c391bdbf7e0d0e3f451cfa8a80f;hp=556c75412a4b8c56e45c5b411758a2d3b1d6cd4e;hb=a9164f143a59a8d957a1d7f205715ac57fff3c8c;hpb=967a96e7fa5910f8fc451590decb381dbfb481ba

diff --git a/tests/phpunit/suites/UploadFromUrlTestSuite.php b/tests/phpunit/suites/UploadFromUrlTestSuite.php
index 556c75412a..d340221b8b 100644
--- a/tests/phpunit/suites/UploadFromUrlTestSuite.php
+++ b/tests/phpunit/suites/UploadFromUrlTestSuite.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
+
 require_once dirname( __DIR__ ) . '/includes/upload/UploadFromUrlTest.php';
 
 class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
@@ -16,8 +18,7 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
 	}
 
 	protected function setUp() {
-		global $wgParser, $wgParserConf, $IP, $messageMemc, $wgMemc, $wgUser,
-			$wgLang, $wgOut, $wgRequest, $wgStyleDirectory,
+		global $IP, $messageMemc, $wgMemc, $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory,
 			$wgParserCacheType, $wgNamespaceAliases, $wgNamespaceProtection;
 
 		$tmpDir = $this->getNewTempDirectory();
@@ -58,7 +59,7 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
 
 		$wgParserCacheType = CACHE_NONE;
 		DeferredUpdates::clearPendingUpdates();
-		$wgMemc = wfGetMainCache();
+		$wgMemc = ObjectCache::getLocalClusterInstance();
 		$messageMemc = wfGetMessageCacheStorage();
 
 		RequestContext::resetMain();
@@ -66,14 +67,13 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
 		$wgUser = new User;
 		$wgLang = $context->getLanguage();
 		$wgOut = $context->getOutput();
-		$wgParser = new StubObject( 'wgParser', $wgParserConf['class'], [ $wgParserConf ] );
 		$wgRequest = $context->getRequest();
 
 		if ( $wgStyleDirectory === false ) {
 			$wgStyleDirectory = "$IP/skins";
 		}
 
-		RepoGroup::destroySingleton();
+		MediaWikiServices::getInstance()->resetServiceForTesting( 'RepoGroup' );
 		FileBackendGroup::destroySingleton();
 	}
 
@@ -82,7 +82,7 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
 			$GLOBALS[$var] = $val;
 		}
 		// Restore backends
-		RepoGroup::destroySingleton();
+		MediaWikiServices::getInstance()->resetServiceForTesting( 'RepoGroup' );
 		FileBackendGroup::destroySingleton();
 
 		parent::tearDown();