From 24ca95aad9cee8121ade01ddf2fb95b8319c91d2 Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Wed, 10 Oct 2018 15:10:18 -0700
Subject: [PATCH] Drop ChangesListSpecialPageFilters, deprecated in 1.29 and
 uncalled

Change-Id: I03a9bce0d1085dc30dbc5c3408b4cea154ade19a
---
 RELEASE-NOTES-1.32                                     |  2 ++
 docs/hooks.txt                                         | 10 ----------
 .../AbstractChangesListSpecialPageTestCase.php         |  6 ------
 .../phpunit/includes/specials/SpecialWatchlistTest.php | 10 ----------
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index affa83db40..009d84b69c 100644
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -336,6 +336,8 @@ because of Phabricator reports.
   ChangesListSpecialPageQuery.
 * The global function wfUsePHP, deprecated since 1.30, has now been removed. To
   assert a newer version of PHP than MediaWiki does, use extension registration.
+* The hook 'ChangesListSpecialPageFilters', deprecated in 1.29, has now been
+  removed. Use the 'ChangesListSpecialPageStructuredFilters' hook instead.
 
 === Deprecations in 1.32 ===
 * HTMLForm::setSubmitProgressive() is deprecated. No need to call it. Submit
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 78ed1b4c0c..a47f68f1a2 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1015,16 +1015,6 @@ $rows: The data that will be rendered. May be a ResultWrapper instance or
 $unpatrolled: Whether or not we are showing unpatrolled changes.
 $watched: Whether or not the change is watched by the user.
 
-'ChangesListSpecialPageFilters': DEPRECATED since 1.29! Use
-'ChangesListSpecialPageStructuredFilters' instead.
-Called after building form options on pages
-inheriting from ChangesListSpecialPage (in core: RecentChanges,
-RecentChangesLinked and Watchlist).
-$special: ChangesListSpecialPage instance
-&$filters: associative array of filter definitions. The keys are the HTML
-  name/URL parameters. Each key maps to an associative array with a 'msg'
-  (message key) and a 'default' value.
-
 'ChangesListSpecialPageQuery': Called when building SQL query on pages
 inheriting from ChangesListSpecialPage (in core: RecentChanges,
 RecentChangesLinked and Watchlist).
diff --git a/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php b/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php
index d57d489b30..92d986d70a 100644
--- a/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php
+++ b/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php
@@ -32,12 +32,6 @@ abstract class AbstractChangesListSpecialPageTestCase extends MediaWikiTestCase
 			'patrol' => true,
 		];
 
-		// Deprecated
-		$this->setTemporaryHook(
-			'ChangesListSpecialPageFilters',
-			null
-		);
-
 		# setup the ChangesListSpecialPage (or subclass) object
 		$this->changesListSpecialPage = $this->getPage();
 		$context = $this->changesListSpecialPage->getContext();
diff --git a/tests/phpunit/includes/specials/SpecialWatchlistTest.php b/tests/phpunit/includes/specials/SpecialWatchlistTest.php
index 2ebefacb4e..28e26a082b 100644
--- a/tests/phpunit/includes/specials/SpecialWatchlistTest.php
+++ b/tests/phpunit/includes/specials/SpecialWatchlistTest.php
@@ -13,11 +13,6 @@ class SpecialWatchlistTest extends SpecialPageTestBase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->setTemporaryHook(
-			'ChangesListSpecialPageFilters',
-			null
-		);
-
 		$this->setTemporaryHook(
 			'ChangesListSpecialPageQuery',
 			null
@@ -102,11 +97,6 @@ class SpecialWatchlistTest extends SpecialPageTestBase {
 			$this->newSpecialPage()
 		);
 
-		$this->setTemporaryHook(
-			'ChangesListSpecialPageFilters',
-			null
-		);
-
 		$page->registerFilters();
 
 		// Does not consider $preferences, just wiki's defaults
-- 
2.20.1