X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=0b0aaf54c80b2b5012b6d2e96c573d5951ef7ffd;hb=009dee56f40978fd034c85f86024273cead5042b;hp=1acd038f15dc3f371d2fb30e8add3d34ffc3b968;hpb=48c8531c2edc45a7ed0791f94149f7b3c5eab8d3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 1acd038f15..0b0aaf54c8 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -53,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;
@@ -75,9 +77,7 @@ use Wikimedia\ObjectFactory;
 
 return [
 	'ActorMigration' => function ( MediaWikiServices $services ) : ActorMigration {
-		return new ActorMigration(
-			$services->getMainConfig()->get( 'ActorTableSchemaMigrationStage' )
-		);
+		return new ActorMigration( SCHEMA_COMPAT_NEW );
 	},
 
 	'BadFileLookup' => function ( MediaWikiServices $services ) : BadFileLookup {
@@ -285,9 +285,9 @@ 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 {
@@ -316,7 +316,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 {
@@ -336,7 +336,7 @@ return [
 		}
 		$params['store'] = $mainConfig->get( 'ObjectCaches' )[$objectCacheId];
 
-		return \ObjectCache::newWANCacheFromParams( $params );
+		return ObjectCache::newWANCacheFromParams( $params );
 	},
 
 	'MediaHandlerFactory' => function ( MediaWikiServices $services ) : MediaHandlerFactory {
@@ -358,6 +358,12 @@ return [
 		);
 	},
 
+	'MessageFormatterFactory' =>
+	function ( MediaWikiServices $services ) : IMessageFormatterFactory {
+		// @phan-suppress-next-line PhanAccessMethodInternal
+		return new MessageFormatterFactory();
+	},
+
 	'MimeAnalyzer' => function ( MediaWikiServices $services ) : MimeAnalyzer {
 		$logger = LoggerFactory::getInstance( 'Mime' );
 		$mainConfig = $services->getMainConfig();
@@ -486,8 +492,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()
 		);
@@ -727,7 +732,8 @@ return [
 		return new SpecialPageFactory(
 			new ServiceOptions(
 				SpecialPageFactory::$constructorOptions, $services->getMainConfig() ),
-			$services->getContentLanguage()
+			$services->getContentLanguage(),
+			$services->getObjectFactory()
 		);
 	},
 
@@ -823,6 +829,7 @@ return [
 	},
 
 	'_SqlBlobStore' => function ( MediaWikiServices $services ) : SqlBlobStore {
+		// @phan-suppress-next-line PhanAccessMethodInternal
 		return $services->getBlobStoreFactory()->newSqlBlobStore();
 	},