X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FMediaWikiServicesTest.php;h=d34ba0a542d40f3214e4fed42ae5998a5f3bbf59;hp=1cd40edc652e99d309bed032f8288c0c2c442358;hb=eafbacb43ca433141c72c81558ed44ad5ff52694;hpb=f7ead5d3ca0e1ae673752f6c6118297bf47e1c88

diff --git a/tests/phpunit/includes/MediaWikiServicesTest.php b/tests/phpunit/includes/MediaWikiServicesTest.php
index 1cd40edc65..d34ba0a542 100644
--- a/tests/phpunit/includes/MediaWikiServicesTest.php
+++ b/tests/phpunit/includes/MediaWikiServicesTest.php
@@ -11,7 +11,7 @@ use Wikimedia\Services\ServiceDisabledException;
  * @group MediaWiki
  */
 class MediaWikiServicesTest extends MediaWikiTestCase {
-	private $deprecatedServices = [ 'CryptRand' ];
+	private $deprecatedServices = [];
 
 	/**
 	 * @return Config
@@ -308,7 +308,16 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 				throw new MWException( 'All service callbacks must have a return type defined, ' .
 					"none found for $name" );
 			}
-			$ret[$name] = [ $name, $fun->getReturnType()->__toString() ];
+
+			$returnType = $fun->getReturnType();
+
+			// ReflectionType::__toString() generates deprecation notices in PHP 7.4 and above
+			// TODO: T228342 - remove this check after MediaWiki only supports PHP 7.1+
+			if ( is_callable( [ $returnType, 'getName' ] ) ) {
+				$ret[$name] = [ $name, $returnType->getName() ];
+			} else {
+				$ret[$name] = [ $name, $fun->getReturnType()->__toString() ];
+			}
 		}
 		return $ret;
 	}
@@ -364,7 +373,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 		} ) );
 
 		$sortedNames = $names;
-		sort( $sortedNames );
+		natcasesort( $sortedNames );
 
 		$this->assertSame( $sortedNames, $names,
 			'Please keep service getters sorted alphabetically' );