X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FServiceWiring.php;h=cf2def22ccc41e579744566c047248db17657f6e;hp=1a19465ed5bdcdbf661ba68e05912a7563760281;hb=1dee28cb5f1efd6d9e14d6cc1d0c73c3f69269b4;hpb=a97139808acf244936a870fe8bf7ba3667795f3b

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 1a19465ed5..cf2def22cc 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -51,8 +51,9 @@ use MediaWiki\Preferences\DefaultPreferencesFactory;
 use MediaWiki\Shell\CommandFactory;
 use MediaWiki\Special\SpecialPageFactory;
 use MediaWiki\Storage\BlobStore;
+use MediaWiki\Revision\RevisionRenderer;
 use MediaWiki\Storage\BlobStoreFactory;
-use MediaWiki\Storage\NameTableStore;
+use MediaWiki\Storage\NameTableStoreFactory;
 use MediaWiki\Storage\RevisionFactory;
 use MediaWiki\Storage\RevisionLookup;
 use MediaWiki\Storage\RevisionStore;
@@ -72,31 +73,13 @@ return [
 
 	'BlobStoreFactory' => function ( MediaWikiServices $services ) : BlobStoreFactory {
 		return new BlobStoreFactory(
-			$services->getDBLoadBalancer(),
+			$services->getDBLoadBalancerFactory(),
 			$services->getMainWANObjectCache(),
 			$services->getMainConfig(),
 			$services->getContentLanguage()
 		);
 	},
 
-	'ChangeTagDefStore' => function ( MediaWikiServices $services ) : NameTableStore {
-		return new NameTableStore(
-			$services->getDBLoadBalancer(),
-			$services->getMainWANObjectCache(),
-			LoggerFactory::getInstance( 'NameTableSqlStore' ),
-			'change_tag_def',
-			'ctd_id',
-			'ctd_name',
-			null,
-			false,
-			function ( $insertFields ) {
-				$insertFields['ctd_user_defined'] = 0;
-				$insertFields['ctd_count'] = 0;
-				return $insertFields;
-			}
-		);
-	},
-
 	'CommentStore' => function ( MediaWikiServices $services ) : CommentStore {
 		return new CommentStore(
 			$services->getContentLanguage(),
@@ -127,23 +110,6 @@ return [
 		return Language::factory( $services->getMainConfig()->get( 'LanguageCode' ) );
 	},
 
-	'ContentModelStore' => function ( MediaWikiServices $services ) : NameTableStore {
-		return new NameTableStore(
-			$services->getDBLoadBalancer(),
-			$services->getMainWANObjectCache(),
-			LoggerFactory::getInstance( 'NameTableSqlStore' ),
-			'content_models',
-			'model_id',
-			'model_name'
-			/**
-			 * No strtolower normalization is added to the service as there are examples of
-			 * extensions that do not stick to this assumption.
-			 * - extensions/examples/DataPages define( 'CONTENT_MODEL_XML_DATA','XML_DATA' );
-			 * - extensions/Scribunto define( 'CONTENT_MODEL_SCRIBUNTO', 'Scribunto' );
-			 */
-		);
-	},
-
 	'CryptHKDF' => function ( MediaWikiServices $services ) : CryptHKDF {
 		$config = $services->getMainConfig();
 
@@ -355,8 +321,15 @@ return [
 			};
 		}
 
-		// XXX: MimeMagic::singleton currently requires this service to return an instance of MimeMagic
-		return new MimeMagic( $params );
+		return new MimeAnalyzer( $params );
+	},
+
+	'NameTableStoreFactory' => function ( MediaWikiServices $services ) : NameTableStoreFactory {
+		return new NameTableStoreFactory(
+			$services->getDBLoadBalancerFactory(),
+			$services->getMainWANObjectCache(),
+			LoggerFactory::getInstance( 'NameTableSqlStore' )
+		);
 	},
 
 	'OldRevisionImporter' => function ( MediaWikiServices $services ) : OldRevisionImporter {
@@ -445,6 +418,10 @@ return [
 		return $services->getRevisionStore();
 	},
 
+	'RevisionRenderer' => function ( MediaWikiServices $services ) : RevisionRenderer {
+		return new RevisionRenderer( $services->getDBLoadBalancer() );
+	},
+
 	'RevisionStore' => function ( MediaWikiServices $services ) : RevisionStore {
 		return $services->getRevisionStoreFactory()->getRevisionStore();
 	},
@@ -454,6 +431,7 @@ return [
 		$store = new RevisionStoreFactory(
 			$services->getDBLoadBalancerFactory(),
 			$services->getBlobStoreFactory(),
+			$services->getNameTableStoreFactory(),
 			$services->getMainWANObjectCache(),
 			$services->getCommentStore(),
 			$services->getActorMigration(),
@@ -537,18 +515,6 @@ return [
 		return $factory;
 	},
 
-	'SlotRoleStore' => function ( MediaWikiServices $services ) : NameTableStore {
-		return new NameTableStore(
-			$services->getDBLoadBalancer(),
-			$services->getMainWANObjectCache(),
-			LoggerFactory::getInstance( 'NameTableSqlStore' ),
-			'slot_roles',
-			'role_id',
-			'role_name',
-			'strtolower'
-		);
-	},
-
 	'SpecialPageFactory' => function ( MediaWikiServices $services ) : SpecialPageFactory {
 		return new SpecialPageFactory(
 			$services->getMainConfig(),