X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Ffilerepo%2FRepoGroupTest.php;h=67de6982e65e73e0b4e0b6d521b36d90849de1d4;hp=82ff12e3e3442badef66b34626d56922cd157c58;hb=a9164f143a59a8d957a1d7f205715ac57fff3c8c;hpb=dc1632d58ee3b016697667bfc003338141bc3ce7

diff --git a/tests/phpunit/includes/filerepo/RepoGroupTest.php b/tests/phpunit/includes/filerepo/RepoGroupTest.php
index 82ff12e3e3..67de6982e6 100644
--- a/tests/phpunit/includes/filerepo/RepoGroupTest.php
+++ b/tests/phpunit/includes/filerepo/RepoGroupTest.php
@@ -1,9 +1,13 @@
 <?php
+
+/**
+ * @covers RepoGroup
+ */
 class RepoGroupTest extends MediaWikiTestCase {
 
 	function testHasForeignRepoNegative() {
 		$this->setMwGlobals( 'wgForeignFileRepos', [] );
-		RepoGroup::destroySingleton();
+		$this->overrideMwServices();
 		FileBackendGroup::destroySingleton();
 		$this->assertFalse( RepoGroup::singleton()->hasForeignRepos() );
 	}
@@ -15,7 +19,7 @@ class RepoGroupTest extends MediaWikiTestCase {
 
 	function testForEachForeignRepo() {
 		$this->setUpForeignRepo();
-		$fakeCallback = $this->createMock( 'RepoGroupTestHelper' );
+		$fakeCallback = $this->createMock( RepoGroupTestHelper::class );
 		$fakeCallback->expects( $this->once() )->method( 'callback' );
 		RepoGroup::singleton()->forEachForeignRepo(
 			[ $fakeCallback, 'callback' ], [ [] ] );
@@ -23,9 +27,9 @@ class RepoGroupTest extends MediaWikiTestCase {
 
 	function testForEachForeignRepoNone() {
 		$this->setMwGlobals( 'wgForeignFileRepos', [] );
-		RepoGroup::destroySingleton();
+		$this->overrideMwServices();
 		FileBackendGroup::destroySingleton();
-		$fakeCallback = $this->createMock( 'RepoGroupTestHelper' );
+		$fakeCallback = $this->createMock( RepoGroupTestHelper::class );
 		$fakeCallback->expects( $this->never() )->method( 'callback' );
 		RepoGroup::singleton()->forEachForeignRepo(
 			[ $fakeCallback, 'callback' ], [ [] ] );
@@ -34,7 +38,7 @@ class RepoGroupTest extends MediaWikiTestCase {
 	private function setUpForeignRepo() {
 		global $wgUploadDirectory;
 		$this->setMwGlobals( 'wgForeignFileRepos', [ [
-			'class' => 'ForeignAPIRepo',
+			'class' => ForeignAPIRepo::class,
 			'name' => 'wikimediacommons',
 			'backend' => 'wikimediacommons-backend',
 			'apibase' => 'https://commons.wikimedia.org/w/api.php',
@@ -44,7 +48,7 @@ class RepoGroupTest extends MediaWikiTestCase {
 			'apiThumbCacheExpiry' => 86400,
 			'directory' => $wgUploadDirectory
 		] ] );
-		RepoGroup::destroySingleton();
+		$this->overrideMwServices();
 		FileBackendGroup::destroySingleton();
 	}
 }