From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 8 Oct 2019 21:08:21 +0000 (+0000)
Subject: Merge "Make LocalisationCache a service" into REL1_34
X-Git-Tag: 1.34.0-rc.0~21
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=29c25bb31c4b558a245f1b0c80a934b8b949ca55;hp=-c

Merge "Make LocalisationCache a service" into REL1_34
---

29c25bb31c4b558a245f1b0c80a934b8b949ca55
diff --combined includes/ServiceWiring.php
index dcb4aaf5f5,003b640ad8..60a53563cc
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -287,6 -287,36 +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::$constructorOptions,
+ 				// 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();
@@@ -556,7 -586,7 +586,7 @@@
  	'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(),