dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Change name of main page in Sardinian (sc)"
[lhc/web/wiklou.git]
/
includes
/
ServiceWiring.php
diff --git
a/includes/ServiceWiring.php
b/includes/ServiceWiring.php
index
44ca502
..
73e4543
100644
(file)
--- a/
includes/ServiceWiring.php
+++ b/
includes/ServiceWiring.php
@@
-149,7
+149,10
@@
return [
$lbConf = MWLBFactory::applyDefaultConfig(
$mainConfig->get( 'LBFactoryConf' ),
$mainConfig,
$lbConf = MWLBFactory::applyDefaultConfig(
$mainConfig->get( 'LBFactoryConf' ),
$mainConfig,
- $services->getConfiguredReadOnlyMode()
+ $services->getConfiguredReadOnlyMode(),
+ $services->getLocalServerObjectCache(),
+ $services->getMainObjectStash(),
+ $services->getMainWANObjectCache()
);
$class = MWLBFactory::getLBFactoryClass( $lbConf );
);
$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();
},
'RevisionFactory' => function ( MediaWikiServices $services ) : RevisionFactory {
return $services->getRevisionStore();
},
@@
-482,14
+492,10
@@
return [
},
'SiteLookup' => function ( MediaWikiServices $services ) : SiteLookup {
},
'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 {
},
'SiteStore' => function ( MediaWikiServices $services ) : SiteStore {
@@
-591,13
+597,16
@@
return [
return new WatchedItemQueryService(
$services->getDBLoadBalancer(),
$services->getCommentStore(),
return new WatchedItemQueryService(
$services->getDBLoadBalancer(),
$services->getCommentStore(),
- $services->getActorMigration()
+ $services->getActorMigration(),
+ $services->getWatchedItemStore()
);
},
'WatchedItemStore' => function ( MediaWikiServices $services ) : WatchedItemStore {
$store = new WatchedItemStore(
$services->getDBLoadBalancerFactory(),
);
},
'WatchedItemStore' => function ( MediaWikiServices $services ) : WatchedItemStore {
$store = new WatchedItemStore(
$services->getDBLoadBalancerFactory(),
+ JobQueueGroup::singleton(),
+ $services->getMainObjectStash(),
new HashBagOStuff( [ 'maxKeys' => 100 ] ),
$services->getReadOnlyMode(),
$services->getMainConfig()->get( 'UpdateRowsPerQuery' )
new HashBagOStuff( [ 'maxKeys' => 100 ] ),
$services->getReadOnlyMode(),
$services->getMainConfig()->get( 'UpdateRowsPerQuery' )