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/media/DjVuImage.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/media/DjVuImage.php')
| -rw-r--r-- | includes/media/DjVuImage.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/media/DjVuImage.php b/includes/media/DjVuImage.php index fe086b8c19aa..b4e2bf012fe5 100644 --- a/includes/media/DjVuImage.php +++ b/includes/media/DjVuImage.php @@ -24,6 +24,7 @@ * @ingroup Media */ +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Shell\Shell; use Wikimedia\AtEase\AtEase; @@ -251,8 +252,8 @@ class DjVuImage { * @return array|null|false */ public function retrieveMetaData() { - $djvuDump = MediaWikiServices::getInstance()->getMainConfig()->get( 'DjvuDump' ); - $djvuTxt = MediaWikiServices::getInstance()->getMainConfig()->get( 'DjvuTxt' ); + $djvuDump = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::DjvuDump ); + $djvuTxt = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::DjvuTxt ); if ( !$this->isValid() ) { return false; } |