X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FServiceWiring.php;h=397a7d25c389018ff7bb098115ee21941b18d644;hp=246b8381d9a9c4592c190141737649fc93b11309;hb=d9c25c2f4776832c0fe3d7be091fd7f776991122;hpb=e3a869de07016defcf87ed014b6a6ddf986c6732

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 246b8381d9..397a7d25c3 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -47,6 +47,7 @@ use MediaWiki\Shell\CommandFactory;
 use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\RevisionStore;
 use MediaWiki\Storage\SqlBlobStore;
+use Wikimedia\ObjectFactory;
 
 return [
 	'DBLoadBalancerFactory' => function ( MediaWikiServices $services ) {
@@ -166,11 +167,19 @@ return [
 			$services->getReadOnlyMode()
 		);
 		$store->setStatsdDataFactory( $services->getStatsdDataFactory() );
+
+		if ( $services->getMainConfig()->get( 'ReadOnlyWatchedItemStore' ) ) {
+			$store = new NoWriteWatchedItemStore( $store );
+		}
+
 		return $store;
 	},
 
 	'WatchedItemQueryService' => function ( MediaWikiServices $services ) {
-		return new WatchedItemQueryService( $services->getDBLoadBalancer() );
+		return new WatchedItemQueryService(
+			$services->getDBLoadBalancer(),
+			$services->getCommentStore()
+		);
 	},
 
 	'CryptRand' => function ( MediaWikiServices $services ) {
@@ -471,12 +480,22 @@ return [
 			$services->getMainWANObjectCache()
 		);
 
+		$store->setLogger( LoggerFactory::getInstance( 'RevisionStore' ) );
+
 		$config = $services->getMainConfig();
 		$store->setContentHandlerUseDB( $config->get( 'ContentHandlerUseDB' ) );
 
 		return $store;
 	},
 
+	'RevisionLookup' => function ( MediaWikiServices $services ) {
+		return $services->getRevisionStore();
+	},
+
+	'RevisionFactory' => function ( MediaWikiServices $services ) {
+		return $services->getRevisionStore();
+	},
+
 	'BlobStoreFactory' => function ( MediaWikiServices $services ) {
 		global $wgContLang;
 		return new BlobStoreFactory(
@@ -503,6 +522,18 @@ return [
 		return new DefaultPreferencesFactory( $config, $wgContLang, $authManager, $linkRenderer );
 	},
 
+	'HttpRequestFactory' => function ( MediaWikiServices $services ) {
+		return new \MediaWiki\Http\HttpRequestFactory();
+	},
+
+	'CommentStore' => function ( MediaWikiServices $services ) {
+		global $wgContLang;
+		return new CommentStore(
+			$wgContLang,
+			$services->getMainConfig()->get( 'CommentTableSchemaMigrationStage' )
+		);
+	}
+
 	///////////////////////////////////////////////////////////////////////////
 	// NOTE: When adding a service here, don't forget to add a getter function
 	// in the MediaWikiServices class. The convenience getter should just call