Merge "Improve docs for Title::getInternalURL/getCanonicalURL"

[lhc/web/wiklou.git] / includes / parser / ParserOptions.php

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 032d481..bdca848 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -650,8 +650,10 @@ class ParserOptions {
 
        /**
         * Lazy initializer for dateFormat
+        * @param ParserOptions $popt
+        * @return string
         */
-       private static function initDateFormat( $popt ) {
+       private static function initDateFormat( ParserOptions $popt ) {
                return $popt->mUser->getDatePreference();
        }
 
@@ -731,6 +733,7 @@ class ParserOptions {
        public function getMagicPMIDLinks() {
                return $this->getOption( 'magicPMIDLinks' );
        }
+
        /**
         * Are magic RFC links enabled?
         * @since 1.28
@@ -1258,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