jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372113 )
Change subject: Remove two deprecated functions and one depreciated variable in
a function call within Parser.php
......................................................................
Remove two deprecated functions and one depreciated variable in a function call
within Parser.php
* 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
---
M RELEASE-NOTES-1.30
M includes/parser/Parser.php
2 files changed, 5 insertions(+), 28 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 473ac84..13a9f4e 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -186,6 +186,10 @@
* 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
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -737,17 +737,6 @@
}
/**
- * 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.
*
@@ -755,17 +744,6 @@
*/
public function setUser( $user ) {
$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;
}
/**
@@ -973,14 +951,9 @@
* @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 = [];
--
To view, visit https://gerrit.wikimedia.org/r/372113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7333fff4eb8b9a754b4596992f2a69bbdaac664d
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matthewrbowker <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: C. Scott Ananian <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Matthewrbowker <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
