X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FServiceWiring.php;h=853b06debaf3b5dd625a1493168f2e40ed9dbbad;hb=fb73286fba73c399e119ef50ff036255dd6a1096;hp=6da537d4e16af2c4955d287eed03e8199f4c9ba3;hpb=60557e0370980e23a9f07ab412ccd73e10223652;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 6da537d4e1..853b06deba 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -38,6 +38,7 @@
  */
 
 use MediaWiki\Auth\AuthManager;
+use MediaWiki\Config\ConfigRepository;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Logger\LoggerFactory;
@@ -104,16 +105,19 @@ return [
 		return $factory;
 	},
 
+	'ConfigRepository' => function ( MediaWikiServices $services ) {
+		return new ConfigRepository( $services->getConfigFactory() );
+	},
+
 	'MainConfig' => function ( MediaWikiServices $services ) {
 		// Use the 'main' config from the ConfigFactory service.
 		return $services->getConfigFactory()->makeConfig( 'main' );
 	},
 
 	'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' ),
@@ -132,7 +136,7 @@ return [
 		$config = $services->getMainConfig();
 		$wiki = $config->get( 'DBname' );
 		return new BufferingStatsdDataFactory(
-			rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' ) . $wiki
+			rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ) ) . '.' . $wiki
 		);
 	},
 
@@ -145,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 ) {
@@ -296,7 +300,8 @@ return [
 
 	'Parser' => function ( MediaWikiServices $services ) {
 		$conf = $services->getMainConfig()->get( 'ParserConf' );
-		return ObjectFactory::constructClassInstance( $conf['class'], [ $conf ] );
+		return ObjectFactory::constructClassInstance( $conf['class'],
+			[ $conf, $services->getMagicWordFactory() ] );
 	},
 
 	'ParserCache' => function ( MediaWikiServices $services ) {
@@ -339,10 +344,8 @@ return [
 	},
 
 	'_MediaWikiTitleCodec' => function ( MediaWikiServices $services ) {
-		global $wgContLang;
-
 		return new MediaWikiTitleCodec(
-			$wgContLang,
+			$services->getContentLanguage(),
 			$services->getGenderCache(),
 			$services->getMainConfig()->get( 'LocalInterwikis' )
 		);
@@ -502,12 +505,11 @@ return [
 	},
 
 	'BlobStoreFactory' => function ( MediaWikiServices $services ) {
-		global $wgContLang;
 		return new BlobStoreFactory(
 			$services->getDBLoadBalancer(),
 			$services->getMainWANObjectCache(),
 			$services->getMainConfig(),
-			$wgContLang
+			$services->getContentLanguage()
 		);
 	},
 
@@ -567,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;
@@ -582,9 +584,8 @@ return [
 	},
 
 	'CommentStore' => function ( MediaWikiServices $services ) {
-		global $wgContLang;
 		return new CommentStore(
-			$wgContLang,
+			$services->getContentLanguage(),
 			$services->getMainConfig()->get( 'CommentTableSchemaMigrationStage' )
 		);
 	},
@@ -595,6 +596,22 @@ return [
 		);
 	},
 
+	'MagicWordFactory' => function ( MediaWikiServices $services ) {
+		return new MagicWordFactory( $services->getContentLanguage() );
+	},
+
+	'ContentLanguage' => function ( MediaWikiServices $services ) {
+		return Language::factory( $services->getMainConfig()->get( 'LanguageCode' ) );
+	},
+
+	'PasswordFactory' => function ( MediaWikiServices $services ) {
+		$config = $services->getMainConfig();
+		return new PasswordFactory(
+			$config->get( 'PasswordConfig' ),
+			$config->get( 'PasswordDefault' )
+		);
+	},
+
 	///////////////////////////////////////////////////////////////////////////
 	// NOTE: When adding a service here, don't forget to add a getter function
 	// in the MediaWikiServices class. The convenience getter should just call