From 72b6e47288f142107a71616bd91cdca1979c1057 Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Wed, 10 Oct 2018 15:17:16 -0700
Subject: [PATCH] Drop File / MediaHandler::getStreamHeaders(), deprecated
 since 1.30

Change-Id: Ia4f6cee5674a492c098c343943095cb668172311
---
 RELEASE-NOTES-1.32              |  1 +
 includes/filerepo/file/File.php |  8 --------
 includes/media/MediaHandler.php | 10 ----------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 77320488cf..10244c0a8b 100644
--- 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 6a788b627f..6d01c29144 100644
--- 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 0f820ae969..71db975380 100644
--- 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
 	 *
-- 
2.20.1