X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMediaWikiServices.php;h=4abd729d454a3fd2b6f558531c3fefdd3c43f9b1;hb=84e2feee2d55bb4a3221841d095b74598b447d4a;hp=b236ca1da10658580619c04d8d3d1c2bd15bc04b;hpb=b9fd6b1327ad50ce085cf8b0b874d397d7b7082a;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php index b236ca1da1..4abd729d45 100644 --- a/includes/MediaWikiServices.php +++ b/includes/MediaWikiServices.php @@ -17,16 +17,17 @@ 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\NameTableStoreFactory; -use MediaWiki\Storage\RevisionFactory; -use MediaWiki\Storage\RevisionLookup; -use MediaWiki\Storage\RevisionStore; +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; @@ -35,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; @@ -57,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; @@ -518,6 +519,7 @@ class MediaWikiServices extends ServiceContainer { * @return CryptRand */ public function getCryptRand() { + wfDeprecated( __METHOD__, '1.32' ); return $this->getService( 'CryptRand' ); } @@ -839,6 +841,14 @@ 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