From 6d36883ed83fca75ac52da2cf97dc2032232feb0 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <ayg@aryeh.name>
Date: Thu, 26 Jul 2018 14:44:11 +0300
Subject: [PATCH] Update ServiceWiring to use ContentLanguage

Bug: T200246
Change-Id: I626030e9ad0f2a6c60bddb0b05e842eb1ac56da7
---
 includes/ServiceWiring.php | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 90d396591f..92b2411c43 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -115,10 +115,9 @@ return [
 	},
 
 	'InterwikiLookup' => function ( MediaWikiServices $services ) {
-		global $wgContLang; // TODO: manage $wgContLang as a service
 		$config = $services->getMainConfig();
 		return new ClassicInterwikiLookup(
-			$wgContLang,
+			$services->getContentLanguage(),
 			$services->getMainWANObjectCache(),
 			$config->get( 'InterwikiExpiry' ),
 			$config->get( 'InterwikiCache' ),
@@ -150,8 +149,8 @@ return [
 	},
 
 	'SearchEngineConfig' => function ( MediaWikiServices $services ) {
-		global $wgContLang;
-		return new SearchEngineConfig( $services->getMainConfig(), $wgContLang );
+		return new SearchEngineConfig( $services->getMainConfig(),
+			$services->getContentLanguage() );
 	},
 
 	'SkinFactory' => function ( MediaWikiServices $services ) {
@@ -345,10 +344,8 @@ return [
 	},
 
 	'_MediaWikiTitleCodec' => function ( MediaWikiServices $services ) {
-		global $wgContLang;
-
 		return new MediaWikiTitleCodec(
-			$wgContLang,
+			$services->getContentLanguage(),
 			$services->getGenderCache(),
 			$services->getMainConfig()->get( 'LocalInterwikis' )
 		);
@@ -508,12 +505,11 @@ return [
 	},
 
 	'BlobStoreFactory' => function ( MediaWikiServices $services ) {
-		global $wgContLang;
 		return new BlobStoreFactory(
 			$services->getDBLoadBalancer(),
 			$services->getMainWANObjectCache(),
 			$services->getMainConfig(),
-			$wgContLang
+			$services->getContentLanguage()
 		);
 	},
 
@@ -573,11 +569,11 @@ return [
 	},
 
 	'PreferencesFactory' => function ( MediaWikiServices $services ) {
-		global $wgContLang;
 		$authManager = AuthManager::singleton();
 		$linkRenderer = $services->getLinkRendererFactory()->create();
 		$config = $services->getMainConfig();
-		$factory = new DefaultPreferencesFactory( $config, $wgContLang, $authManager, $linkRenderer );
+		$factory = new DefaultPreferencesFactory( $config, $services->getContentLanguage(),
+			$authManager, $linkRenderer );
 		$factory->setLogger( LoggerFactory::getInstance( 'preferences' ) );
 
 		return $factory;
@@ -588,9 +584,8 @@ return [
 	},
 
 	'CommentStore' => function ( MediaWikiServices $services ) {
-		global $wgContLang;
 		return new CommentStore(
-			$wgContLang,
+			$services->getContentLanguage(),
 			$services->getMainConfig()->get( 'CommentTableSchemaMigrationStage' )
 		);
 	},
@@ -602,8 +597,7 @@ return [
 	},
 
 	'MagicWordFactory' => function ( MediaWikiServices $services ) {
-		global $wgContLang;
-		return new MagicWordFactory( $wgContLang );
+		return new MagicWordFactory( $services->getContentLanguage() );
 	},
 
 	'ContentLanguage' => function ( MediaWikiServices $services ) {
-- 
2.20.1