From 6ebe568c4e89275d011751ff11aa9540d1e1a991 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 5 Feb 2019 20:35:05 +0100
Subject: [PATCH] Remove deprecated class SquidUpdate

Change-Id: Iac53864296990befe7c573a29dd2f35aca52a79e
---
 .phpcs.xml                                | 1 -
 RELEASE-NOTES-1.33                        | 1 +
 autoload.php                              | 1 -
 includes/deferred/CdnCacheUpdate.php      | 7 -------
 maintenance/benchmarks/benchmarkPurge.php | 2 +-
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index 3caae98684..21dbe818d1 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -225,7 +225,6 @@
 		<exclude-pattern>*/includes/AuthPlugin\.php</exclude-pattern>
 		<exclude-pattern>*/includes/cache/CacheDependency\.php</exclude-pattern>
 		<exclude-pattern>*/includes/compat/XMPReader\.php</exclude-pattern>
-		<exclude-pattern>*/includes/deferred/CdnCacheUpdate\.php</exclude-pattern>
 		<exclude-pattern>*/includes/diff/DairikiDiff\.php</exclude-pattern>
 		<exclude-pattern>*/includes/diff/DiffEngine\.php</exclude-pattern>
 		<exclude-pattern>*/includes/Feed\.php</exclude-pattern>
diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index de58ca7094..e6a215e00c 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -185,6 +185,7 @@ because of Phabricator reports.
 * The 'jquery.byteLimit' module alias for 'jquery.lengthLimit',
   deprecated in 1.31, was removed.
 * Revision::fetchRevision(), deprecated in 1.28, was removed.
+* Class SquidUpdate, deprecated in 1.27, was removed.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
diff --git a/autoload.php b/autoload.php
index 8906211ac1..22f9737d49 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1448,7 +1448,6 @@ $wgAutoloadLocalClasses = [
 	'SqliteUpdater' => __DIR__ . '/includes/installer/SqliteUpdater.php',
 	'SquidPurgeClient' => __DIR__ . '/includes/clientpool/SquidPurgeClient.php',
 	'SquidPurgeClientPool' => __DIR__ . '/includes/clientpool/SquidPurgeClientPool.php',
-	'SquidUpdate' => __DIR__ . '/includes/deferred/CdnCacheUpdate.php',
 	'SrConverter' => __DIR__ . '/languages/classes/LanguageSr.php',
 	'StatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
 	'StatsdAwareInterface' => __DIR__ . '/includes/libs/stats/StatsdAwareInterface.php',
diff --git a/includes/deferred/CdnCacheUpdate.php b/includes/deferred/CdnCacheUpdate.php
index 301c4f3b7e..5329ca7e8f 100644
--- a/includes/deferred/CdnCacheUpdate.php
+++ b/includes/deferred/CdnCacheUpdate.php
@@ -286,10 +286,3 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
 		return false;
 	}
 }
-
-/**
- * @deprecated since 1.27
- */
-class SquidUpdate extends CdnCacheUpdate {
-	// Keep class name for b/c
-}
diff --git a/maintenance/benchmarks/benchmarkPurge.php b/maintenance/benchmarks/benchmarkPurge.php
index cbab6775df..e681a0498e 100644
--- a/maintenance/benchmarks/benchmarkPurge.php
+++ b/maintenance/benchmarks/benchmarkPurge.php
@@ -54,7 +54,7 @@ class BenchmarkPurge extends Benchmarker {
 	}
 
 	/**
-	 * Run a bunch of URLs through SquidUpdate::purge()
+	 * Run a bunch of URLs through CdnCacheUpdate::purge()
 	 * to benchmark Squid response times.
 	 * @param array $urls A bunch of URLs to purge
 	 * @param int $trials How many times to run the test?
-- 
2.20.1