X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=96baf1469e77076c9e2b48793e01f80dcd6144d5;hb=31634739695493e929eeb6c8c1b7fd9c3f5bf826;hp=c9db5a88dcea338e84953193fe616d86d2d2b713;hpb=d029197c7c5b083edef20fa79cc3e6d58e161f72;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index c9db5a88dc..96baf1469e 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -82,6 +82,7 @@ return [
 	'BlobStoreFactory' => function ( MediaWikiServices $services ) : BlobStoreFactory {
 		return new BlobStoreFactory(
 			$services->getDBLoadBalancerFactory(),
+			$services->getExternalStoreAccess(),
 			$services->getMainWANObjectCache(),
 			new ServiceOptions( BlobStoreFactory::$constructorOptions,
 				$services->getMainConfig() ),
@@ -102,6 +103,7 @@ return [
 			$config->get( 'EnableDnsBlacklist' ),
 			$config->get( 'ProxyList' ),
 			$config->get( 'ProxyWhitelist' ),
+			$config->get( 'SecretKey' ),
 			$config->get( 'SoftBlockRanges' )
 		);
 	},
@@ -200,11 +202,22 @@ return [
 		return new EventRelayerGroup( $services->getMainConfig()->get( 'EventRelayerConfig' ) );
 	},
 
+	'ExternalStoreAccess' => function ( MediaWikiServices $services ) : ExternalStoreAccess {
+		return new ExternalStoreAccess(
+			$services->getExternalStoreFactory(),
+			LoggerFactory::getInstance( 'ExternalStore' )
+		);
+	},
+
 	'ExternalStoreFactory' => function ( MediaWikiServices $services ) : ExternalStoreFactory {
 		$config = $services->getMainConfig();
+		$writeStores = $config->get( 'DefaultExternalStore' );
 
 		return new ExternalStoreFactory(
-			$config->get( 'ExternalStores' )
+			$config->get( 'ExternalStores' ),
+			( $writeStores !== false ) ? (array)$writeStores : [],
+			$services->getDBLoadBalancer()->getLocalDomainID(),
+			LoggerFactory::getInstance( 'ExternalStore' )
 		);
 	},
 
@@ -463,6 +476,9 @@ return [
 			$config->get( 'WhitelistReadRegexp' ),
 			$config->get( 'EmailConfirmToEdit' ),
 			$config->get( 'BlockDisablesLogin' ),
+			$config->get( 'GroupPermissions' ),
+			$config->get( 'RevokePermissions' ),
+			$config->get( 'AvailableRights' ),
 			$services->getNamespaceInfo()
 		);
 	},
@@ -484,8 +500,8 @@ return [
 	'ProxyLookup' => function ( MediaWikiServices $services ) : ProxyLookup {
 		$mainConfig = $services->getMainConfig();
 		return new ProxyLookup(
-			$mainConfig->get( 'SquidServers' ),
-			$mainConfig->get( 'SquidServersNoPurge' )
+			$mainConfig->get( 'CdnServers' ),
+			$mainConfig->get( 'CdnServersNoPurge' )
 		);
 	},