From 716bb024aaacdd9676fb26dd489188885f0479cc Mon Sep 17 00:00:00 2001 From: Derick Alangi Date: Wed, 5 Jun 2019 17:38:39 +0100 Subject: [PATCH] Parser: Remove deprecated method Parser::fetchFile() Deprecated in 1.32 and no longer used, see usage below; Usage ===== https://codesearch.wmflabs.org/search/?q=%5CbfetchFile%5C(%20(.*%3F)%2C%20(.*%3F)%20%5C)&i=nope&files=&repos= Change-Id: Id0f76ee5c0e2a230dabb563c9d9e5c0a584f6b2c --- RELEASE-NOTES-1.34 | 2 ++ includes/parser/Parser.php | 13 ------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index 0f7ebce0fc..606f4626a4 100644 --- a/RELEASE-NOTES-1.34 +++ b/RELEASE-NOTES-1.34 @@ -218,6 +218,8 @@ because of Phabricator reports. * The $wgUseKeyHeader configuration option and the OutputPage::getKeyHeader() method, deprecated in 1.32, have been removed. * WebInstallerOutput::addWikiText(), deprecated in 1.32, has been removed. +* Parser::fetchFile(), deprecated in 1.32, has been removed. Use the method + Parser::fetchFileAndTitle() instead. * … === Deprecations in 1.34 === diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index c61de38a86..59f2db452f 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -3836,19 +3836,6 @@ class Parser { 'deps' => $deps ]; } - /** - * Fetch a file and its title and register a reference to it. - * If 'broken' is a key in $options then the file will appear as a broken thumbnail. - * @param Title $title - * @param array $options Array of options to RepoGroup::findFile - * @return File|bool - * @deprecated since 1.32, use fetchFileAndTitle instead - */ - public function fetchFile( $title, $options = [] ) { - wfDeprecated( __METHOD__, '1.32' ); - return $this->fetchFileAndTitle( $title, $options )[0]; - } - /** * Fetch a file and its title and register a reference to it. * If 'broken' is a key in $options then the file will appear as a broken thumbnail. -- 2.20.1