From: Derick Alangi Date: Thu, 9 May 2019 15:35:44 +0000 (+0100) Subject: Remove several deprecated unused methods from OutputPage & ParserOutput X-Git-Tag: 1.34.0-rc.0~1737^2 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=b4e557f8f8a72d4539e0cf5f83add4eef8df418b;p=lhc%2Fweb%2Fwiklou.git Remove several deprecated unused methods from OutputPage & ParserOutput Output::sectionEditLinksEnabled(), ParserOutput::getEditSectionTokens() and ::getTOCEnabled(), ::setEditSectionTokens(), ::setTOCEnabled have been removed. Change-Id: I7fe927776e2451bafb96ef5c4ee500497ec3734c --- diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index f5edaa0d86..e5e95d24e8 100644 --- a/RELEASE-NOTES-1.34 +++ b/RELEASE-NOTES-1.34 @@ -120,6 +120,9 @@ because of Phabricator reports. * User::makeGroupLinkWiki(), deprecated in 1.29, has been removed. Use UserGroupMembership::getLink() instead. * SavepointPostgres, deprecated in 1.31, has been removed. +* Output::sectionEditLinksEnabled(), ParserOutput::getEditSectionTokens, + ::getTOCEnabled, ::setEditSectionTokens, ::setTOCEnabled, deprecated in 1.31 + have been removed. * … === Deprecations in 1.34 === diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 56e23707fc..e0f25cd63a 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -4231,16 +4231,6 @@ class OutputPage extends ContextSource { wfDeprecated( __METHOD__, '1.31' ); } - /** - * @return bool - * @since 1.23 - * @deprecated since 1.31, use $poOptions to addParserOutput() instead. - */ - public function sectionEditLinksEnabled() { - wfDeprecated( __METHOD__, '1.31' ); - return true; - } - /** * Helper function to setup the PHP implementation of OOUI to use in this request. * diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php index f2aaeedc7c..f80e6bf5d2 100644 --- a/includes/parser/ParserOutput.php +++ b/includes/parser/ParserOutput.php @@ -471,14 +471,6 @@ class ParserOutput extends CacheTime { return $this->mSections; } - /** - * @deprecated since 1.31 Use getText() options. - */ - public function getEditSectionTokens() { - wfDeprecated( __METHOD__, '1.31' ); - return true; - } - public function &getLinks() { return $this->mLinks; } @@ -566,14 +558,6 @@ class ParserOutput extends CacheTime { return $this->mLimitReportJSData; } - /** - * @deprecated since 1.31 Use getText() options. - */ - public function getTOCEnabled() { - wfDeprecated( __METHOD__, '1.31' ); - return true; - } - public function getEnableOOUI() { return $this->mEnableOOUI; } @@ -598,14 +582,6 @@ class ParserOutput extends CacheTime { return wfSetVar( $this->mSections, $toc ); } - /** - * @deprecated since 1.31 Use getText() options. - */ - public function setEditSectionTokens( $t ) { - wfDeprecated( __METHOD__, '1.31' ); - return true; - } - public function setIndexPolicy( $policy ) { return wfSetVar( $this->mIndexPolicy, $policy ); } @@ -618,14 +594,6 @@ class ParserOutput extends CacheTime { return wfSetVar( $this->mTimestamp, $timestamp ); } - /** - * @deprecated since 1.31 Use getText() options. - */ - public function setTOCEnabled( $flag ) { - wfDeprecated( __METHOD__, '1.31' ); - return true; - } - public function addCategory( $c, $sort ) { $this->mCategories[$c] = $sort; }