Drop File / MediaHandler::getStreamHeaders(), deprecated since 1.30

Change-Id: Ia4f6cee5674a492c098c343943095cb668172311

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 7732048..10244c0 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -339,6 +339,7 @@ because of Phabricator reports.
 * The hook 'ChangesListSpecialPageFilters', deprecated in 1.29, has now been
   removed. Use the 'ChangesListSpecialPageStructuredFilters' hook instead.
 * DeferredUpdates::setImmediateMode(), deprecated since 1.29, has been removed.
+* File / MediaHandler::getStreamHeaders(), deprecated since 1.30, was removed.
 
 === Deprecations in 1.32 ===
 * HTMLForm::setSubmitProgressive() is deprecated. No need to call it. Submit

diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 6a788b6..6d01c29 100644 (file)
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -2168,14 +2168,6 @@ abstract class File implements IDBAccessObject {
                return true;
        }
 
-       /**
-        * @deprecated since 1.30, use File::getContentHeaders instead
-        */
-       function getStreamHeaders() {
-               wfDeprecated( __METHOD__, '1.30' );
-               return $this->getContentHeaders();
-       }
-
        /**
         * @return string[] HTTP header name/value map to use for HEAD/GET request responses
         * @since 1.30

diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php
index 0f820ae..71db975 100644 (file)
--- a/includes/media/MediaHandler.php
+++ b/includes/media/MediaHandler.php
@@ -303,16 +303,6 @@ abstract class MediaHandler {
                return [ $ext, $mime ];
        }
 
-       /**
-        * @deprecated since 1.30, use MediaHandler::getContentHeaders instead
-        * @param array $metadata
-        * @return array
-        */
-       public function getStreamHeaders( $metadata ) {
-               wfDeprecated( __METHOD__, '1.30' );
-               return $this->getContentHeaders( $metadata );
-       }
-
        /**
         * True if the handled types can be transformed
         *