X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=832cee89c2f609b149d718637e9f00bb3965fc0d;hb=4d6828ef7835b7c5c5e903637fcba4bf5c487e1b;hp=cccb5e733ffc949474ae62bc4a99df0253f5321c;hpb=f01e440304a09f14274260f37c9425a42db6145b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index cccb5e733f..832cee89c2 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -39,6 +39,7 @@
 
 use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use MediaWiki\Auth\AuthManager;
+use MediaWiki\Block\BlockRestrictionStore;
 use MediaWiki\Config\ConfigRepository;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Interwiki\InterwikiLookup;
@@ -62,6 +63,7 @@ use MediaWiki\Storage\BlobStore;
 use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\NameTableStoreFactory;
 use MediaWiki\Storage\SqlBlobStore;
+use MediaWiki\Storage\PageEditStash;
 
 return [
 	'ActorMigration' => function ( MediaWikiServices $services ) : ActorMigration {
@@ -83,6 +85,12 @@ return [
 		);
 	},
 
+	'BlockRestrictionStore' => function ( MediaWikiServices $services ) : BlockRestrictionStore {
+		return new BlockRestrictionStore(
+			$services->getDBLoadBalancer()
+		);
+	},
+
 	'CommentStore' => function ( MediaWikiServices $services ) : CommentStore {
 		return new CommentStore(
 			$services->getContentLanguage(),
@@ -134,8 +142,8 @@ return [
 		return new CryptHKDF( $secret, $config->get( 'HKDFAlgorithm' ), $cache, $context );
 	},
 
-	'CryptRand' => function () : CryptRand {
-		return new CryptRand();
+	'DateFormatterFactory' => function () : DateFormatterFactory {
+		return new DateFormatterFactory;
 	},
 
 	'DBLoadBalancer' => function ( MediaWikiServices $services ) : Wikimedia\Rdbms\LoadBalancer {
@@ -330,6 +338,10 @@ return [
 		return new MimeAnalyzer( $params );
 	},
 
+	'NamespaceInfo' => function ( MediaWikiServices $services ) : NamespaceInfo {
+		return new NamespaceInfo( $services->getMainConfig() );
+	},
+
 	'NameTableStoreFactory' => function ( MediaWikiServices $services ) : NameTableStoreFactory {
 		return new NameTableStoreFactory(
 			$services->getDBLoadBalancerFactory(),
@@ -346,6 +358,20 @@ return [
 		);
 	},
 
+	'PageEditStash' => function ( MediaWikiServices $services ) : PageEditStash {
+		$config = $services->getMainConfig();
+
+		return new PageEditStash(
+			ObjectCache::getLocalClusterInstance(),
+			$services->getDBLoadBalancer(),
+			LoggerFactory::getInstance( 'StashEdit' ),
+			$services->getStatsdDataFactory(),
+			defined( 'MEDIAWIKI_JOB_RUNNER' ) || $config->get( 'CommandLineMode' )
+				? PageEditStash::INITIATOR_JOB_OR_CLI
+				: PageEditStash::INITIATOR_USER
+		);
+	},
+
 	'Parser' => function ( MediaWikiServices $services ) : Parser {
 		return $services->getParserFactory()->create();
 	},
@@ -368,7 +394,9 @@ return [
 			$services->getContentLanguage(),
 			wfUrlProtocols(),
 			$services->getSpecialPageFactory(),
-			$services->getMainConfig()
+			$services->getMainConfig(),
+			$services->getLinkRendererFactory(),
+			$services->getNamespaceInfo()
 		);
 	},
 
@@ -397,7 +425,9 @@ return [
 			$config->get( 'WhitelistRead' ),
 			$config->get( 'WhitelistReadRegexp' ),
 			$config->get( 'EmailConfirmToEdit' ),
-			$config->get( 'BlockDisablesLogin' ) );
+			$config->get( 'BlockDisablesLogin' ),
+			$services->getNamespaceInfo()
+		);
 	},
 
 	'PreferencesFactory' => function ( MediaWikiServices $services ) : PreferencesFactory {
@@ -428,14 +458,25 @@ return [
 	},
 
 	'ResourceLoader' => function ( MediaWikiServices $services ) : ResourceLoader {
+		global $IP;
 		$config = $services->getMainConfig();
 
 		$rl = new ResourceLoader(
 			$config,
 			LoggerFactory::getInstance( 'resourceloader' )
 		);
+
 		$rl->addSource( $config->get( 'ResourceLoaderSources' ) );
 
+		// Core modules, then extension/skin modules
+		$rl->register( include "$IP/resources/Resources.php" );
+		$rl->register( $config->get( 'ResourceModules' ) );
+		Hooks::run( 'ResourceLoaderRegisterModules', [ &$rl ] );
+
+		if ( $config->get( 'EnableJavaScriptTest' ) === true ) {
+			$rl->registerTestModules();
+		}
+
 		return $rl;
 	},
 
@@ -564,8 +605,13 @@ return [
 	},
 
 	'SpecialPageFactory' => function ( MediaWikiServices $services ) : SpecialPageFactory {
+		$config = $services->getMainConfig();
+		$options = [];
+		foreach ( SpecialPageFactory::$constructorOptions as $key ) {
+			$options[$key] = $config->get( $key );
+		}
 		return new SpecialPageFactory(
-			$services->getMainConfig(),
+			$options,
 			$services->getContentLanguage()
 		);
 	},
@@ -650,7 +696,8 @@ return [
 			$services->getContentLanguage(),
 			$services->getGenderCache(),
 			$services->getMainConfig()->get( 'LocalInterwikis' ),
-			$services->getInterwikiLookup()
+			$services->getInterwikiLookup(),
+			$services->getNamespaceInfo()
 		);
 	},