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/cache/HTMLFileCache.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/cache/HTMLFileCache.php')
-rw-r--r-- | includes/cache/HTMLFileCache.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php index 73a60a18ca7a..a6df0ae3f855 100644 --- a/includes/cache/HTMLFileCache.php +++ b/includes/cache/HTMLFileCache.php @@ -22,6 +22,7 @@ */ use MediaWiki\Cache\CacheKeyHelper; +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; @@ -94,7 +95,7 @@ class HTMLFileCache extends FileCacheBase { public static function useFileCache( IContextSource $context, $mode = self::MODE_NORMAL ) { $config = MediaWikiServices::getInstance()->getMainConfig(); - if ( !$config->get( 'UseFileCache' ) && $mode !== self::MODE_REBUILD ) { + if ( !$config->get( MainConfigNames::UseFileCache ) && $mode !== self::MODE_REBUILD ) { return false; } @@ -151,7 +152,7 @@ class HTMLFileCache extends FileCacheBase { } $context->getOutput()->sendCacheControl(); - header( "Content-Type: {$this->options->get( 'MimeType' )}; charset=UTF-8" ); + header( "Content-Type: {$this->options->get( MainConfigNames::MimeType )}; charset=UTF-8" ); header( 'Content-Language: ' . MediaWikiServices::getInstance()->getContentLanguage()->getHtmlCode() ); if ( $this->useGzip() ) { @@ -224,7 +225,7 @@ class HTMLFileCache extends FileCacheBase { */ public static function clearFileCache( $page ) { $config = MediaWikiServices::getInstance()->getMainConfig(); - if ( !$config->get( 'UseFileCache' ) ) { + if ( !$config->get( MainConfigNames::UseFileCache ) ) { return false; } |