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;
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;
use TitleFormatter;
use TitleParser;
use VirtualRESTServiceClient;
+use Wikimedia\Services\SalvageableService;
+use Wikimedia\Services\ServiceContainer;
+use Wikimedia\Services\NoSuchServiceException;
use MediaWiki\Interwiki\InterwikiLookup;
use MagicWordFactory;
* @return NameTableStore
*/
public function getChangeTagDefStore() {
- return $this->getService( 'ChangeTagDefStore' );
+ return $this->getService( 'NameTableStoreFactory' )->getChangeTagDef();
}
/**
* @return NameTableStore
*/
public function getContentModelStore() {
- return $this->getService( 'ContentModelStore' );
+ return $this->getService( 'NameTableStoreFactory' )->getContentModels();
}
/**
* @return CryptRand
*/
public function getCryptRand() {
+ wfDeprecated( __METHOD__, '1.32' );
return $this->getService( 'CryptRand' );
}
/**
* @since 1.32
+ * @return NameTableStoreFactory
+ */
+ public function getNameTableStoreFactory() {
+ return $this->getService( 'NameTableStoreFactory' );
+ }
+
+ /**
* @return OldRevisionImporter
*/
public function getOldRevisionImporter() {
return $this->getService( 'RevisionLookup' );
}
+ /**
+ * @since 1.32
+ * @return RevisionRenderer
+ */
+ public function getRevisionRenderer() {
+ return $this->getService( 'RevisionRenderer' );
+ }
+
/**
* @since 1.31
* @return RevisionStore
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();
}
/**