X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=73e4543a2ae6bf45fa0487af1e2d5c2c25f99610;hb=644dd792caa651a8279e786fc8fc2418eefc7811;hp=44ca5025ddc983d985f4a6dc296455b09d2d7585;hpb=5659c8bc4d176de4a5c312894652958a2bdd51ed;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 44ca5025dd..73e4543a2a 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -149,7 +149,10 @@ return [
 		$lbConf = MWLBFactory::applyDefaultConfig(
 			$mainConfig->get( 'LBFactoryConf' ),
 			$mainConfig,
-			$services->getConfiguredReadOnlyMode()
+			$services->getConfiguredReadOnlyMode(),
+			$services->getLocalServerObjectCache(),
+			$services->getMainObjectStash(),
+			$services->getMainWANObjectCache()
 		);
 		$class = MWLBFactory::getLBFactoryClass( $lbConf );
 
@@ -413,6 +416,13 @@ return [
 		);
 	},
 
+	'ResourceLoader' => function ( MediaWikiServices $services ) : ResourceLoader {
+		return new ResourceLoader(
+			$services->getMainConfig(),
+			LoggerFactory::getInstance( 'resourceloader' )
+		);
+	},
+
 	'RevisionFactory' => function ( MediaWikiServices $services ) : RevisionFactory {
 		return $services->getRevisionStore();
 	},
@@ -482,14 +492,10 @@ return [
 	},
 
 	'SiteLookup' => function ( MediaWikiServices $services ) : SiteLookup {
-		$cacheFile = $services->getMainConfig()->get( 'SitesCacheFile' );
-
-		if ( $cacheFile !== false ) {
-			return new FileBasedSiteLookup( $cacheFile );
-		} else {
-			// Use the default SiteStore as the SiteLookup implementation for now
-			return $services->getSiteStore();
-		}
+		// Use SiteStore as the SiteLookup as well. This was originally separated
+		// to allow for a cacheable read-only interface (using FileBasedSiteLookup),
+		// but this was never used. SiteStore has caching (see below).
+		return $services->getSiteStore();
 	},
 
 	'SiteStore' => function ( MediaWikiServices $services ) : SiteStore {
@@ -591,13 +597,16 @@ return [
 		return new WatchedItemQueryService(
 			$services->getDBLoadBalancer(),
 			$services->getCommentStore(),
-			$services->getActorMigration()
+			$services->getActorMigration(),
+			$services->getWatchedItemStore()
 		);
 	},
 
 	'WatchedItemStore' => function ( MediaWikiServices $services ) : WatchedItemStore {
 		$store = new WatchedItemStore(
 			$services->getDBLoadBalancerFactory(),
+			JobQueueGroup::singleton(),
+			$services->getMainObjectStash(),
 			new HashBagOStuff( [ 'maxKeys' => 100 ] ),
 			$services->getReadOnlyMode(),
 			$services->getMainConfig()->get( 'UpdateRowsPerQuery' )