jenkins-bot has submitted this change and it was merged.
Change subject: Get ConfigFactory & MainConfig from MediaWikiServices
......................................................................
Get ConfigFactory & MainConfig from MediaWikiServices
Change-Id: Iafdd7e00747060572463ffb05aae4543f3a06163
---
M includes/AjaxResponse.php
M includes/TemplateParser.php
M includes/auth/AuthManager.php
M includes/auth/TemporaryPasswordAuthenticationRequest.php
M includes/auth/Throttler.php
M includes/auth/UserDataAuthenticationRequest.php
M includes/context/RequestContext.php
M includes/import/WikiImporter.php
M includes/resourceloader/ResourceLoader.php
M includes/resourceloader/ResourceLoaderContext.php
M includes/resourceloader/ResourceLoaderModule.php
M includes/session/SessionManager.php
M includes/skins/QuickTemplate.php
M includes/specials/SpecialEmailuser.php
M includes/specials/SpecialUndelete.php
M includes/specials/SpecialUpload.php
M maintenance/Maintenance.php
M maintenance/cleanupRemovedModules.php
M maintenance/doMaintenance.php
M maintenance/importTextFiles.php
M maintenance/storage/checkStorage.php
M tests/phpunit/ResourceLoaderTestCase.php
M
tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php
M tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php
M tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
M
tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
M tests/phpunit/includes/config/ConfigFactoryTest.php
M tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
M tests/phpunit/includes/import/ImportTest.php
M tests/phpunit/maintenance/MaintenanceTest.php
30 files changed, 74 insertions(+), 36 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 0686578..3e42c08 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 @@
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 a1e6d5b..470a75c 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -1,4 +1,6 @@
<?php
+use MediaWiki\MediaWikiServices;
+
/**
* Handles compiling Mustache templates into PHP rendering functions
*
@@ -98,7 +100,7 @@
$fastHash = md5( $fileContents );
// Fetch a secret key for building a keyed hash of the PHP code
- $config = ConfigFactory::getDefaultInstance()->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 d88a5b2..e9a6edc 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 @@
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 42f0e70..d243184 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 @@
* @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 000b070..6d3b2f4 100644
--- a/includes/auth/Throttler.php
+++ b/includes/auth/Throttler.php
@@ -23,6 +23,7 @@
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 @@
}
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 ee77d7b..35d6652 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 @@
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 ebedb7e..ecd274b 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -99,7 +99,7 @@
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 d1a9bc5..328cdad 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 @@
$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 1073de0..d624c7c 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 @@
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 b17200f..a1a89cb 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 @@
*/
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 4456517..8124f33 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 @@
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 b8e480f..0041450 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 @@
);
}
} 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 e5d272c..6686ae6 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 @@
$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 06be7bc..a550e88 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 @@
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 91753a9..efac615 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 @@
$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 4583305..f7e46cb 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -588,7 +588,7 @@
) {
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 552bec0..3925efe 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -498,7 +498,7 @@
*/
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 38b8ba1..863d74a 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 @@
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 f3561b5..e649c9d 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -98,7 +98,7 @@
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 2894653..816e745 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 @@
}
}
- $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 bb9f4ea..9045870 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 @@
$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 8eb1fd5..baa481e 100644
--- a/tests/phpunit/ResourceLoaderTestCase.php
+++ b/tests/phpunit/ResourceLoaderTestCase.php
@@ -1,5 +1,6 @@
<?php
+use MediaWiki\MediaWikiServices;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
@@ -140,7 +141,7 @@
// and default registrations are done from ServiceWiring instead.
public function __construct( Config $config = null, LoggerInterface
$logger = null ) {
$this->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 a1cdf7e..a57682b 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 @@
$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 @@
$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 @@
);
$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 @@
$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 @@
] );
$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 d482453..b96455e 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 @@
$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 caf1680..cb34be2 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 @@
}
$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 d4ebe34..e1d83a5 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 @@
}
$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 f42cb95..8a76618 100644
--- a/tests/phpunit/includes/config/ConfigFactoryTest.php
+++ b/tests/phpunit/includes/config/ConfigFactoryTest.php
@@ -1,5 +1,7 @@
<?php
+use MediaWiki\MediaWikiServices;
+
class ConfigFactoryTest extends MediaWikiTestCase {
/**
@@ -140,7 +142,7 @@
public function testGetDefaultInstance() {
// NOTE: the global config factory returned here has been
overwritten
// for operation in test mode. It may not reflect LocalSettings.
- $factory = ConfigFactory::getDefaultInstance();
+ $factory = MediaWikiServices::getInstance()->getConfigFactory();
$this->assertInstanceOf( 'Config', $factory->makeConfig( 'main'
) );
}
diff --git a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
index 5e3c626..8e06f9e 100644
--- a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
+++ b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
@@ -1,4 +1,6 @@
<?php
+use MediaWiki\MediaWikiServices;
+
/**
* Integration test that checks import success and
* LinkCache integration.
@@ -77,7 +79,7 @@
$importer = new WikiImporter(
$importStreamSource->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 9d05d15..53d91c6 100644
--- a/tests/phpunit/includes/import/ImportTest.php
+++ b/tests/phpunit/includes/import/ImportTest.php
@@ -1,4 +1,5 @@
<?php
+use MediaWiki\MediaWikiServices;
/**
* Test class for Import methods.
@@ -25,7 +26,7 @@
$importer = new WikiImporter(
$source,
- ConfigFactory::getDefaultInstance()->makeConfig( 'main'
)
+ MediaWikiServices::getInstance()->getMainConfig()
);
$importer->doImport();
@@ -92,7 +93,7 @@
$importer = new WikiImporter(
$source,
- ConfigFactory::getDefaultInstance()->makeConfig( 'main'
)
+ MediaWikiServices::getInstance()->getMainConfig()
);
$importer->setPageOutCallback( $callback );
$importer->doImport();
@@ -175,7 +176,7 @@
$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 bd10856..cbf94d6 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 @@
public function testGetConfig() {
$this->assertInstanceOf( 'Config', $this->m->getConfig() );
$this->assertSame(
- ConfigFactory::getDefaultInstance()->makeConfig( 'main'
),
+ MediaWikiServices::getInstance()->getMainConfig(),
$this->m->getConfig()
);
}
--
To view, visit https://gerrit.wikimedia.org/r/323083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafdd7e00747060572463ffb05aae4543f3a06163
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
