X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=b53011ff96e4d9d60e0f3c492568f10904c52d2c;hb=e7051c851cc23bf401018277fe75359e214bb34b;hp=b30726415e1c604e0ac14cd08f38875daa60ea6a;hpb=eb57a2e0b2cac2125ec4d580ff8d617dd87530e4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index b30726415e..b53011ff96 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -45,6 +45,7 @@ use MediaWiki\Block\BlockRestrictionStore;
 use MediaWiki\Config\ConfigRepository;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
+use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Interwiki\InterwikiLookup;
@@ -52,6 +53,8 @@ use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use Wikimedia\Message\IMessageFormatterFactory;
+use MediaWiki\Message\MessageFormatterFactory;
 use MediaWiki\Page\MovePageFactory;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Preferences\PreferencesFactory;
@@ -284,9 +287,17 @@ return [
 
 	'LocalServerObjectCache' => function ( MediaWikiServices $services ) : BagOStuff {
 		$config = $services->getMainConfig();
-		$cacheId = \ObjectCache::detectLocalServerCache();
+		$cacheId = ObjectCache::detectLocalServerCache();
 
-		return \ObjectCache::newFromParams( $config->get( 'ObjectCaches' )[$cacheId] );
+		return ObjectCache::newFromParams( $config->get( 'ObjectCaches' )[$cacheId] );
+	},
+
+	'LockManagerGroupFactory' => function ( MediaWikiServices $services ) : LockManagerGroupFactory {
+		return new LockManagerGroupFactory(
+			WikiMap::getCurrentWikiDbDomain()->getId(),
+			$services->getMainConfig()->get( 'LockManagers' ),
+			$services->getDBLoadBalancerFactory()
+		);
 	},
 
 	'MagicWordFactory' => function ( MediaWikiServices $services ) : MagicWordFactory {
@@ -307,7 +318,7 @@ return [
 				"Cache type \"$id\" is not present in \$wgObjectCaches." );
 		}
 
-		return \ObjectCache::newFromParams( $mainConfig->get( 'ObjectCaches' )[$id] );
+		return ObjectCache::newFromParams( $mainConfig->get( 'ObjectCaches' )[$id] );
 	},
 
 	'MainWANObjectCache' => function ( MediaWikiServices $services ) : WANObjectCache {
@@ -327,7 +338,7 @@ return [
 		}
 		$params['store'] = $mainConfig->get( 'ObjectCaches' )[$objectCacheId];
 
-		return \ObjectCache::newWANCacheFromParams( $params );
+		return ObjectCache::newWANCacheFromParams( $params );
 	},
 
 	'MediaHandlerFactory' => function ( MediaWikiServices $services ) : MediaHandlerFactory {
@@ -345,11 +356,15 @@ return [
 				? $services->getLocalServerObjectCache()
 				: new EmptyBagOStuff(),
 			$mainConfig->get( 'UseDatabaseMessages' ),
-			$mainConfig->get( 'MsgCacheExpiry' ),
 			$services->getContentLanguage()
 		);
 	},
 
+	'MessageFormatterFactory' =>
+	function ( MediaWikiServices $services ) : IMessageFormatterFactory {
+		return new MessageFormatterFactory();
+	},
+
 	'MimeAnalyzer' => function ( MediaWikiServices $services ) : MimeAnalyzer {
 		$logger = LoggerFactory::getInstance( 'Mime' );
 		$mainConfig = $services->getMainConfig();
@@ -478,8 +493,7 @@ return [
 			// 'class' and 'preprocessorClass'
 			$services->getMainConfig()->get( 'ParserConf' ),
 			// Make sure to have defaults in case someone overrode ParserConf with something silly
-			[ 'class' => Parser::class,
-				'preprocessorClass' => Parser::getDefaultPreprocessorClass() ],
+			[ 'class' => Parser::class, 'preprocessorClass' => Preprocessor_Hash::class ],
 			// Plus a buch of actual config options
 			$services->getMainConfig()
 		);