X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMediaWikiServices.php;h=4abd729d454a3fd2b6f558531c3fefdd3c43f9b1;hb=84e2feee2d55bb4a3221841d095b74598b447d4a;hp=4a6046d7154b6ee2b621647575d79c3a8a023d80;hpb=4e021bb8d4741d5af0f02942fe3c33a19e7fabca;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index 4a6046d715..4abd729d45 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -16,15 +16,18 @@ use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Preferences\PreferencesFactory;
 use MediaWiki\Shell\CommandFactory;
+use MediaWiki\Revision\RevisionRenderer;
+use MediaWiki\Revision\SlotRoleRegistry;
 use MediaWiki\Special\SpecialPageFactory;
 use MediaWiki\Storage\BlobStore;
 use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\NameTableStore;
-use MediaWiki\Storage\RevisionFactory;
-use MediaWiki\Storage\RevisionLookup;
-use MediaWiki\Storage\RevisionStore;
+use MediaWiki\Storage\NameTableStoreFactory;
+use MediaWiki\Revision\RevisionFactory;
+use MediaWiki\Revision\RevisionLookup;
+use MediaWiki\Revision\RevisionStore;
 use OldRevisionImporter;
-use MediaWiki\Storage\RevisionStoreFactory;
+use MediaWiki\Revision\RevisionStoreFactory;
 use UploadRevisionImporter;
 use Wikimedia\Rdbms\LBFactory;
 use LinkCache;
@@ -33,9 +36,6 @@ use MediaHandlerFactory;
 use MediaWiki\Config\ConfigRepository;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkRendererFactory;
-use MediaWiki\Services\SalvageableService;
-use MediaWiki\Services\ServiceContainer;
-use MediaWiki\Services\NoSuchServiceException;
 use MWException;
 use MimeAnalyzer;
 use ObjectCache;
@@ -55,6 +55,9 @@ use SkinFactory;
 use TitleFormatter;
 use TitleParser;
 use VirtualRESTServiceClient;
+use Wikimedia\Services\SalvageableService;
+use Wikimedia\Services\ServiceContainer;
+use Wikimedia\Services\NoSuchServiceException;
 use MediaWiki\Interwiki\InterwikiLookup;
 use MagicWordFactory;
 
@@ -451,7 +454,7 @@ class MediaWikiServices extends ServiceContainer {
 	 * @return NameTableStore
 	 */
 	public function getChangeTagDefStore() {
-		return $this->getService( 'ChangeTagDefStore' );
+		return $this->getService( 'NameTableStoreFactory' )->getChangeTagDef();
 	}
 
 	/**
@@ -499,7 +502,7 @@ class MediaWikiServices extends ServiceContainer {
 	 * @return NameTableStore
 	 */
 	public function getContentModelStore() {
-		return $this->getService( 'ContentModelStore' );
+		return $this->getService( 'NameTableStoreFactory' )->getContentModels();
 	}
 
 	/**
@@ -516,6 +519,7 @@ class MediaWikiServices extends ServiceContainer {
 	 * @return CryptRand
 	 */
 	public function getCryptRand() {
+		wfDeprecated( __METHOD__, '1.32' );
 		return $this->getService( 'CryptRand' );
 	}
 
@@ -663,6 +667,13 @@ class MediaWikiServices extends ServiceContainer {
 
 	/**
 	 * @since 1.32
+	 * @return NameTableStoreFactory
+	 */
+	public function getNameTableStoreFactory() {
+		return $this->getService( 'NameTableStoreFactory' );
+	}
+
+	/**
 	 * @return OldRevisionImporter
 	 */
 	public function getOldRevisionImporter() {
@@ -749,6 +760,14 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'RevisionLookup' );
 	}
 
+	/**
+	 * @since 1.32
+	 * @return RevisionRenderer
+	 */
+	public function getRevisionRenderer() {
+		return $this->getService( 'RevisionRenderer' );
+	}
+
 	/**
 	 * @since 1.31
 	 * @return RevisionStore
@@ -822,12 +841,20 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'SkinFactory' );
 	}
 
+	/**
+	 * @since 1.33
+	 * @return SlotRoleRegistry
+	 */
+	public function getSlotRoleRegistry() {
+		return $this->getService( 'SlotRoleRegistry' );
+	}
+
 	/**
 	 * @since 1.31
 	 * @return NameTableStore
 	 */
 	public function getSlotRoleStore() {
-		return $this->getService( 'SlotRoleStore' );
+		return $this->getService( 'NameTableStoreFactory' )->getSlotRoles();
 	}
 
 	/**