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

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 1bb848fb04..c192b5a266 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -215,7 +215,12 @@ return [
 	},
 
 	'GenderCache' => function ( MediaWikiServices $services ) : GenderCache {
-		return new GenderCache( $services->getNamespaceInfo() );
+		$nsInfo = $services->getNamespaceInfo();
+		// Database layer may be disabled, so processing without database connection
+		$dbLoadBalancer = $services->isServiceDisabled( 'DBLoadBalancer' )
+			? null
+			: $services->getDBLoadBalancer();
+		return new GenderCache( $nsInfo, $dbLoadBalancer );
 	},
 
 	'HttpRequestFactory' =>
@@ -263,6 +268,7 @@ return [
 
 	'LocalServerObjectCache' => function ( MediaWikiServices $services ) : BagOStuff {
 		$cacheId = \ObjectCache::detectLocalServerCache();
+
 		return \ObjectCache::newFromId( $cacheId );
 	},
 
@@ -439,7 +445,8 @@ return [
 			wfUrlProtocols(),
 			$services->getSpecialPageFactory(),
 			$services->getLinkRendererFactory(),
-			$services->getNamespaceInfo()
+			$services->getNamespaceInfo(),
+			LoggerFactory::getInstance( 'Parser' )
 		);
 	},
 
@@ -620,9 +627,10 @@ return [
 	'SiteStore' => function ( MediaWikiServices $services ) : SiteStore {
 		$rawSiteStore = new DBSiteStore( $services->getDBLoadBalancer() );
 
-		// TODO: replace wfGetCache with a CacheFactory service.
-		// TODO: replace wfIsHHVM with a capabilities service.
-		$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL : CACHE_ANYTHING );
+		$cache = $services->getLocalServerObjectCache();
+		if ( $cache instanceof EmptyBagOStuff ) {
+			$cache = ObjectCache::getLocalClusterInstance();
+		}
 
 		return new CachingSiteStore( $rawSiteStore, $cache );
 	},