From b12086b6188886cefba2dac518fc7d589a0148c6 Mon Sep 17 00:00:00 2001 From: addshore Date: Tue, 22 Nov 2016 23:39:22 +0000 Subject: [PATCH] Get ConfigFactory & MainConfig from MediaWikiServices Change-Id: Iafdd7e00747060572463ffb05aae4543f3a06163 --- includes/AjaxResponse.php | 3 ++- includes/TemplateParser.php | 4 +++- includes/auth/AuthManager.php | 3 ++- .../auth/TemporaryPasswordAuthenticationRequest.php | 4 +++- includes/auth/Throttler.php | 3 ++- includes/auth/UserDataAuthenticationRequest.php | 3 ++- includes/context/RequestContext.php | 2 +- includes/import/WikiImporter.php | 3 ++- includes/resourceloader/ResourceLoader.php | 3 ++- includes/resourceloader/ResourceLoaderContext.php | 3 ++- includes/resourceloader/ResourceLoaderModule.php | 3 ++- includes/session/SessionManager.php | 3 ++- includes/skins/QuickTemplate.php | 3 ++- includes/specials/SpecialEmailuser.php | 3 ++- includes/specials/SpecialUndelete.php | 3 ++- includes/specials/SpecialUpload.php | 2 +- maintenance/Maintenance.php | 2 +- maintenance/cleanupRemovedModules.php | 4 +++- maintenance/doMaintenance.php | 2 +- maintenance/importTextFiles.php | 4 +++- maintenance/storage/checkStorage.php | 4 +++- tests/phpunit/ResourceLoaderTestCase.php | 3 ++- ...actPasswordPrimaryAuthenticationProviderTest.php | 13 ++++++++----- .../LegacyHookPreAuthenticationProviderTest.php | 5 ++++- ...calPasswordPrimaryAuthenticationProviderTest.php | 4 +++- ...aryPasswordPrimaryAuthenticationProviderTest.php | 3 ++- tests/phpunit/includes/config/ConfigFactoryTest.php | 4 +++- .../import/ImportLinkCacheIntegrationTest.php | 4 +++- tests/phpunit/includes/import/ImportTest.php | 7 ++++--- tests/phpunit/maintenance/MaintenanceTest.php | 3 ++- 30 files changed, 74 insertions(+), 36 deletions(-) diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php index 0686578c17..3e42c08650 100644 --- a/includes/AjaxResponse.php +++ b/includes/AjaxResponse.php @@ -20,6 +20,7 @@ * @file * @ingroup Ajax */ +use MediaWiki\MediaWikiServices; /** * Handle responses for Ajax requests (send headers, print @@ -82,7 +83,7 @@ class AjaxResponse { function __construct( $text = null, Config $config = null ) { $this->mCacheDuration = null; $this->mVary = null; - $this->mConfig = $config ?: ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $this->mConfig = $config ?: MediaWikiServices::getInstance()->getMainConfig(); $this->mDisabled = false; $this->mText = ''; diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php index a1e6d5b5a7..470a75c4b9 100644 --- a/includes/TemplateParser.php +++ b/includes/TemplateParser.php @@ -1,4 +1,6 @@ makeConfig( 'main' ); + $config = MediaWikiServices::getInstance()->getMainConfig(); $secretKey = $config->get( 'SecretKey' ); if ( $secretKey ) { diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php index d88a5b27e2..e9a6edc224 100644 --- a/includes/auth/AuthManager.php +++ b/includes/auth/AuthManager.php @@ -24,6 +24,7 @@ namespace MediaWiki\Auth; use Config; +use MediaWiki\MediaWikiServices; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; use Status; @@ -146,7 +147,7 @@ class AuthManager implements LoggerAwareInterface { if ( self::$instance === null ) { self::$instance = new self( \RequestContext::getMain()->getRequest(), - \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ); } return self::$instance; diff --git a/includes/auth/TemporaryPasswordAuthenticationRequest.php b/includes/auth/TemporaryPasswordAuthenticationRequest.php index 42f0e70223..d243184aab 100644 --- a/includes/auth/TemporaryPasswordAuthenticationRequest.php +++ b/includes/auth/TemporaryPasswordAuthenticationRequest.php @@ -21,6 +21,8 @@ namespace MediaWiki\Auth; +use MediaWiki\MediaWikiServices; + /** * This represents the intention to set a temporary password for the user. * @ingroup Auth @@ -67,7 +69,7 @@ class TemporaryPasswordAuthenticationRequest extends AuthenticationRequest { * @return TemporaryPasswordAuthenticationRequest */ public static function newRandom() { - $config = \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $config = MediaWikiServices::getInstance()->getMainConfig(); // get the min password length $minLength = $config->get( 'MinimalPasswordLength' ); diff --git a/includes/auth/Throttler.php b/includes/auth/Throttler.php index 000b070522..6d3b2f46e6 100644 --- a/includes/auth/Throttler.php +++ b/includes/auth/Throttler.php @@ -23,6 +23,7 @@ namespace MediaWiki\Auth; use BagOStuff; use MediaWiki\Logger\LoggerFactory; +use MediaWiki\MediaWikiServices; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; @@ -68,7 +69,7 @@ class Throttler implements LoggerAwareInterface { } if ( $conditions === null ) { - $config = \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $config = MediaWikiServices::getInstance()->getMainConfig(); $conditions = $config->get( 'PasswordAttemptThrottle' ); $params += [ 'type' => 'password', diff --git a/includes/auth/UserDataAuthenticationRequest.php b/includes/auth/UserDataAuthenticationRequest.php index ee77d7bc0d..35d66523ab 100644 --- a/includes/auth/UserDataAuthenticationRequest.php +++ b/includes/auth/UserDataAuthenticationRequest.php @@ -21,6 +21,7 @@ namespace MediaWiki\Auth; +use MediaWiki\MediaWikiServices; use StatusValue; use User; @@ -38,7 +39,7 @@ class UserDataAuthenticationRequest extends AuthenticationRequest { public $realname; public function getFieldInfo() { - $config = \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $config = MediaWikiServices::getInstance()->getMainConfig(); $ret = [ 'email' => [ 'type' => 'string', diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php index ebedb7e518..ecd274b0db 100644 --- a/includes/context/RequestContext.php +++ b/includes/context/RequestContext.php @@ -99,7 +99,7 @@ class RequestContext implements IContextSource, MutableContext { if ( $this->config === null ) { // @todo In the future, we could move this to WebStart.php so // the Config object is ready for when initialization happens - $this->config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $this->config = MediaWikiServices::getInstance()->getMainConfig(); } return $this->config; diff --git a/includes/import/WikiImporter.php b/includes/import/WikiImporter.php index d1a9bc503d..328cdadb0b 100644 --- a/includes/import/WikiImporter.php +++ b/includes/import/WikiImporter.php @@ -23,6 +23,7 @@ * @file * @ingroup SpecialPage */ +use MediaWiki\MediaWikiServices; /** * XML file reader for the page data importer. @@ -59,7 +60,7 @@ class WikiImporter { $this->reader = new XMLReader(); if ( !$config ) { wfDeprecated( __METHOD__ . ' without a Config instance', '1.25' ); - $config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $config = MediaWikiServices::getInstance()->getMainConfig(); } $this->config = $config; diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index 1073de0ef6..d624c7c129 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -22,6 +22,7 @@ * @author Trevor Parscal */ +use MediaWiki\MediaWikiServices; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; @@ -239,7 +240,7 @@ class ResourceLoader implements LoggerAwareInterface { if ( !$config ) { $this->logger->debug( __METHOD__ . ' was called without providing a Config instance' ); - $config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $config = MediaWikiServices::getInstance()->getMainConfig(); } $this->config = $config; diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php index b17200f1cc..a1a89cb620 100644 --- a/includes/resourceloader/ResourceLoaderContext.php +++ b/includes/resourceloader/ResourceLoaderContext.php @@ -23,6 +23,7 @@ */ use MediaWiki\Logger\LoggerFactory; +use MediaWiki\MediaWikiServices; /** * Object passed around to modules which contains information about the state @@ -137,7 +138,7 @@ class ResourceLoaderContext { */ public static function newDummyContext() { return new self( new ResourceLoader( - ConfigFactory::getDefaultInstance()->makeConfig( 'main' ), + MediaWikiServices::getInstance()->getMainConfig(), LoggerFactory::getInstance( 'resourceloader' ) ), new FauxRequest( [] ) ); } diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php index 4456517f01..8124f3398b 100644 --- a/includes/resourceloader/ResourceLoaderModule.php +++ b/includes/resourceloader/ResourceLoaderModule.php @@ -22,6 +22,7 @@ * @author Roan Kattouw */ +use MediaWiki\MediaWikiServices; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; @@ -187,7 +188,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface { public function getConfig() { if ( $this->config === null ) { // Ugh, fall back to default - $this->config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $this->config = MediaWikiServices::getInstance()->getMainConfig(); } return $this->config; diff --git a/includes/session/SessionManager.php b/includes/session/SessionManager.php index b8e480f711..0041450f86 100644 --- a/includes/session/SessionManager.php +++ b/includes/session/SessionManager.php @@ -23,6 +23,7 @@ namespace MediaWiki\Session; +use MediaWiki\MediaWikiServices; use MWException; use Psr\Log\LoggerInterface; use BagOStuff; @@ -152,7 +153,7 @@ final class SessionManager implements SessionManagerInterface { ); } } else { - $this->config = \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $this->config = MediaWikiServices::getInstance()->getMainConfig(); } if ( isset( $options['logger'] ) ) { diff --git a/includes/skins/QuickTemplate.php b/includes/skins/QuickTemplate.php index e5d272c0cb..6686ae69c5 100644 --- a/includes/skins/QuickTemplate.php +++ b/includes/skins/QuickTemplate.php @@ -17,6 +17,7 @@ * * @file */ +use MediaWiki\MediaWikiServices; /** * Generic wrapper for template functions, with interface @@ -36,7 +37,7 @@ abstract class QuickTemplate { $this->translator = new MediaWikiI18N(); if ( $config === null ) { wfDebug( __METHOD__ . ' was called with no Config instance passed to it' ); - $config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $config = MediaWikiServices::getInstance()->getMainConfig(); } $this->config = $config; } diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php index 06be7bc327..a550e8853b 100644 --- a/includes/specials/SpecialEmailuser.php +++ b/includes/specials/SpecialEmailuser.php @@ -20,6 +20,7 @@ * @file * @ingroup SpecialPage */ +use MediaWiki\MediaWikiServices; /** * A special page that allows users to send e-mails to other users @@ -223,7 +224,7 @@ class SpecialEmailUser extends UnlistedSpecialPage { public static function getPermissionsError( $user, $editToken, Config $config = null ) { if ( $config === null ) { wfDebug( __METHOD__ . ' called without a Config instance passed to it' ); - $config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $config = MediaWikiServices::getInstance()->getMainConfig(); } if ( !$config->get( 'EnableEmail' ) || !$config->get( 'EnableUserEmail' ) ) { return 'usermaildisabled'; diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index 91753a9dbd..efac615324 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -20,6 +20,7 @@ * @file * @ingroup SpecialPage */ +use MediaWiki\MediaWikiServices; /** * Used to show archived pages and eventually restore them. @@ -46,7 +47,7 @@ class PageArchive { $this->title = $title; if ( $config === null ) { wfDebug( __METHOD__ . ' did not have a Config object passed to it' ); - $config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $config = MediaWikiServices::getInstance()->getMainConfig(); } $this->config = $config; } diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index 4583305adc..f7e46cb617 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -588,7 +588,7 @@ class SpecialUpload extends SpecialPage { ) { if ( $config === null ) { wfDebug( __METHOD__ . ' called without a Config instance passed to it' ); - $config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $config = MediaWikiServices::getInstance()->getMainConfig(); } $msg = []; diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index 552bec0463..3925efe8de 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -498,7 +498,7 @@ abstract class Maintenance { */ public function getConfig() { if ( $this->config === null ) { - $this->config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $this->config = MediaWikiServices::getInstance()->getMainConfig(); } return $this->config; diff --git a/maintenance/cleanupRemovedModules.php b/maintenance/cleanupRemovedModules.php index 38b8ba1342..863d74afb4 100644 --- a/maintenance/cleanupRemovedModules.php +++ b/maintenance/cleanupRemovedModules.php @@ -22,6 +22,8 @@ * @author Roan Kattouw */ +use MediaWiki\MediaWikiServices; + require_once __DIR__ . '/Maintenance.php'; /** @@ -41,7 +43,7 @@ class CleanupRemovedModules extends Maintenance { public function execute() { $dbw = $this->getDB( DB_MASTER ); - $rl = new ResourceLoader( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) ); + $rl = new ResourceLoader( MediaWikiServices::getInstance()->getMainConfig() ); $moduleNames = $rl->getModuleNames(); $moduleList = implode( ', ', array_map( [ $dbw, 'addQuotes' ], $moduleNames ) ); $limit = max( 1, intval( $this->getOption( 'batchsize', 500 ) ) ); diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index f3561b5538..e649c9d171 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -98,7 +98,7 @@ $maintenance->finalSetup(); require_once "$IP/includes/Setup.php"; // Initialize main config instance -$maintenance->setConfig( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) ); +$maintenance->setConfig( MediaWikiServices::getInstance()->getMainConfig() ); // Sanity-check required extensions are installed $maintenance->checkRequiredExtensions(); diff --git a/maintenance/importTextFiles.php b/maintenance/importTextFiles.php index 2894653eb4..816e745281 100644 --- a/maintenance/importTextFiles.php +++ b/maintenance/importTextFiles.php @@ -21,6 +21,8 @@ * @ingroup Maintenance */ +use MediaWiki\MediaWikiServices; + require_once __DIR__ . '/Maintenance.php'; /** @@ -129,7 +131,7 @@ class ImportTextFiles extends Maintenance { } } - $rev = new WikiRevision( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) ); + $rev = new WikiRevision( MediaWikiServices::getInstance()->getMainConfig() ); $rev->setText( rtrim( $text ) ); $rev->setTitle( $title ); $rev->setUserObj( $user ); diff --git a/maintenance/storage/checkStorage.php b/maintenance/storage/checkStorage.php index bb9f4eacc5..9045870da4 100644 --- a/maintenance/storage/checkStorage.php +++ b/maintenance/storage/checkStorage.php @@ -21,6 +21,8 @@ * @ingroup Maintenance ExternalStorage */ +use MediaWiki\MediaWikiServices; + if ( !defined( 'MEDIAWIKI' ) ) { $optionsWithoutArgs = [ 'fix' ]; require_once __DIR__ . '/../commandLine.inc'; @@ -470,7 +472,7 @@ class CheckStorage { $source = new ImportStreamSource( $file ); $importer = new WikiImporter( $source, - ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ); $importer->setRevisionCallback( [ $this, 'importRevision' ] ); $importer->doImport(); diff --git a/tests/phpunit/ResourceLoaderTestCase.php b/tests/phpunit/ResourceLoaderTestCase.php index 8eb1fd509a..baa481e51c 100644 --- a/tests/phpunit/ResourceLoaderTestCase.php +++ b/tests/phpunit/ResourceLoaderTestCase.php @@ -1,5 +1,6 @@ setLogger( $logger ?: new NullLogger() ); - $this->config = $config ?: ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $this->config = $config ?: MediaWikiServices::getInstance()->getMainConfig(); $this->setMessageBlobStore( new MessageBlobStore( $this, $this->getLogger() ) ); } } diff --git a/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php index a1cdf7e7cc..a57682b66e 100644 --- a/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php @@ -2,6 +2,8 @@ namespace MediaWiki\Auth; +use MediaWiki\MediaWikiServices; + /** * @group AuthManager * @covers MediaWiki\Auth\AbstractPasswordPrimaryAuthenticationProvider @@ -26,7 +28,7 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCa $provider = $this->getMockForAbstractClass( AbstractPasswordPrimaryAuthenticationProvider::class ); - $provider->setConfig( \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) ); + $provider->setConfig( MediaWikiServices::getInstance()->getMainConfig() ); $providerPriv = \TestingAccessWrapper::newFromObject( $provider ); $obj = $providerPriv->getPasswordFactory(); @@ -38,7 +40,7 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCa $provider = $this->getMockForAbstractClass( AbstractPasswordPrimaryAuthenticationProvider::class ); - $provider->setConfig( \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) ); + $provider->setConfig( MediaWikiServices::getInstance()->getMainConfig() ); $provider->setLogger( new \Psr\Log\NullLogger() ); $providerPriv = \TestingAccessWrapper::newFromObject( $provider ); @@ -56,7 +58,7 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCa ); $provider->setConfig( new \MultiConfig( [ $config, - \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ] ) ); $provider->setLogger( new \Psr\Log\NullLogger() ); $providerPriv = \TestingAccessWrapper::newFromObject( $provider ); @@ -105,7 +107,7 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCa $provider = $this->getMockForAbstractClass( AbstractPasswordPrimaryAuthenticationProvider::class ); - $provider->setConfig( \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) ); + $provider->setConfig( MediaWikiServices::getInstance()->getMainConfig() ); $provider->setLogger( new \Psr\Log\NullLogger() ); $providerPriv = \TestingAccessWrapper::newFromObject( $provider ); @@ -121,7 +123,8 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCa ] ); $manager = new AuthManager( - new \FauxRequest(), \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + new \FauxRequest(), + MediaWikiServices::getInstance()->getMainConfig() ); $provider = $this->getMockForAbstractClass( diff --git a/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php b/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php index d482453152..b96455e091 100644 --- a/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php @@ -2,6 +2,8 @@ namespace MediaWiki\Auth; +use MediaWiki\MediaWikiServices; + /** * @group AuthManager * @group Database @@ -17,7 +19,8 @@ class LegacyHookPreAuthenticationProviderTest extends \MediaWikiTestCase { $request->expects( $this->any() )->method( 'getIP' )->will( $this->returnValue( '127.0.0.42' ) ); $manager = new AuthManager( - $request, \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + $request, + MediaWikiServices::getInstance()->getMainConfig() ); $provider = new LegacyHookPreAuthenticationProvider(); diff --git a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php index caf1680e3e..cb34be295d 100644 --- a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php @@ -2,6 +2,8 @@ namespace MediaWiki\Auth; +use MediaWiki\MediaWikiServices; + /** * @group AuthManager * @group Database @@ -28,7 +30,7 @@ class LocalPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCase } $config = new \MultiConfig( [ $this->config, - \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ] ); if ( !$this->manager ) { diff --git a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php index d4ebe34a98..e1d83a5f0f 100644 --- a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php @@ -2,6 +2,7 @@ namespace MediaWiki\Auth; +use MediaWiki\MediaWikiServices; use Wikimedia\ScopedCallback; /** @@ -32,7 +33,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC } $config = new \MultiConfig( [ $this->config, - \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ] ); if ( !$this->manager ) { diff --git a/tests/phpunit/includes/config/ConfigFactoryTest.php b/tests/phpunit/includes/config/ConfigFactoryTest.php index f42cb95921..8a766187c8 100644 --- a/tests/phpunit/includes/config/ConfigFactoryTest.php +++ b/tests/phpunit/includes/config/ConfigFactoryTest.php @@ -1,5 +1,7 @@ getConfigFactory(); $this->assertInstanceOf( 'Config', $factory->makeConfig( 'main' ) ); } diff --git a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php index 5e3c6268aa..8e06f9e968 100644 --- a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php +++ b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php @@ -1,4 +1,6 @@ value, - ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ); $importer->setDebug( true ); diff --git a/tests/phpunit/includes/import/ImportTest.php b/tests/phpunit/includes/import/ImportTest.php index 9d05d15256..53d91c6593 100644 --- a/tests/phpunit/includes/import/ImportTest.php +++ b/tests/phpunit/includes/import/ImportTest.php @@ -1,4 +1,5 @@ makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ); $importer->doImport(); @@ -92,7 +93,7 @@ EOF $importer = new WikiImporter( $source, - ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ); $importer->setPageOutCallback( $callback ); $importer->doImport(); @@ -175,7 +176,7 @@ EOF $importer = new WikiImporter( $source, - ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ); $importer->setSiteInfoCallback( $callback ); $importer->doImport(); diff --git a/tests/phpunit/maintenance/MaintenanceTest.php b/tests/phpunit/maintenance/MaintenanceTest.php index bd10856943..cbf94d65d6 100644 --- a/tests/phpunit/maintenance/MaintenanceTest.php +++ b/tests/phpunit/maintenance/MaintenanceTest.php @@ -5,6 +5,7 @@ // without changing the visibility and without working around hacks in // Maintenance.php // For the same reason, we cannot just use FakeMaintenance. +use MediaWiki\MediaWikiServices; /** * makes parts of the API of Maintenance that is hidden by protected visibily @@ -826,7 +827,7 @@ class MaintenanceTest extends MediaWikiTestCase { public function testGetConfig() { $this->assertInstanceOf( 'Config', $this->m->getConfig() ); $this->assertSame( - ConfigFactory::getDefaultInstance()->makeConfig( 'main' ), + MediaWikiServices::getInstance()->getMainConfig(), $this->m->getConfig() ); } -- 2.20.1