X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FServiceWiring.php;h=e0db05b6c8cecb89bc4ee2c0fffc9375b319cd0a;hp=ab51eabd478983de080353a34141a549ffc1992f;hb=c8987d7c3e30a7d1c2e917cb6a9b0114281703e8;hpb=f724e1dfba13c74b82d1f12442b08e8798bea82b

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index ab51eabd47..e0db05b6c8 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -107,7 +107,7 @@ return [
 			$services->getDBLoadBalancerFactory(),
 			$services->getExternalStoreAccess(),
 			$services->getMainWANObjectCache(),
-			new ServiceOptions( BlobStoreFactory::$constructorOptions,
+			new ServiceOptions( BlobStoreFactory::CONSTRUCTOR_OPTIONS,
 				$services->getMainConfig() ),
 			$services->getContentLanguage()
 		);
@@ -116,7 +116,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' )
@@ -199,7 +199,7 @@ return [
 
 		$lbConf = MWLBFactory::applyDefaultConfig(
 			$mainConfig->get( 'LBFactoryConf' ),
-			new ServiceOptions( MWLBFactory::$applyDefaultConfigOptions, $mainConfig ),
+			new ServiceOptions( MWLBFactory::APPLY_DEFAULT_CONFIG_OPTIONS, $mainConfig ),
 			$services->getConfiguredReadOnlyMode(),
 			$services->getLocalServerObjectCache(),
 			$services->getMainObjectStash(),
@@ -207,10 +207,7 @@ return [
 		);
 		$class = MWLBFactory::getLBFactoryClass( $lbConf );
 
-		$instance = new $class( $lbConf );
-		MWLBFactory::setSchemaAliases( $instance, $mainConfig->get( 'DBtype' ) );
-
-		return $instance;
+		return new $class( $lbConf );
 	},
 
 	'EventRelayerGroup' => function ( MediaWikiServices $services ) : EventRelayerGroup {
@@ -290,6 +287,36 @@ 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();
+			} ]
+		);
+	},
+
 	'LocalServerObjectCache' => function ( MediaWikiServices $services ) : BagOStuff {
 		$config = $services->getMainConfig();
 		$cacheId = ObjectCache::detectLocalServerCache();
@@ -524,6 +551,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();
@@ -537,7 +575,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(),
@@ -548,7 +586,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(),