X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fparser%2FParserTestRunner.php;h=df897d9a1ef3c2a392209b9e0dcae8f739aa4308;hb=4a7555355a876807318e145fc2f4ee446bb917a1;hp=3eb25a9c95d5926e493390d7b9916420717e9ac5;hpb=a4777729dd2dd66c871395bdb04f5f6dce75dd94;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index 3eb25a9c95..df897d9a1e 100644
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -289,9 +289,14 @@ class ParserTestRunner {
 
 		// All FileRepo changes should be done here by injecting services,
 		// there should be no need to change global variables.
-		RepoGroup::setSingleton( $this->createRepoGroup() );
+		MediaWikiServices::getInstance()->disableService( 'RepoGroup' );
+		MediaWikiServices::getInstance()->redefineService( 'RepoGroup',
+			function () {
+				return $this->createRepoGroup();
+			}
+		);
 		$teardown[] = function () {
-			RepoGroup::destroySingleton();
+			MediaWikiServices::getInstance()->resetServiceForTesting( 'RepoGroup' );
 		};
 
 		// Set up null lock managers
@@ -449,7 +454,8 @@ class ParserTestRunner {
 				'transformVia404' => false,
 				'backend' => $backend
 			],
-			[]
+			[],
+			MediaWikiServices::getInstance()->getMainWANObjectCache()
 		);
 	}
 
@@ -635,6 +641,8 @@ class ParserTestRunner {
 	/**
 	 * Reset the Title-related services that need resetting
 	 * for each test
+	 *
+	 * @todo We need to reset all services on every test
 	 */
 	private function resetTitleServices() {
 		$services = MediaWikiServices::getInstance();
@@ -643,6 +651,7 @@ class ParserTestRunner {
 		$services->resetServiceForTesting( '_MediaWikiTitleCodec' );
 		$services->resetServiceForTesting( 'LinkRenderer' );
 		$services->resetServiceForTesting( 'LinkRendererFactory' );
+		$services->resetServiceForTesting( 'NamespaceInfo' );
 	}
 
 	/**