Remove deprecated ParserOutput::legacyOptions

Change-Id: I5f32dd741f3ee795ec599aacb687d5cee2c52835

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index c325419..694dc46 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -285,6 +285,8 @@ because of Phabricator reports.
 * Language::markNoConversion, deprecated in 1.32, has been removed. Use
   LanguageConverter::markNoConversion instead.
 * BagOStuff::modifySimpleRelayEvent() method has been removed.
+* ParserOutput::getLegacyOptions, deprecated in 1.30, has been removed.
+  Use ParserOutput::allCacheVaryingOptions instead.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index a69e805..bdca848 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -1261,25 +1261,6 @@ class ParserOptions {
                }
        }
 
-       /**
-        * Returns the full array of options that would have been used by
-        * in 1.16.
-        * Used to get the old parser cache entries when available.
-        * @deprecated since 1.30. You probably want self::allCacheVaryingOptions() instead.
-        * @return string[]
-        */
-       public static function legacyOptions() {
-               wfDeprecated( __METHOD__, '1.30' );
-               return [
-                       'stubthreshold',
-                       'numberheadings',
-                       'userlang',
-                       'thumbsize',
-                       'editsection',
-                       'printable'
-               ];
-       }
-
        /**
         * Return all option keys that vary the options hash
         * @since 1.30