From 421b4258b5c02375448c9a7d958ede71bf473929 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@wikimedia.org>
Date: Wed, 10 Apr 2019 20:36:02 +1000
Subject: [PATCH] Sort MediaWikiServices and ServiceWiring alphabetically

Don't sort them asciibetically, which is a weird sort order people only
use by accident.

Change-Id: I69be64dab104130841855f2ce58bf94667c0c300
---
 includes/MediaWikiServices.php                   | 16 ++++++++--------
 includes/ServiceWiring.php                       |  8 ++++----
 tests/phpunit/includes/MediaWikiServicesTest.php |  2 +-
 tests/phpunit/includes/ServiceWiringTest.php     |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index 473cbe5b87..8c60dc7e52 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -668,14 +668,6 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'MimeAnalyzer' );
 	}
 
-	/**
-	 * @since 1.32
-	 * @return NameTableStoreFactory
-	 */
-	public function getNameTableStoreFactory() {
-		return $this->getService( 'NameTableStoreFactory' );
-	}
-
 	/**
 	 * @since 1.33
 	 * @return NamespaceInfo
@@ -684,6 +676,14 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'NamespaceInfo' );
 	}
 
+	/**
+	 * @since 1.32
+	 * @return NameTableStoreFactory
+	 */
+	public function getNameTableStoreFactory() {
+		return $this->getService( 'NameTableStoreFactory' );
+	}
+
 	/**
 	 * @since 1.32
 	 * @return OldRevisionImporter
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 750c964830..722bac1cb5 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -330,6 +330,10 @@ return [
 		return new MimeAnalyzer( $params );
 	},
 
+	'NamespaceInfo' => function ( MediaWikiServices $services ) : NamespaceInfo {
+		return new NamespaceInfo( $services->getMainConfig() );
+	},
+
 	'NameTableStoreFactory' => function ( MediaWikiServices $services ) : NameTableStoreFactory {
 		return new NameTableStoreFactory(
 			$services->getDBLoadBalancerFactory(),
@@ -338,10 +342,6 @@ return [
 		);
 	},
 
-	'NamespaceInfo' => function ( MediaWikiServices $services ) : NamespaceInfo {
-		return new NamespaceInfo( $services->getMainConfig() );
-	},
-
 	'OldRevisionImporter' => function ( MediaWikiServices $services ) : OldRevisionImporter {
 		return new ImportableOldRevisionImporter(
 			true,
diff --git a/tests/phpunit/includes/MediaWikiServicesTest.php b/tests/phpunit/includes/MediaWikiServicesTest.php
index 1cd40edc65..9d6164c959 100644
--- a/tests/phpunit/includes/MediaWikiServicesTest.php
+++ b/tests/phpunit/includes/MediaWikiServicesTest.php
@@ -364,7 +364,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 		} ) );
 
 		$sortedNames = $names;
-		sort( $sortedNames );
+		natcasesort( $sortedNames );
 
 		$this->assertSame( $sortedNames, $names,
 			'Please keep service getters sorted alphabetically' );
diff --git a/tests/phpunit/includes/ServiceWiringTest.php b/tests/phpunit/includes/ServiceWiringTest.php
index 74e8e1b3ea..02e06f8dda 100644
--- a/tests/phpunit/includes/ServiceWiringTest.php
+++ b/tests/phpunit/includes/ServiceWiringTest.php
@@ -8,7 +8,7 @@ class ServiceWiringTest extends MediaWikiTestCase {
 		global $IP;
 		$services = array_keys( require "$IP/includes/ServiceWiring.php" );
 		$sortedServices = $services;
-		sort( $sortedServices );
+		natcasesort( $sortedServices );
 
 		$this->assertSame( $sortedServices, $services,
 			'Please keep services sorted alphabetically' );
-- 
2.20.1