From 390f6411e09b404b910d7e6cf73ac621a26e0214 Mon Sep 17 00:00:00 2001
From: Jayprakash12345 <0freerunning@gmail.com>
Date: Sat, 10 Mar 2018 04:02:03 +0000
Subject: [PATCH] Remove deprecated functions from ChangeTags class

* listExtensionActivatedTags
* listExtensionDefinedTags

These were deprecated in MediaWiki 1.28, and have no uses in Wikimedia Git.

Change-Id: I88bdfc3ea3d9ba9845f7caac2430f815f1a9b5b0
---
 RELEASE-NOTES-1.31                 |  3 +++
 includes/changetags/ChangeTags.php | 25 +------------------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index cd0fd4cdc5..63242442e2 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -310,6 +310,9 @@ changes to languages because of Phabricator reports.
 * The global function wfOutputHandler() was removed, use the its replacement
   MediaWiki\OutputHandler::handle() instead. The global function was only sometimes defined.
   Its replacement is always available via the autoloader.
+* ChangeTags::listExtensionActivatedTags and ::listExtensionDefinedTags, deprecated
+  in 1.28, have been removed.  Use ::listSoftwareActivatedTags() and
+  ::listSoftwareDefinedTags() instead.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is supported,
diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php
index b30b82df1d..5b6088d59f 100644
--- a/includes/changetags/ChangeTags.php
+++ b/includes/changetags/ChangeTags.php
@@ -1295,20 +1295,9 @@ class ChangeTags {
 		);
 	}
 
-	/**
-	 * @see listSoftwareActivatedTags
-	 * @deprecated since 1.28 call listSoftwareActivatedTags directly
-	 * @return array
-	 */
-	public static function listExtensionActivatedTags() {
-		wfDeprecated( __METHOD__, '1.28' );
-		return self::listSoftwareActivatedTags();
-	}
-
 	/**
 	 * Basically lists defined tags which count even if they aren't applied to anything.
-	 * It returns a union of the results of listExplicitlyDefinedTags() and
-	 * listExtensionDefinedTags().
+	 * It returns a union of the results of listExplicitlyDefinedTags()
 	 *
 	 * @return string[] Array of strings: tags
 	 */
@@ -1385,18 +1374,6 @@ class ChangeTags {
 		);
 	}
 
-	/**
-	 * Call listSoftwareDefinedTags directly
-	 *
-	 * @see listSoftwareDefinedTags
-	 * @deprecated since 1.28
-	 * @return array
-	 */
-	public static function listExtensionDefinedTags() {
-		wfDeprecated( __METHOD__, '1.28' );
-		return self::listSoftwareDefinedTags();
-	}
-
 	/**
 	 * Invalidates the short-term cache of defined tags used by the
 	 * list*DefinedTags functions, as well as the tag statistics cache.
-- 
2.20.1