X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=c192b5a266405847cfa56a86813fd5d38dfa1955;hb=d639af832d0c4fa518a18b90ae4d8eee8eb7ad4b;hp=7d2b3cb14f2845bfdadae2d4379ef4dc974c7b8d;hpb=57e4804bf2ba4481eb9b35680fb8ccc71a912c50;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 7d2b3cb14f..c192b5a266 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -91,7 +91,6 @@ return [
 	},
 
 	'BlockManager' => function ( MediaWikiServices $services ) : BlockManager {
-		$config = $services->getMainConfig();
 		$context = RequestContext::getMain();
 		return new BlockManager(
 			new ServiceOptions(
@@ -216,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' =>
@@ -264,6 +268,7 @@ return [
 
 	'LocalServerObjectCache' => function ( MediaWikiServices $services ) : BagOStuff {
 		$cacheId = \ObjectCache::detectLocalServerCache();
+
 		return \ObjectCache::newFromId( $cacheId );
 	},
 
@@ -440,7 +445,8 @@ return [
 			wfUrlProtocols(),
 			$services->getSpecialPageFactory(),
 			$services->getLinkRendererFactory(),
-			$services->getNamespaceInfo()
+			$services->getNamespaceInfo(),
+			LoggerFactory::getInstance( 'Parser' )
 		);
 	},
 
@@ -466,6 +472,7 @@ return [
 		$config = $services->getMainConfig();
 		return new PermissionManager(
 			$services->getSpecialPageFactory(),
+			$services->getRevisionLookup(),
 			$config->get( 'WhitelistRead' ),
 			$config->get( 'WhitelistReadRegexp' ),
 			$config->get( 'EmailConfirmToEdit' ),
@@ -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 );
 	},