Remove two deprecated functions and one depreciated variable in a function call withi...

* Parser::getRandomString() (deprecated in 1.26) was removed.
* Parser::uniqPrefix() (deprecated in 1.26) was removed.
* Parser::extractTagsAndParams() now only accepts three arguments.  The fourth, $uniq_prefix was deprecated in 1.26 and has now been removed.

Bug: T61113
Change-Id: I7333fff4eb8b9a754b4596992f2a69bbdaac664d

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 473ac84..13a9f4e 100644 (file)
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -186,6 +186,10 @@ changes to languages because of Phabricator reports.
 * MWMemcached and MemCachedClientforWiki classes (deprecated in 1.27) were removed.
   The MemcachedClient class should be used instead.
 * EditPage::isOouiEnabled() is deprecated and will always return true.
+* Parser::getRandomString() (deprecated in 1.26) was removed.
+* Parser::uniqPrefix() (deprecated in 1.26) was removed.
+* Parser::extractTagsAndParams() now only accepts three arguments.  The fourth,
+  $uniq_prefix was deprecated in 1.26 and has now been removed.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 5ef0032..3f0e38f 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -736,17 +736,6 @@ class Parser {
                return $text;
        }
 
-       /**
-        * Get a random string
-        *
-        * @return string
-        * @deprecated since 1.26; use wfRandomString() instead.
-        */
-       public static function getRandomString() {
-               wfDeprecated( __METHOD__, '1.26' );
-               return wfRandomString( 16 );
-       }
-
        /**
         * Set the current user.
         * Should only be used when doing pre-save transform.
@@ -757,17 +746,6 @@ class Parser {
                $this->mUser = $user;
        }
 
-       /**
-        * Accessor for mUniqPrefix.
-        *
-        * @return string
-        * @deprecated since 1.26; use Parser::MARKER_PREFIX instead.
-        */
-       public function uniqPrefix() {
-               wfDeprecated( __METHOD__, '1.26' );
-               return self::MARKER_PREFIX;
-       }
-
        /**
         * Set the context title
         *
@@ -973,14 +951,9 @@ class Parser {
         * @param array $elements List of element names. Comments are always extracted.
         * @param string $text Source text string.
         * @param array &$matches Out parameter, Array: extracted tags
-        * @param string|null $uniq_prefix
         * @return string Stripped text
-        * @since 1.26 The uniq_prefix argument is deprecated.
         */
-       public static function extractTagsAndParams( $elements, $text, &$matches, $uniq_prefix = null ) {
-               if ( $uniq_prefix !== null ) {
-                       wfDeprecated( __METHOD__ . ' called with $prefix argument', '1.26' );
-               }
+       public static function extractTagsAndParams( $elements, $text, &$matches ) {
                static $n = 1;
                $stripped = '';
                $matches = [];