diff options
| author | Aryeh Gregor <ayg@aryeh.name> | 2022-04-26 18:48:03 +0300 |
|---|---|---|
| committer | Aryeh Gregor <ayg@aryeh.name> | 2022-04-26 19:03:37 +0300 |
| commit | 7b791474a53943ecc7d185f529f46a8794383416 (patch) | |
| tree | 04bcb69f7eebd41e1ebc71621fae401e4dd74304 /includes/deferred/CdnCacheUpdate.php | |
| parent | d9200a22c2f77817bcddc510b33d329a4718ddd8 (diff) | |
| download | mediawikicore-7b791474a53943ecc7d185f529f46a8794383416.tar.gz mediawikicore-7b791474a53943ecc7d185f529f46a8794383416.zip | |
Use MainConfigNames instead of string literals, #4
Now largely automated:
VARS=$(grep -o "'[A-Za-z0-9_]*'" includes/MainConfigNames.php | \
tr "\n" '|' | sed "s/|$/\n/;s/'//g")
sed -i -E "s/'($VARS)'/MainConfigNames::\1/g" \
$(grep -ERIl "'($VARS)'" includes/)
Then git add -p with lots of error-prone manual checking. Then
semi-manually add all the necessary "use" lines:
vim $(grep -L 'use MediaWiki\\MainConfigNames;' \
$(git diff --cached --name-only --diff-filter=M HEAD^))
I didn't bother fixing lines that were over 100 characters unless they
were over 120 and triggered phpcs.
Bug: T305805
Change-Id: I74e0ab511abecb276717ad4276a124760a268147
Diffstat (limited to 'includes/deferred/CdnCacheUpdate.php')
| -rw-r--r-- | includes/deferred/CdnCacheUpdate.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/includes/deferred/CdnCacheUpdate.php b/includes/deferred/CdnCacheUpdate.php index cf8f0b22a44b..7bd09c4a1d03 100644 --- a/includes/deferred/CdnCacheUpdate.php +++ b/includes/deferred/CdnCacheUpdate.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageReference; use Wikimedia\Assert\Assert; @@ -113,8 +114,8 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate { * @param string[] $urls List of full URLs to purge */ public static function purge( array $urls ) { - $cdnServers = MediaWikiServices::getInstance()->getMainConfig()->get( 'CdnServers' ); - $htcpRouting = MediaWikiServices::getInstance()->getMainConfig()->get( 'HTCPRouting' ); + $cdnServers = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::CdnServers ); + $htcpRouting = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::HTCPRouting ); if ( !$urls ) { return; } @@ -198,8 +199,8 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate { * @param string[] $urls Collection of URLs to purge */ private static function HTCPPurge( array $urls ) { - $htcpRouting = MediaWikiServices::getInstance()->getMainConfig()->get( 'HTCPRouting' ); - $htcpMulticastTTL = MediaWikiServices::getInstance()->getMainConfig()->get( 'HTCPMulticastTTL' ); + $htcpRouting = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::HTCPRouting ); + $htcpMulticastTTL = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::HTCPMulticastTTL ); // HTCP CLR operation $htcpOpCLR = 4; @@ -294,7 +295,7 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate { * @throws Exception */ private static function naivePurge( array $urls ) { - $cdnServers = MediaWikiServices::getInstance()->getMainConfig()->get( 'CdnServers' ); + $cdnServers = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::CdnServers ); $reqs = []; foreach ( $urls as $url ) { |