From fef9ed715ac5814e7a2346bc0daa437d6ac7d6dd Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 11 Sep 2019 17:08:52 -0700 Subject: [PATCH] Make CdnCacheUpdate::expand() private and update the sole caller Change-Id: Id427a1667618b65055be772e9919052e95def1f9 --- includes/clientpool/SquidPurgeClient.php | 4 ++-- includes/deferred/CdnCacheUpdate.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/clientpool/SquidPurgeClient.php b/includes/clientpool/SquidPurgeClient.php index 6b5482cf8d..dffe6e14fa 100644 --- a/includes/clientpool/SquidPurgeClient.php +++ b/includes/clientpool/SquidPurgeClient.php @@ -191,11 +191,11 @@ class SquidPurgeClient { /** * Queue a purge operation * - * @param string $url + * @param string $url Fully expanded URL (with host and protocol) */ public function queuePurge( $url ) { global $wgSquidPurgeUseHostHeader; - $url = CdnCacheUpdate::expand( str_replace( "\n", '', $url ) ); + $url = str_replace( "\n", '', $url ); // sanity $request = []; if ( $wgSquidPurgeUseHostHeader ) { $url = wfParseUrl( $url ); diff --git a/includes/deferred/CdnCacheUpdate.php b/includes/deferred/CdnCacheUpdate.php index 70447489b7..b983e97406 100644 --- a/includes/deferred/CdnCacheUpdate.php +++ b/includes/deferred/CdnCacheUpdate.php @@ -137,7 +137,7 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate { foreach ( $chunks as $chunk ) { $client = new SquidPurgeClient( $server ); foreach ( $chunk as $url ) { - $client->queuePurge( $url ); + $client->queuePurge( self::expand( $url ) ); } $pool->addClient( $client ); } @@ -254,7 +254,7 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate { * @param string $url * @return string */ - public static function expand( $url ) { + private static function expand( $url ) { return wfExpandUrl( $url, PROTO_INTERNAL ); } -- 2.20.1