Merge "config: ServiceOptions O(1) assert time in the common case"

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 431db3d..5d844e9 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -153,9 +153,10 @@ 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.
+* OutputPage::enableSectionEditLinks(), OutputPage::sectionEditLinksEnabled(),
+  ParserOptions::getEditSection(), ParserOptions::setEditSection(), and
+  ParserOutput::getEditSectionTokens, ::getTOCEnabled, ::setEditSectionTokens,
+  and ::setTOCEnabled, deprecated in 1.31, have been removed.
 * EditPage::safeUnicodeInput() and ::safeUnicodeOutput(), deprecated in 1.30,
   have been removed.
 * Four methods in OutputPage, deprecated in 1.32, have been removed. You should
@@ -217,6 +218,9 @@ because of Phabricator reports.
   removed.
 * 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/OutputPage.php b/includes/OutputPage.php
index fba75ec..6c49696 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -4017,16 +4017,6 @@ class OutputPage extends ContextSource {
                return $this->mEnableTOC;
        }
 
-       /**
-        * Enables/disables section edit links, doesn't override __NOEDITSECTION__
-        * @param bool $flag
-        * @since 1.23
-        * @deprecated since 1.31, use $poOptions to addParserOutput() instead.
-        */
-       public function enableSectionEditLinks( $flag = true ) {
-               wfDeprecated( __METHOD__, '1.31' );
-       }
-
        /**
         * Helper function to setup the PHP implementation of OOUI to use in this request.
         *

diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 65e7457..cbb9b57 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -90,15 +90,6 @@ class WebInstallerOutput {
                $this->flush();
        }
 
-       /**
-        * @param string $text
-        * @deprecated since 1.32; use addWikiTextAsInterface instead
-        */
-       public function addWikiText( $text ) {
-               wfDeprecated( __METHOD__, '1.32' );
-               $this->addWikiTextAsInterface( $text );
-       }
-
        /**
         * @param string $text
         * @since 1.32

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index c61de38..59f2db4 100644 (file)
--- 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.

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 66b1612..afd6b2d 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -913,27 +913,6 @@ class ParserOptions {
                return wfSetVar( $this->mTimestamp, $x );
        }
 
-       /**
-        * Create "edit section" links?
-        * @deprecated since 1.31, use ParserOutput::getText() options instead.
-        * @return bool
-        */
-       public function getEditSection() {
-               wfDeprecated( __METHOD__, '1.31' );
-               return true;
-       }
-
-       /**
-        * Create "edit section" links?
-        * @deprecated since 1.31, use ParserOutput::getText() options instead.
-        * @param bool|null $x New value (null is no change)
-        * @return bool Old value
-        */
-       public function setEditSection( $x ) {
-               wfDeprecated( __METHOD__, '1.31' );
-               return true;
-       }
-
        /**
         * Set the redirect target.
         *