X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=b8bd5d2270816aa43e56c76dcfc95d3f5d355bc1;hb=62c36e82cf424f6ef51b524b2da41ff798111d83;hp=286dde197ded6d09d1f0648ef4d1e4fc416da703;hpb=fd08137ebf8b34cb1a9711c34d6c4d0357aea5b7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 286dde197d..b8bd5d2270 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -37,6 +37,7 @@
  *      MediaWiki code base.
  */
 
+use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use MediaWiki\Auth\AuthManager;
 use MediaWiki\Config\ConfigRepository;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
@@ -50,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;
@@ -71,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(),
@@ -126,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();
 
@@ -358,6 +325,14 @@ return [
 		return new MimeMagic( $params );
 	},
 
+	'NameTableStoreFactory' => function ( MediaWikiServices $services ) : NameTableStoreFactory {
+		return new NameTableStoreFactory(
+			$services->getDBLoadBalancerFactory(),
+			$services->getMainWANObjectCache(),
+			LoggerFactory::getInstance( 'NameTableSqlStore' )
+		);
+	},
+
 	'OldRevisionImporter' => function ( MediaWikiServices $services ) : OldRevisionImporter {
 		return new ImportableOldRevisionImporter(
 			true,
@@ -400,11 +375,12 @@ return [
 	},
 
 	'PerDbNameStatsdDataFactory' =>
-	function ( MediaWikiServices $services ) : IBufferingStatsdDataFactory {
+	function ( MediaWikiServices $services ) : StatsdDataFactoryInterface {
 		$config = $services->getMainConfig();
 		$wiki = $config->get( 'DBname' );
-		return new BufferingStatsdDataFactory(
-			rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' ) . '.' . $wiki
+		return new PrefixingStatsdDataFactoryProxy(
+			$services->getStatsdDataFactory(),
+			$wiki
 		);
 	},
 
@@ -443,6 +419,10 @@ return [
 		return $services->getRevisionStore();
 	},
 
+	'RevisionRenderer' => function ( MediaWikiServices $services ) : RevisionRenderer {
+		return new RevisionRenderer( $services->getDBLoadBalancer() );
+	},
+
 	'RevisionStore' => function ( MediaWikiServices $services ) : RevisionStore {
 		return $services->getRevisionStoreFactory()->getRevisionStore();
 	},
@@ -452,6 +432,7 @@ return [
 		$store = new RevisionStoreFactory(
 			$services->getDBLoadBalancerFactory(),
 			$services->getBlobStoreFactory(),
+			$services->getNameTableStoreFactory(),
 			$services->getMainWANObjectCache(),
 			$services->getCommentStore(),
 			$services->getActorMigration(),
@@ -535,18 +516,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(),