Remove deprecated class SquidUpdate

Change-Id: Iac53864296990befe7c573a29dd2f35aca52a79e

diff --git a/.phpcs.xml b/.phpcs.xml
index 3caae98..21dbe81 100644 (file)
--- 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 de58ca7..e6a215e 100644 (file)
--- 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 8906211..22f9737 100644 (file)
--- 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 301c4f3..5329ca7 100644 (file)
--- 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 cbab677..e681a04 100644 (file)
--- 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?