From 196da35474b3af96a45a4653874d0db91c5051b4 Mon Sep 17 00:00:00 2001 From: Reedy Date: Sat, 20 Apr 2019 02:32:35 +0100 Subject: [PATCH] Remove FileRepo::streamFile() Change-Id: I96ccf5c96fabd1fa70d31eed75af384990e7eb5a --- RELEASE-NOTES-1.34 | 3 ++- includes/filerepo/FileRepo.php | 12 ------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index ee1a31934e..9e8195b588 100644 --- 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 3225625b6f..3a366c832c 100644 --- 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. -- 2.20.1