X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FMediaWikiServicesTest.php;h=8fa0cd60ec14f313d0e6decb68c4d19465966f3e;hb=7387f89ea0e9385cd8b3e705f0d4c012934170d7;hp=c838fc316523e01fd6568dd020ff2e9221d7af0d;hpb=1658759d42a5d802e29a71c3fd70ae127afd3e46;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/MediaWikiServicesTest.php b/tests/phpunit/includes/MediaWikiServicesTest.php
index c838fc3165..8fa0cd60ec 100644
--- a/tests/phpunit/includes/MediaWikiServicesTest.php
+++ b/tests/phpunit/includes/MediaWikiServicesTest.php
@@ -1,9 +1,9 @@
 <?php
 
 use MediaWiki\MediaWikiServices;
-use MediaWiki\Services\DestructibleService;
-use MediaWiki\Services\SalvageableService;
-use MediaWiki\Services\ServiceDisabledException;
+use Wikimedia\Services\DestructibleService;
+use Wikimedia\Services\SalvageableService;
+use Wikimedia\Services\ServiceDisabledException;
 
 /**
  * @covers MediaWiki\MediaWikiServices
@@ -11,6 +11,7 @@ use MediaWiki\Services\ServiceDisabledException;
  * @group MediaWiki
  */
 class MediaWikiServicesTest extends MediaWikiTestCase {
+	private $deprecatedServices = [];
 
 	/**
 	 * @return Config
@@ -218,7 +219,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 			'Test',
 			function () use ( &$serviceCounter ) {
 				$serviceCounter++;
-				$service = $this->createMock( MediaWiki\Services\DestructibleService::class );
+				$service = $this->createMock( Wikimedia\Services\DestructibleService::class );
 				$service->expects( $this->once() )->method( 'destroy' );
 				return $service;
 			}
@@ -247,7 +248,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 		$services->defineService(
 			'Test',
 			function () {
-				$service = $this->createMock( MediaWiki\Services\DestructibleService::class );
+				$service = $this->createMock( Wikimedia\Services\DestructibleService::class );
 				$service->expects( $this->never() )->method( 'destroy' );
 				return $service;
 			}
@@ -276,6 +277,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 			$getterCases[$name] = [
 				'get' . $service,
 				$class,
+				in_array( $service, $this->deprecatedServices )
 			];
 		}
 
@@ -285,7 +287,11 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideGetters
 	 */
-	public function testGetters( $getter, $type ) {
+	public function testGetters( $getter, $type, $isDeprecated = false ) {
+		if ( $isDeprecated ) {
+			$this->hideDeprecated( MediaWikiServices::class . "::$getter" );
+		}
+
 		// Test against the default instance, since the dummy will not know the default services.
 		$services = MediaWikiServices::getInstance();
 		$service = $services->$getter();
@@ -358,7 +364,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 		} ) );
 
 		$sortedNames = $names;
-		sort( $sortedNames );
+		natcasesort( $sortedNames );
 
 		$this->assertSame( $sortedNames, $names,
 			'Please keep service getters sorted alphabetically' );