Merge "resourceloader: Remove deprecated MessageBlobStore::getBlob"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 6e5de2c..2b514af 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -346,6 +346,8 @@ because of Phabricator reports.
   to "Pàgina printzipale". Existing wikis using this content language need to
   move the main page or change the name through MediaWiki:Mainpage page.
 * wfSplitWikiID(), deprecated in 1.32, has been removed.
+* MessageBlobStore::getBlob(), deprecated in 1.27, has been removed.
+  Use ::getBlobs() instead.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected

diff --git a/includes/resourceloader/MessageBlobStore.php b/includes/resourceloader/MessageBlobStore.php
index ceb51f2..b7c1904 100644 (file)
--- a/includes/resourceloader/MessageBlobStore.php
+++ b/includes/resourceloader/MessageBlobStore.php
@@ -121,14 +121,6 @@ class MessageBlobStore implements LoggerAwareInterface {
                return $blobs;
        }
 
-       /**
-        * @deprecated since 1.27 Use getBlobs() instead
-        * @return array
-        */
-       public function get( ResourceLoader $resourceLoader, $modules, $lang ) {
-               return $this->getBlobs( $modules, $lang );
-       }
-
        /**
         * @since 1.27
         * @param ResourceLoaderModule $module