diff options
| author | TChin <tchin@wikimedia.org> | 2022-01-06 13:44:56 -0500 |
|---|---|---|
| committer | TChin <tchin@wikimedia.org> | 2022-01-10 13:55:53 -0500 |
| commit | 47adb6d65a9def579135a3d009fd1b22e99e51ba (patch) | |
| tree | a8a90bace319d546819fc78ed682a024e0090f03 /includes/db | |
| parent | fb80b943b67a17a85111692fa4ac675f148f05e6 (diff) | |
| download | mediawikicore-47adb6d65a9def579135a3d009fd1b22e99e51ba.tar.gz mediawikicore-47adb6d65a9def579135a3d009fd1b22e99e51ba.zip | |
Refactor global variables to use MediaWikiServices instead
Automatically refactors wg prefixed globals to use MediaWikiServices config using Rector. Doesn't include files that set globals or files that fail CI.
Rector Gist: https://gist.github.com/tchin25/7cc54f6d23aedef010b22e4dfbead228
* This patch uses a modified source code rector library for our specific use case and the rector will have different effects without it.
A writeup for future reference is here: https://meta.wikimedia.org/wiki/User:TChin_(WMF)/Using_Rector_On_MediaWiki
Change-Id: I1a691f01cd82e60bf41207d32501edb4b9835e37
Diffstat (limited to 'includes/db')
| -rw-r--r-- | includes/db/MWLBFactory.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php index 2cf1937bd028..49bb0c5a961c 100644 --- a/includes/db/MWLBFactory.php +++ b/includes/db/MWLBFactory.php @@ -23,6 +23,7 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\Logger\LoggerFactory; +use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\ChronologyProtector; use Wikimedia\Rdbms\DatabaseDomain; use Wikimedia\Rdbms\IDatabase; @@ -87,7 +88,7 @@ abstract class MWLBFactory { ) { $options->assertRequiredOptions( self::APPLY_DEFAULT_CONFIG_OPTIONS ); - global $wgCommandLineMode; + $commandLineMode = MediaWikiServices::getInstance()->getMainConfig()->get( 'CommandLineMode' ); $typesWithSchema = self::getDbTypesWithSchemas(); @@ -107,7 +108,7 @@ abstract class MWLBFactory { 'perfLogger' => LoggerFactory::getInstance( 'DBPerformance' ), 'errorLogger' => [ MWExceptionHandler::class, 'logException' ], 'deprecationLogger' => [ static::class, 'logDeprecation' ], - 'cliMode' => $wgCommandLineMode, + 'cliMode' => $commandLineMode, 'readOnlyReason' => $readOnlyMode->getReason(), 'defaultGroup' => $options->get( 'DBDefaultGroup' ), 'criticalSectionProvider' => $csProvider |