X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMediaWikiServices.php;h=7c9363ca19a8d0bff51a615615655cda309a6ff8;hb=8f3f831e7ccbc176702c3baac6732decd243479d;hp=b16044e12d90073a042b38edd9c3257273ca792a;hpb=5e8896ce39894b9c705a291525c6735a576b6b1c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index b16044e12d..7c9363ca19 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -3,6 +3,8 @@ namespace MediaWiki;
 
 use Config;
 use ConfigFactory;
+use CryptHKDF;
+use CryptRand;
 use EventRelayerGroup;
 use GenderCache;
 use GlobalVarConfig;
@@ -18,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;
@@ -180,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' ) {
@@ -188,7 +192,6 @@ class MediaWikiServices extends ServiceContainer {
 		} else {
 			$oldInstance->destroy();
 		}
-
 	}
 
 	/**
@@ -294,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() );
 	}
 
@@ -522,6 +525,22 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'WatchedItemQueryService' );
 	}
 
+	/**
+	 * @since 1.28
+	 * @return CryptRand
+	 */
+	public function getCryptRand() {
+		return $this->getService( 'CryptRand' );
+	}
+
+	/**
+	 * @since 1.28
+	 * @return CryptHKDF
+	 */
+	public function getCryptHKDF() {
+		return $this->getService( 'CryptHKDF' );
+	}
+
 	/**
 	 * @since 1.28
 	 * @return MediaHandlerFactory
@@ -530,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
@@ -538,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
@@ -589,6 +624,30 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'TitleParser' );
 	}
 
+	/**
+	 * @since 1.28
+	 * @return \BagOStuff
+	 */
+	public function getMainObjectStash() {
+		return $this->getService( 'MainObjectStash' );
+	}
+
+	/**
+	 * @since 1.28
+	 * @return \WANObjectCache
+	 */
+	public function getMainWANObjectCache() {
+		return $this->getService( 'MainWANObjectCache' );
+	}
+
+	/**
+	 * @since 1.28
+	 * @return \BagOStuff
+	 */
+	public function getLocalServerObjectCache() {
+		return $this->getService( 'LocalServerObjectCache' );
+	}
+
 	/**
 	 * @since 1.28
 	 * @return VirtualRESTServiceClient