X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FServiceWiring.php;h=ed47b5b2689001ce3eed687ad3e9cb57c66b2a05;hp=83847d80ae407a32a3d5001a37259b663bcb9f57;hb=e3537bdc00244cefdaa34710be0fb0d920336ed8;hpb=925dcce9609fbcad58effb10988ecd09aa5a12d2

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 83847d80ae..ed47b5b268 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -56,6 +56,7 @@ use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Interwiki\InterwikiLookup;
+use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Logger\LoggerFactory;
@@ -107,7 +108,7 @@ return [
 			$services->getDBLoadBalancerFactory(),
 			$services->getExternalStoreAccess(),
 			$services->getMainWANObjectCache(),
-			new ServiceOptions( BlobStoreFactory::$constructorOptions,
+			new ServiceOptions( BlobStoreFactory::CONSTRUCTOR_OPTIONS,
 				$services->getMainConfig() ),
 			$services->getContentLanguage()
 		);
@@ -116,7 +117,7 @@ return [
 	'BlockManager' => function ( MediaWikiServices $services ) : BlockManager {
 		return new BlockManager(
 			new ServiceOptions(
-				BlockManager::$constructorOptions, $services->getMainConfig()
+				BlockManager::CONSTRUCTOR_OPTIONS, $services->getMainConfig()
 			),
 			$services->getPermissionManager(),
 			LoggerFactory::getInstance( 'BlockManager' )
@@ -259,6 +260,13 @@ return [
 		);
 	},
 
+	'LanguageNameUtils' => function ( MediaWikiServices $services ) : LanguageNameUtils {
+		return new LanguageNameUtils( new ServiceOptions(
+			LanguageNameUtils::$constructorOptions,
+			$services->getMainConfig()
+		) );
+	},
+
 	'LinkCache' => function ( MediaWikiServices $services ) : LinkCache {
 		return new LinkCache(
 			$services->getTitleFormatter(),
@@ -287,6 +295,37 @@ return [
 		);
 	},
 
+	'LocalisationCache' => function ( MediaWikiServices $services ) : LocalisationCache {
+		$conf = $services->getMainConfig()->get( 'LocalisationCacheConf' );
+
+		$logger = LoggerFactory::getInstance( 'localisation' );
+
+		$store = LocalisationCache::getStoreFromConf(
+			$conf, $services->getMainConfig()->get( 'CacheDirectory' ) );
+		$logger->debug( 'LocalisationCache: using store ' . get_class( $store ) );
+
+		return new $conf['class'](
+			new ServiceOptions(
+				LocalisationCache::CONSTRUCTOR_OPTIONS,
+				// Two of the options are stored in $wgLocalisationCacheConf
+				$conf,
+				// In case someone set that config variable and didn't reset all keys, set defaults.
+				[
+					'forceRecache' => false,
+					'manualRecache' => false,
+				],
+				// Some other options come from config itself
+				$services->getMainConfig()
+			),
+			$store,
+			$logger,
+			[ function () use ( $services ) {
+				$services->getResourceLoader()->getMessageBlobStore()->clear();
+			} ],
+			$services->getLanguageNameUtils()
+		);
+	},
+
 	'LocalServerObjectCache' => function ( MediaWikiServices $services ) : BagOStuff {
 		$config = $services->getMainConfig();
 		$cacheId = ObjectCache::detectLocalServerCache();
@@ -521,6 +560,17 @@ return [
 		);
 	},
 
+	'PasswordReset' => function ( MediaWikiServices $services ) : PasswordReset {
+		$options = new ServiceOptions( PasswordReset::CONSTRUCTOR_OPTIONS, $services->getMainConfig() );
+		return new PasswordReset(
+			$options,
+			AuthManager::singleton(),
+			$services->getPermissionManager(),
+			$services->getDBLoadBalancer(),
+			LoggerFactory::getInstance( 'authentication' )
+		);
+	},
+
 	'PerDbNameStatsdDataFactory' =>
 	function ( MediaWikiServices $services ) : StatsdDataFactoryInterface {
 		$config = $services->getMainConfig();
@@ -534,7 +584,7 @@ return [
 	'PermissionManager' => function ( MediaWikiServices $services ) : PermissionManager {
 		return new PermissionManager(
 			new ServiceOptions(
-				PermissionManager::$constructorOptions, $services->getMainConfig()
+				PermissionManager::CONSTRUCTOR_OPTIONS, $services->getMainConfig()
 			),
 			$services->getSpecialPageFactory(),
 			$services->getRevisionLookup(),
@@ -545,7 +595,7 @@ return [
 	'PreferencesFactory' => function ( MediaWikiServices $services ) : PreferencesFactory {
 		$factory = new DefaultPreferencesFactory(
 			new ServiceOptions(
-				DefaultPreferencesFactory::$constructorOptions, $services->getMainConfig() ),
+				DefaultPreferencesFactory::CONSTRUCTOR_OPTIONS, $services->getMainConfig() ),
 			$services->getContentLanguage(),
 			AuthManager::singleton(),
 			$services->getLinkRendererFactory()->create(),