Remove FileRepo::streamFile()

Change-Id: I96ccf5c96fabd1fa70d31eed75af384990e7eb5a

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index ee1a319..9e8195b 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -99,7 +99,8 @@ because of Phabricator reports.
   list=allusers, deprecated in 1.25, has been removed.
 * SearchEngine::userNamespaces(), SearchEngine::namespacesAsText(),
   SearchEngine::create(), SearchEngine::getSearchTypes() and
-  SearchEngine::getNearMatch(), methods deprecated in 1.27, have been removed
+  SearchEngine::getNearMatch(), methods deprecated in 1.27, have been removed.
+* FileRepo::streamFile(), deprecated in 1.26, has been removed.
 
 === Deprecations in 1.34 ===
 * The MWNamespace class is deprecated. Use MediaWikiServices::getNamespaceInfo.

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 3225625..3a366c8 100644 (file)
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -1630,18 +1630,6 @@ class FileRepo {
                return $status;
        }
 
-       /**
-        * Attempt to stream a file with the given virtual URL/storage path
-        *
-        * @deprecated since 1.26, use streamFileWithStatus
-        * @param string $virtualUrl
-        * @param array $headers Additional HTTP headers to send on success
-        * @return bool Success
-        */
-       public function streamFile( $virtualUrl, $headers = [] ) {
-               return $this->streamFileWithStatus( $virtualUrl, $headers )->isOK();
-       }
-
        /**
         * Call a callback function for every public regular file in the repository.
         * This only acts on the current version of files, not any old versions.