X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMediaWikiServices.php;h=7c9363ca19a8d0bff51a615615655cda309a6ff8;hb=7874fc4bec845ad92960b07e969c65f3c3fe74f2;hp=f91bbaed8acf7b12d009f0666a0332042add4c62;hpb=afb713a1fa51bb194d4ffac2d495796c0030fc14;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index f91bbaed8a..7c9363ca19 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -3,6 +3,7 @@ namespace MediaWiki;
 
 use Config;
 use ConfigFactory;
+use CryptHKDF;
 use CryptRand;
 use EventRelayerGroup;
 use GenderCache;
@@ -19,7 +20,9 @@ use MediaWiki\Services\SalvageableService;
 use MediaWiki\Services\ServiceContainer;
 use MediaWiki\Services\NoSuchServiceException;
 use MWException;
+use MimeAnalyzer;
 use ObjectCache;
+use Parser;
 use ProxyLookup;
 use SearchEngine;
 use SearchEngineConfig;
@@ -181,7 +184,7 @@ class MediaWikiServices extends ServiceContainer {
 
 		$oldInstance = self::$instance;
 
-		self::$instance = self::newInstance( $bootstrapConfig );
+		self::$instance = self::newInstance( $bootstrapConfig, 'load' );
 		self::$instance->importWiring( $oldInstance, [ 'BootstrapConfig' ] );
 
 		if ( $quick === 'quick' ) {
@@ -189,7 +192,6 @@ class MediaWikiServices extends ServiceContainer {
 		} else {
 			$oldInstance->destroy();
 		}
-
 	}
 
 	/**
@@ -295,7 +297,7 @@ class MediaWikiServices extends ServiceContainer {
 		self::resetGlobalInstance();
 
 		// Child, reseed because there is no bug in PHP:
-		// http://bugs.php.net/bug.php?id=42465
+		// https://bugs.php.net/bug.php?id=42465
 		mt_srand( getmypid() );
 	}
 
@@ -531,6 +533,14 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'CryptRand' );
 	}
 
+	/**
+	 * @since 1.28
+	 * @return CryptHKDF
+	 */
+	public function getCryptHKDF() {
+		return $this->getService( 'CryptHKDF' );
+	}
+
 	/**
 	 * @since 1.28
 	 * @return MediaHandlerFactory
@@ -539,6 +549,14 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'MediaHandlerFactory' );
 	}
 
+	/**
+	 * @since 1.28
+	 * @return MimeAnalyzer
+	 */
+	public function getMimeAnalyzer() {
+		return $this->getService( 'MimeAnalyzer' );
+	}
+
 	/**
 	 * @since 1.28
 	 * @return ProxyLookup
@@ -547,6 +565,14 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'ProxyLookup' );
 	}
 
+	/**
+	 * @since 1.29
+	 * @return Parser
+	 */
+	public function getParser() {
+		return $this->getService( 'Parser' );
+	}
+
 	/**
 	 * @since 1.28
 	 * @return GenderCache