diff options
| author | Alexander Vorwerk <alexander.vorwerk@stud.uni-goettingen.de> | 2022-01-12 21:13:39 +0100 |
|---|---|---|
| committer | Alexander Vorwerk <alexander.vorwerk@stud.uni-goettingen.de> | 2022-01-27 22:04:16 +0100 |
| commit | decbaf4f384cd53912c0d21762b2b64309cb30f0 (patch) | |
| tree | d9716312fc58ed176ad02c2860005e523c275d75 /tests/phpunit | |
| parent | e05dde5bc4bcfa5b636272978ff9be5100aebe94 (diff) | |
| download | mediawikicore-decbaf4f384cd53912c0d21762b2b64309cb30f0.tar.gz mediawikicore-decbaf4f384cd53912c0d21762b2b64309cb30f0.zip | |
phpunit: use ->getServiceContainer() in integration tests
Change-Id: I38299cb65eeaadfdc0eb05db4e8c0b0119cfb37d
Diffstat (limited to 'tests/phpunit')
161 files changed, 578 insertions, 774 deletions
diff --git a/tests/phpunit/includes/ActorMigrationTest.php b/tests/phpunit/includes/ActorMigrationTest.php index a5f4bcad71cd..4292b44f317f 100644 --- a/tests/phpunit/includes/ActorMigrationTest.php +++ b/tests/phpunit/includes/ActorMigrationTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\User\ActorStore; use MediaWiki\User\ActorStoreFactory; use MediaWiki\User\UserIdentity; @@ -42,7 +41,7 @@ class ActorMigrationTest extends MediaWikiLangTestCase { } private function getMigration( $stage, $actorStoreFactory = null ) { - $mwServices = MediaWikiServices::getInstance(); + $mwServices = $this->getServiceContainer(); return new ActorMigrationBase( [ 'am2_user' => [ @@ -696,7 +695,7 @@ class ActorMigrationTest extends MediaWikiLangTestCase { ] ], $stage, - MediaWikiServices::getInstance()->getActorStoreFactory() + $this->getServiceContainer()->getActorStoreFactory() ); list( $fields, $callback ) = $m->getInsertValuesWithTempTable( $this->db, 'am1_user', $this->getTestUser()->getUser() ); @@ -721,7 +720,7 @@ class ActorMigrationTest extends MediaWikiLangTestCase { ] ], $stage, - MediaWikiServices::getInstance()->getActorStoreFactory() + $this->getServiceContainer()->getActorStoreFactory() ); list( $fields, $callback ) = $m->getInsertValuesWithTempTable( $this->db, 'foo_user', $this->getTestUser()->getUser() ); @@ -823,7 +822,7 @@ class ActorMigrationTest extends MediaWikiLangTestCase { ], ], SCHEMA_COMPAT_TEMP, - MediaWikiServices::getInstance()->getActorStoreFactory() + $this->getServiceContainer()->getActorStoreFactory() ) extends ActorMigrationBase { public function checkDeprecationForTest( $key ) { $this->checkDeprecation( $key ); diff --git a/tests/phpunit/includes/CommentStoreTest.php b/tests/phpunit/includes/CommentStoreTest.php index fae99f1498d8..973ed4493750 100644 --- a/tests/phpunit/includes/CommentStoreTest.php +++ b/tests/phpunit/includes/CommentStoreTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\IMaintainableDatabase; use Wikimedia\ScopedCallback; @@ -807,7 +806,7 @@ class CommentStoreTest extends MediaWikiLangTestCase { * @param int $stage */ public function testInsertWithTempTableDeprecated( $stage ) { - $lang = MediaWikiServices::getInstance()->getContentLanguage(); + $lang = $this->getServiceContainer()->getContentLanguage(); $store = new class( $lang, $stage ) extends CommentStore { protected const TEMP_TABLES = [ 'ipb_reason' => [ diff --git a/tests/phpunit/includes/ContentSecurityPolicyTest.php b/tests/phpunit/includes/ContentSecurityPolicyTest.php index 3459e38812c0..bed243ab2969 100644 --- a/tests/phpunit/includes/ContentSecurityPolicyTest.php +++ b/tests/phpunit/includes/ContentSecurityPolicyTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\TestingAccessWrapper; class ContentSecurityPolicyTest extends MediaWikiIntegrationTestCase { @@ -49,7 +48,7 @@ class ContentSecurityPolicyTest extends MediaWikiIntegrationTestCase { $context = RequestContext::getMain(); $resp = $context->getRequest()->response(); $conf = $context->getConfig(); - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $csp = new ContentSecurityPolicy( $resp, $conf, $hookContainer ); $this->csp = TestingAccessWrapper::newFromObject( $csp ); $this->csp->nonce = 'secret'; diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php index 470007635d0a..b2523ee3f12a 100644 --- a/tests/phpunit/includes/EditPageTest.php +++ b/tests/phpunit/includes/EditPageTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Storage\EditResult; use MediaWiki\User\UserIdentity; @@ -20,7 +19,7 @@ class EditPageTest extends MediaWikiLangTestCase { protected function setUp(): void { parent::setUp(); - $contLang = MediaWikiServices::getInstance()->getContentLanguage(); + $contLang = $this->getServiceContainer()->getContentLanguage(); $this->setContentLang( $contLang ); $this->setMwGlobals( [ @@ -662,7 +661,7 @@ hello // create page $ns = $this->getDefaultWikitextNS(); $title = Title::newFromText( __METHOD__, $ns ); - $wikiPageFactory = MediaWikiServices::getInstance()->getWikiPageFactory(); + $wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory(); $page = $wikiPageFactory->newFromTitle( $title ); if ( $page->exists() ) { @@ -792,7 +791,7 @@ hello // create page $ns = $this->getDefaultWikitextNS(); $title = Title::newFromText( 'EditPageTest_testAutoMerge', $ns ); - $wikiPageFactory = MediaWikiServices::getInstance()->getWikiPageFactory(); + $wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory(); $page = $wikiPageFactory->newFromTitle( $title ); if ( $page->exists() ) { diff --git a/tests/phpunit/includes/ExtraParserTest.php b/tests/phpunit/includes/ExtraParserTest.php index 6fdff0480c96..ae41f9778468 100644 --- a/tests/phpunit/includes/ExtraParserTest.php +++ b/tests/phpunit/includes/ExtraParserTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Interwiki\ClassicInterwikiLookup; -use MediaWiki\MediaWikiServices; use Wikimedia\TestingAccessWrapper; /** @@ -26,7 +25,7 @@ class ExtraParserTest extends MediaWikiIntegrationTestCase { $this->setUserLang( 'en' ); $this->setContentLang( 'en' ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $contLang = $services->getContentLanguage(); @@ -274,7 +273,7 @@ class ExtraParserTest extends MediaWikiIntegrationTestCase { 'wgInterwikiCache', ClassicInterwikiLookup::buildCdbHash( $testInterwikis ) ); - MediaWikiServices::getInstance()->resetServiceForTesting( + $this->getServiceContainer()->resetServiceForTesting( 'InterwikiLookup' ); Title::clearCaches(); diff --git a/tests/phpunit/includes/GlobalFunctions/wfThumbIsStandardTest.php b/tests/phpunit/includes/GlobalFunctions/wfThumbIsStandardTest.php index b62f909c700e..2787826871c1 100644 --- a/tests/phpunit/includes/GlobalFunctions/wfThumbIsStandardTest.php +++ b/tests/phpunit/includes/GlobalFunctions/wfThumbIsStandardTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Psr\Log\NullLogger; /** @@ -95,7 +94,7 @@ class WfThumbIsStandardTest extends MediaWikiIntegrationTestCase { * @dataProvider provideThumbParams */ public function testIsStandard( $message, $expected, $params ) { - $handlers = MediaWikiServices::getInstance()->getMainConfig()->get( 'ParserTestMediaHandlers' ); + $handlers = $this->getServiceContainer()->getMainConfig()->get( 'ParserTestMediaHandlers' ); $this->setService( 'MediaHandlerFactory', new MediaHandlerFactory( new NullLogger(), $handlers ) diff --git a/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php b/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php index 9a68297619f7..84082ef483d2 100644 --- a/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php +++ b/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php @@ -3,7 +3,6 @@ namespace MediaWiki\HookContainer { use ExtensionRegistry; - use MediaWiki\MediaWikiServices; use Wikimedia\ScopedCallback; class HookContainerIntegrationTest extends \MediaWikiIntegrationTestCase { @@ -12,7 +11,7 @@ namespace MediaWiki\HookContainer { * @covers \MediaWiki\HookContainer\HookContainer::run */ public function testHookRunsWhenExtensionRegistered() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $extensionRegistry = ExtensionRegistry::getInstance(); $numHandlersExecuted = 0; $handlers = [ 'FooHook' => [ [ @@ -33,7 +32,7 @@ namespace MediaWiki\HookContainer { * @covers \MediaWiki\HookContainer\HookContainer::scopedRegister */ public function testPreviouslyRegisteredHooksAreReAppliedAfterScopedRegisterRemovesThem() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); // Some handlers for FooHook have been previously set $reset = $hookContainer->register( 'FooHook', static function () { @@ -66,7 +65,7 @@ namespace MediaWiki\HookContainer { * @covers \MediaWiki\HookContainer\HookContainer::scopedRegister */ public function testHookRunsWithMultipleMixedHandlerTypes() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $numHandlersExecuted = 0; $reset = $hookContainer->scopedRegister( 'FooHook', static function ( &$numHandlersRun ) { $numHandlersRun++; @@ -104,7 +103,7 @@ namespace MediaWiki\HookContainer { 'extensionPath' => '/path/to/extension.json' ]; $hooks = [ 'Mash' => [ $handler ] ]; - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $reset = ExtensionRegistry::getInstance()->setAttributeForTest( 'Hooks', $hooks ); $arg = 0; $ret = $hookContainer->run( 'Mash', [ &$arg ] ); @@ -125,7 +124,7 @@ namespace MediaWiki\HookContainer { 'extensionPath' => '/path/to/extension.json' ]; $hooks = [ 'Mash' => [ $handler ] ]; - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $reset = ExtensionRegistry::getInstance()->setAttributeForTest( 'Hooks', $hooks ); $this->expectException( \UnexpectedValueException::class ); $arg = 0; diff --git a/tests/phpunit/includes/HooksTest.php b/tests/phpunit/includes/HooksTest.php index 095802d20430..c91cd1c678a8 100644 --- a/tests/phpunit/includes/HooksTest.php +++ b/tests/phpunit/includes/HooksTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\ScopedCallback; class HooksTest extends MediaWikiIntegrationTestCase { @@ -63,7 +62,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { */ public function testNewStyleHooks( $msg, $hook, $expectedFoo, $expectedBar ) { $foo = $bar = 'original'; - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $hookContainer->register( 'MediaWikiHooksTest001', $hook ); Hooks::run( 'MediaWikiHooksTest001', [ &$foo, &$bar ] ); @@ -76,7 +75,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { */ public function testGetHandlers() { global $wgHooks; - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $this->assertSame( [], @@ -119,7 +118,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { */ public function testNewStyleHookInteraction() { global $wgHooks; - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $a = new NothingClass(); $b = new NothingClass(); @@ -155,7 +154,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { * @covers Hooks::run */ public function testUncallableFunction() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $hookContainer->register( 'MediaWikiHooksTest001', 'ThisFunctionDoesntExist' ); $this->expectExceptionMessage( 'Call to undefined function ThisFunctionDoesntExist' ); Hooks::run( 'MediaWikiHooksTest001', [] ); @@ -165,7 +164,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { * @covers Hooks::run */ public function testFalseReturn() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $hookContainer->register( 'MediaWikiHooksTest001', static function ( &$foo ) { return false; } ); @@ -182,7 +181,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { * @covers Hooks::run */ public function testNullReturn() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $hookContainer->register( 'MediaWikiHooksTest001', static function ( &$foo ) { return; } ); @@ -200,7 +199,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { * @covers Hooks::run */ public function testCallHook_FalseHook() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $hookContainer->register( 'MediaWikiHooksTest001', false ); $hookContainer->register( 'MediaWikiHooksTest001', static function ( &$foo ) { $foo = 'test'; @@ -216,7 +215,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { * @covers Hooks::run */ public function testCallHook_UnknownDatatype() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $hookContainer->register( 'MediaWikiHooksTest001', 12345 ); $this->expectException( UnexpectedValueException::class ); Hooks::run( 'MediaWikiHooksTest001' ); @@ -226,7 +225,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { * @covers Hooks::run */ public function testCallHook_Deprecated() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $hookContainer->register( 'MediaWikiHooksTest001', 'NothingClass::someStatic' ); $this->expectDeprecation(); Hooks::run( 'MediaWikiHooksTest001', [], '1.31' ); @@ -237,7 +236,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { */ public function testRunWithoutAbort() { $list = []; - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $hookContainer->register( 'MediaWikiHooksTest001', static function ( &$list ) { $list[] = 1; return true; // Explicit true @@ -259,7 +258,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { * @covers Hooks::runWithoutAbort */ public function testRunWithoutAbortWarning() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $hookContainer->register( 'MediaWikiHooksTest001', static function ( &$foo ) { return false; } ); @@ -280,7 +279,7 @@ class HooksTest extends MediaWikiIntegrationTestCase { * @covers Hooks::run */ public function testFatalError() { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); $hookContainer->register( 'MediaWikiHooksTest001', static function () { return 'test'; } ); diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php index bb8aba70e70d..e2f57190fc9a 100644 --- a/tests/phpunit/includes/HtmlTest.php +++ b/tests/phpunit/includes/HtmlTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - class HtmlTest extends MediaWikiIntegrationTestCase { private $restoreWarnings; @@ -12,7 +10,7 @@ class HtmlTest extends MediaWikiIntegrationTestCase { 'wgUseMediaWikiUIEverywhere' => false, ] ); - $langFactory = MediaWikiServices::getInstance()->getLanguageFactory(); + $langFactory = $this->getServiceContainer()->getLanguageFactory(); $contLangObj = $langFactory->getLanguage( 'en' ); // Hardcode namespaces during test runs, diff --git a/tests/phpunit/includes/LinkerTest.php b/tests/phpunit/includes/LinkerTest.php index a8f052d95882..bd9d6c412eac 100644 --- a/tests/phpunit/includes/LinkerTest.php +++ b/tests/phpunit/includes/LinkerTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; @@ -547,7 +546,7 @@ class LinkerTest extends MediaWikiLangTestCase { $rollbackOutput = Linker::generateRollback( $page->getRevisionRecord(), $context ); $modules = $context->getOutput()->getModules(); $currentRev = $page->getRevisionRecord(); - $revisionLookup = MediaWikiServices::getInstance()->getRevisionLookup(); + $revisionLookup = $this->getServiceContainer()->getRevisionLookup(); $oldestRev = $revisionLookup->getFirstRevision( $page->getTitle() ); $this->assertEquals( $expectedModules, $modules ); diff --git a/tests/phpunit/includes/MagicWordFactoryTest.php b/tests/phpunit/includes/MagicWordFactoryTest.php index 1d797f43bc7f..4778e4a107f3 100644 --- a/tests/phpunit/includes/MagicWordFactoryTest.php +++ b/tests/phpunit/includes/MagicWordFactoryTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers \MagicWordFactory * @@ -9,7 +7,7 @@ use MediaWiki\MediaWikiServices; */ class MagicWordFactoryTest extends MediaWikiIntegrationTestCase { private function makeMagicWordFactory( Language $contLang = null ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new MagicWordFactory( $contLang ?: $services->getLanguageFactory()->getLanguage( 'en' ), $services->getHookContainer() @@ -17,7 +15,7 @@ class MagicWordFactoryTest extends MediaWikiIntegrationTestCase { } public function testGetContentLanguage() { - $contLang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $contLang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $magicWordFactory = $this->makeMagicWordFactory( $contLang ); $magicWordContLang = $magicWordFactory->getContentLanguage(); diff --git a/tests/phpunit/includes/MergeHistoryTest.php b/tests/phpunit/includes/MergeHistoryTest.php index 4a23c57a3f7d..63886f740670 100644 --- a/tests/phpunit/includes/MergeHistoryTest.php +++ b/tests/phpunit/includes/MergeHistoryTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; /** @@ -41,7 +40,7 @@ class MergeHistoryTest extends MediaWikiIntegrationTestCase { // still work for the merge. $timestamp = time() + ( 24 * 3600 ); } - $factory = MediaWikiServices::getInstance()->getMergeHistoryFactory(); + $factory = $this->getServiceContainer()->getMergeHistoryFactory(); $mh = $factory->newMergeHistory( Title::newFromText( $source ), Title::newFromText( $dest ), @@ -113,7 +112,7 @@ class MergeHistoryTest extends MediaWikiIntegrationTestCase { * @covers MergeHistory::probablyCanMerge */ public function testCheckPermissions() { - $factory = MediaWikiServices::getInstance()->getMergeHistoryFactory(); + $factory = $this->getServiceContainer()->getMergeHistoryFactory(); $mh = $factory->newMergeHistory( Title::newFromText( 'Test' ), Title::newFromText( 'Test2' ) @@ -140,7 +139,7 @@ class MergeHistoryTest extends MediaWikiIntegrationTestCase { * @covers MergeHistory::getMergedRevisionCount */ public function testGetMergedRevisionCount() { - $factory = MediaWikiServices::getInstance()->getMergeHistoryFactory(); + $factory = $this->getServiceContainer()->getMergeHistoryFactory(); $mh = $factory->newMergeHistory( Title::newFromText( 'Merge1' ), Title::newFromText( 'Merge2' ) @@ -161,7 +160,7 @@ class MergeHistoryTest extends MediaWikiIntegrationTestCase { $title = Title::newFromText( 'Merge1' ); $title2 = Title::newFromText( 'Merge2' ); - $factory = MediaWikiServices::getInstance()->getMergeHistoryFactory(); + $factory = $this->getServiceContainer()->getMergeHistoryFactory(); $mh = $factory->newMergeHistory( $title, $title2 ); $this->assertTrue( $title->exists() ); @@ -200,7 +199,7 @@ class MergeHistoryTest extends MediaWikiIntegrationTestCase { $title2 = Title::newFromText( 'Merge4' ); $title2->setContentModel( 'testing' ); - $factory = MediaWikiServices::getInstance()->getMergeHistoryFactory(); + $factory = $this->getServiceContainer()->getMergeHistoryFactory(); $mh = $factory->newMergeHistory( $title, $title2 ); $this->assertTrue( $title->exists() ); diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php index 620aaa0193c7..f80a52e881e0 100644 --- a/tests/phpunit/includes/MessageTest.php +++ b/tests/phpunit/includes/MessageTest.php @@ -143,7 +143,7 @@ class MessageTest extends MediaWikiLangTestCase { * @dataProvider provideConstructorLanguage */ public function testConstructorLanguage( $key, $params, $languageCode ) { - $language = MediaWikiServices::getInstance()->getLanguageFactory() + $language = $this->getServiceContainer()->getLanguageFactory() ->getLanguage( $languageCode ); $message = new Message( $key, $params, $language ); @@ -444,7 +444,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::numParams */ public function testNumParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $msg = new RawMessage( '$1' ); $this->assertSame( @@ -459,7 +459,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::durationParams */ public function testDurationParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $msg = new RawMessage( '$1' ); $this->assertSame( @@ -476,7 +476,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::extractParam */ public function testExpiryParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $msg = new RawMessage( '$1' ); $ts = wfTimestampNow(); @@ -493,7 +493,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::extractParam */ public function testDateTimeParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $msg = new RawMessage( '$1' ); $ts = wfTimestampNow(); @@ -510,7 +510,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::extractParam */ public function testDateParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $msg = new RawMessage( '$1' ); $ts = wfTimestampNow(); @@ -527,7 +527,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::extractParam */ public function testTimeParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $msg = new RawMessage( '$1' ); $ts = wfTimestampNow(); @@ -543,7 +543,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::userGroupParams */ public function testUserGroupParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'qqx' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'qqx' ); $msg = new RawMessage( '$1' ); $this->setUserLang( $lang ); $this->assertSame( @@ -558,7 +558,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::objectParams */ public function testUserGroupMemberParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'qqx' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'qqx' ); $msg = new RawMessage( '$1' ); $this->setUserLang( $lang ); $this->assertSame( @@ -575,7 +575,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::timeperiodParams */ public function testTimeperiodParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $msg = new RawMessage( '$1' ); $this->assertSame( @@ -590,7 +590,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::sizeParams */ public function testSizeParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $msg = new RawMessage( '$1' ); $this->assertSame( @@ -605,7 +605,7 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::bitrateParams */ public function testBitrateParams() { - $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $lang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $msg = new RawMessage( '$1' ); $this->assertSame( @@ -779,9 +779,9 @@ class MessageTest extends MediaWikiLangTestCase { $msg = new Message( 'returnto', [ new Message( 'apihelp-link', [ 'foo', new Message( 'mainpage', [], - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ) ) - ], MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'de' ) ) - ], MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'es' ) ); + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ) ) + ], $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'de' ) ) + ], $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'es' ) ); $this->assertEquals( 'Volver a [[Special:ApiHelp/foo|Página principal]].', diff --git a/tests/phpunit/includes/MovePageTest.php b/tests/phpunit/includes/MovePageTest.php index 2b2334df0c25..0e626a688fb5 100644 --- a/tests/phpunit/includes/MovePageTest.php +++ b/tests/phpunit/includes/MovePageTest.php @@ -2,7 +2,6 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\Interwiki\InterwikiLookup; -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\SlotRecord; use MediaWiki\Tests\Rest\Handler\MediaTestTrait; use MediaWiki\Tests\Unit\DummyServicesTrait; @@ -54,7 +53,7 @@ class MovePageTest extends MediaWikiIntegrationTestCase { [ 'Existent.jpg', 'Existent2.jpg', 'Existent-file-no-page.jpg' ] ), $params['contentHandlerFactory'] - ?? MediaWikiServices::getInstance()->getContentHandlerFactory(), + ?? $this->getServiceContainer()->getContentHandlerFactory(), $this->getServiceContainer()->getRevisionStore(), $this->getServiceContainer()->getSpamChecker(), $this->getServiceContainer()->getHookContainer(), @@ -113,7 +112,7 @@ class MovePageTest extends MediaWikiIntegrationTestCase { * @covers MovePage::__construct */ public function testConstructorDefaults() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $this->filterDeprecated( '/MovePage::__construct/' ); @@ -457,7 +456,7 @@ class MovePageTest extends MediaWikiIntegrationTestCase { $this->assertTrue( $fromTitle->isRedirect(), "Source {$fromTitle->getPrefixedText()} is not a redirect" ); - $target = MediaWikiServices::getInstance() + $target = $this->getServiceContainer() ->getRevisionLookup() ->getRevisionByTitle( $fromTitle ) ->getContent( SlotRecord::MAIN ) diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php index b9734419e1ba..5fc8e824cf2b 100644 --- a/tests/phpunit/includes/OutputPageTest.php +++ b/tests/phpunit/includes/OutputPageTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Languages\LanguageConverterFactory; -use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageReference; use MediaWiki\Page\PageReferenceValue; @@ -2545,7 +2544,7 @@ class OutputPageTest extends MediaWikiIntegrationTestCase { $method = $class->getMethod( 'makeResourceLoaderLink' ); $method->setAccessible( true ); $ctx = new RequestContext(); - $skinFactory = MediaWikiServices::getInstance()->getSkinFactory(); + $skinFactory = $this->getServiceContainer()->getSkinFactory(); $ctx->setSkin( $skinFactory->makeSkin( 'fallback' ) ); $ctx->setLanguage( 'en' ); $out = new OutputPage( $ctx ); @@ -2668,7 +2667,7 @@ class OutputPageTest extends MediaWikiIntegrationTestCase { // Set up stubs $ctx = new RequestContext(); - $skinFactory = MediaWikiServices::getInstance()->getSkinFactory(); + $skinFactory = $this->getServiceContainer()->getSkinFactory(); $ctx->setSkin( $skinFactory->makeSkin( 'fallback' ) ); $ctx->setLanguage( 'en' ); $op = $this->getMockBuilder( OutputPage::class ) diff --git a/tests/phpunit/includes/Permissions/PermissionManagerTest.php b/tests/phpunit/includes/Permissions/PermissionManagerTest.php index 56472b7b0cbb..086d626c30e4 100644 --- a/tests/phpunit/includes/Permissions/PermissionManagerTest.php +++ b/tests/phpunit/includes/Permissions/PermissionManagerTest.php @@ -11,7 +11,6 @@ use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; use MediaWiki\Block\SystemBlock; use MediaWiki\Cache\CacheKeyHelper; -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Session\SessionId; use MediaWiki\Session\TestUtils; @@ -179,7 +178,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $this->mergeMwGlobalArrayValue( 'wgNamespaceProtection', $namespaceProtection ); - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $this->overrideUserPermissions( $this->user, $userPerms ); @@ -245,7 +244,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $this->setTitle( NS_MAIN, "test page" ); $this->overrideUserPermissions( $this->user, [ "edit", "bogus", 'createpage' ] ); - $rs = MediaWikiServices::getInstance()->getRestrictionStore(); + $rs = $this->getServiceContainer()->getRestrictionStore(); $wrapper = TestingAccessWrapper::newFromObject( $rs ); $wrapper->cache = [ CacheKeyHelper::getKeyForPage( $this->title ) => [ 'cascade_sources' => [ @@ -258,7 +257,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { ], ] ]; - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $this->assertFalse( $permissionManager->userCan( 'bogus', $this->user, $this->title ) ); $this->assertEquals( [ @@ -289,9 +288,9 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $this->overrideUserPermissions( $this->user, $userPerms ); - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); - $rs = MediaWikiServices::getInstance()->getRestrictionStore(); + $rs = $this->getServiceContainer()->getRestrictionStore(); $wrapper = TestingAccessWrapper::newFromObject( $rs ); $wrapper->cache = [ CacheKeyHelper::getKeyForPage( $this->title ) => [ 'create_protection' => [ @@ -420,7 +419,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { public function testEditActionPermissionWithExistingPage() { $title = $this->getExistingTestPage( 'test page' )->getTitle(); - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $this->overrideUserPermissions( $this->user, [ 'edit' ] ); @@ -460,7 +459,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { 'purge' ] ); - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); // Check that user is blocked or unblocked from specific actions foreach ( $expected as $action => $blocked ) { @@ -625,7 +624,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $this->overrideUserPermissions( $user, [ 'edit', 'createpage' ] ); - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $errors = $permissionManager->getPermissionErrors( 'edit', $user, @@ -690,7 +689,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { 'move', ] ); - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $this->$assertion( [ 'confirmedittext' ], $permissionManager->getPermissionErrors( 'edit', $this->user, $this->title ) ); @@ -750,7 +749,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { 'by' => $this->user, ] ) ); - $this->assertCount( 1, MediaWikiServices::getInstance()->getPermissionManager() + $this->assertCount( 1, $this->getServiceContainer()->getPermissionManager() ->getPermissionErrors( 'tester', $user, $this->title ) ); } @@ -763,7 +762,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $user = $this->getMutableTestUser()->getUser(); $ut = Title::makeTitle( NS_USER_TALK, $user->getName() ); $this->assertNull( $user->getBlock( false ) ); - $this->assertFalse( MediaWikiServices::getInstance()->getPermissionManager() + $this->assertFalse( $this->getServiceContainer()->getPermissionManager() ->isBlockedFrom( $user, $ut ) ); // Block the user @@ -775,14 +774,14 @@ class PermissionManagerTest extends MediaWikiLangTestCase { ] ); $block->setTarget( $user ); $block->setBlocker( $blocker ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $res = $blockStore->insertBlock( $block ); $this->assertTrue( (bool)$res['id'], 'Failed to insert block' ); // Clear cache and confirm it loaded the block properly $user->clearInstanceCache(); $this->assertInstanceOf( DatabaseBlock::class, $user->getBlock( false ) ); - $this->assertTrue( MediaWikiServices::getInstance()->getPermissionManager() + $this->assertTrue( $this->getServiceContainer()->getPermissionManager() ->isBlockedFrom( $user, $ut ) ); // Unblock @@ -791,7 +790,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { // Clear cache and confirm it loaded the not-blocked properly $user->clearInstanceCache(); $this->assertNull( $user->getBlock( false ) ); - $this->assertFalse( MediaWikiServices::getInstance()->getPermissionManager() + $this->assertFalse( $this->getServiceContainer()->getPermissionManager() ->isBlockedFrom( $user, $ut ) ); } @@ -839,11 +838,11 @@ class PermissionManagerTest extends MediaWikiLangTestCase { if ( $restrictions ) { $block->setRestrictions( $restrictions ); } - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); try { - $this->assertSame( $expect, MediaWikiServices::getInstance()->getPermissionManager() + $this->assertSame( $expect, $this->getServiceContainer()->getPermissionManager() ->isBlockedFrom( $user, $title ) ); } finally { $blockStore->deleteBlock( $block ); @@ -932,7 +931,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { */ public function testGetUserPermissions() { $user = $this->getTestUser( [ 'unittesters' ] )->getUser(); - $rights = MediaWikiServices::getInstance()->getPermissionManager() + $rights = $this->getServiceContainer()->getPermissionManager() ->getUserPermissions( $user ); $this->assertContains( 'runtest', $rights ); $this->assertNotContains( 'writetest', $rights ); @@ -947,7 +946,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $user = $this->getTestUser( [ 'unittesters', 'testwriters' ] )->getUser(); $userWrapper = TestingAccessWrapper::newFromObject( $user ); - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $rights = $permissionManager->getUserPermissions( $user ); $this->assertContains( 'test', $rights ); $this->assertContains( 'runtest', $rights ); @@ -984,7 +983,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $userWrapper->mRequest = $mockRequest; $this->resetServices(); - $rights = MediaWikiServices::getInstance() + $rights = $this->getServiceContainer() ->getPermissionManager() ->getUserPermissions( $user ); $this->assertContains( 'test', $rights ); @@ -997,14 +996,14 @@ class PermissionManagerTest extends MediaWikiLangTestCase { * @covers \MediaWiki\Permissions\PermissionManager::getGroupPermissions */ public function testGroupPermissions() { - $rights = MediaWikiServices::getInstance()->getPermissionManager() + $rights = $this->getServiceContainer()->getPermissionManager() ->getGroupPermissions( [ 'unittesters' ] ); $this->assertContains( 'runtest', $rights ); $this->assertNotContains( 'writetest', $rights ); $this->assertNotContains( 'modifytest', $rights ); $this->assertNotContains( 'nukeworld', $rights ); - $rights = MediaWikiServices::getInstance()->getPermissionManager() + $rights = $this->getServiceContainer()->getPermissionManager() ->getGroupPermissions( [ 'unittesters', 'testwriters' ] ); $this->assertContains( 'runtest', $rights ); $this->assertContains( 'writetest', $rights ); @@ -1016,7 +1015,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { * @covers \MediaWiki\Permissions\PermissionManager::getGroupPermissions */ public function testRevokePermissions() { - $rights = MediaWikiServices::getInstance()->getPermissionManager() + $rights = $this->getServiceContainer()->getPermissionManager() ->getGroupPermissions( [ 'unittesters', 'formertesters' ] ); $this->assertNotContains( 'runtest', $rights ); $this->assertNotContains( 'writetest', $rights ); @@ -1029,7 +1028,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { * @covers \MediaWiki\Permissions\PermissionManager::getGroupsWithPermission */ public function testGetGroupsWithPermission( $expected, $right ) { - $result = MediaWikiServices::getInstance()->getPermissionManager() + $result = $this->getServiceContainer()->getPermissionManager() ->getGroupsWithPermission( $right ); sort( $result ); sort( $expected ); @@ -1062,7 +1061,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { * @covers \MediaWiki\Permissions\PermissionManager::userHasRight */ public function testUserHasRight() { - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $result = $permissionManager->userHasRight( $this->getTestUser( 'unittesters' )->getUser(), @@ -1087,7 +1086,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { * @covers \MediaWiki\Permissions\PermissionManager::groupHasPermission */ public function testGroupHasPermission() { - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $result = $permissionManager->groupHasPermission( 'unittesters', @@ -1106,7 +1105,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { * @covers \MediaWiki\Permissions\PermissionManager::isEveryoneAllowed */ public function testIsEveryoneAllowed() { - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $result = $permissionManager->isEveryoneAllowed( 'editmyoptions' ); $this->assertTrue( $result ); @@ -1119,7 +1118,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { * @covers \MediaWiki\Permissions\PermissionManager::addTemporaryUserRights */ public function testAddTemporaryUserRights() { - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $this->overrideUserPermissions( $this->user, [ 'read', 'edit' ] ); $this->assertEquals( [ 'read', 'edit' ], $permissionManager->getUserPermissions( $this->user ) ); @@ -1173,7 +1172,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { private function getJavascriptRedirectRevision( Title $title, Title $redirectTargetTitle, User $user ) { - $content = MediaWikiServices::getInstance()->getContentHandlerFactory() + $content = $this->getServiceContainer()->getContentHandlerFactory() ->getContentHandler( CONTENT_MODEL_JAVASCRIPT ) ->makeRedirectContent( $redirectTargetTitle ); $revision = new MutableRevisionRecord( $title ); @@ -1242,7 +1241,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { 'wgAutopromote' => [] ] ); $user = $userGroups === null ? null : $this->getTestUser( $userGroups )->getUser(); - $this->assertSame( $expected, MediaWikiServices::getInstance() + $this->assertSame( $expected, $this->getServiceContainer() ->getPermissionManager() ->getNamespaceRestrictionLevels( $ns, $user ) ); } @@ -1257,7 +1256,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $this->resetServices(); $this->assertContains( 'test_right', - MediaWikiServices::getInstance() + $this->getServiceContainer() ->getPermissionManager() ->getAllPermissions() ); @@ -1270,7 +1269,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { public function testAnonPermissionsNotClash() { $user1 = User::newFromName( 'User1' ); $user2 = User::newFromName( 'User2' ); - $pm = MediaWikiServices::getInstance()->getPermissionManager(); + $pm = $this->getServiceContainer()->getPermissionManager(); $pm->overrideUserRightsForTesting( $user2, [] ); $this->assertNotSame( $pm->getUserPermissions( $user1 ), $pm->getUserPermissions( $user2 ) ); } @@ -1281,7 +1280,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { public function testAnonPermissionsNotClashOneRegistered() { $user1 = User::newFromName( 'User1' ); $user2 = $this->getTestSysop()->getUser(); - $pm = MediaWikiServices::getInstance()->getPermissionManager(); + $pm = $this->getServiceContainer()->getPermissionManager(); $this->assertNotSame( $pm->getUserPermissions( $user1 ), $pm->getUserPermissions( $user2 ) ); } @@ -1291,7 +1290,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { public function testDeleteRedirect() { $this->editPage( 'ExistentRedirect3', '#REDIRECT [[Existent]]' ); $page = Title::newFromText( 'ExistentRedirect3' ); - $pm = MediaWikiServices::getInstance()->getPermissionManager(); + $pm = $this->getServiceContainer()->getPermissionManager(); $user = $this->getTestUser()->getUser(); @@ -1311,7 +1310,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $interfaceAdmin = $this->getTestUser( [ 'interface-admin', 'sysop' ] )->getUser(); $admin = $this->getTestSysop()->getUser(); - $permManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permManager = $this->getServiceContainer()->getPermissionManager(); $userJs = Title::newFromText( 'Example/common.js', NS_USER ); $this->assertTrue( $permManager->userCan( 'delete', $admin, $userJs ) ); diff --git a/tests/phpunit/includes/Revision/ContributionsLookupTest.php b/tests/phpunit/includes/Revision/ContributionsLookupTest.php index 26b6191750d8..56f531598485 100644 --- a/tests/phpunit/includes/Revision/ContributionsLookupTest.php +++ b/tests/phpunit/includes/Revision/ContributionsLookupTest.php @@ -3,7 +3,6 @@ namespace MediaWiki\Tests\Revision; use ChangeTags; -use MediaWiki\MediaWikiServices; use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\SimpleAuthority; use MediaWiki\Permissions\UltimateAuthority; @@ -61,12 +60,12 @@ class ContributionsLookupTest extends MediaWikiIntegrationTestCase { ChangeTags::$avoidReopeningTablesForTesting = true; // MessageCache needs to be explicitly enabled to load changetag display text. - MediaWikiServices::getInstance()->getMessageCache()->enable(); + $this->getServiceContainer()->getMessageCache()->enable(); } public function tearDown(): void { ChangeTags::$avoidReopeningTablesForTesting = false; - MediaWikiServices::getInstance()->getMessageCache()->disable(); + $this->getServiceContainer()->getMessageCache()->disable(); parent::tearDown(); } diff --git a/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php b/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php index 517ba5109123..717befd8bca7 100644 --- a/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php +++ b/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php @@ -2,7 +2,6 @@ namespace MediaWiki\Tests\Revision; -use MediaWiki\MediaWikiServices; use MediaWikiIntegrationTestCase; /** @@ -382,7 +381,7 @@ class RevisionQueryInfoTest extends MediaWikiIntegrationTestCase { public function testRevisionStoreGetQueryInfo( $migrationStageSettings, $options, $expected ) { $this->setMwGlobals( $migrationStageSettings ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $queryInfo = $store->getQueryInfo( $options ); $this->assertQueryInfoEquals( $expected, $queryInfo ); @@ -399,7 +398,7 @@ class RevisionQueryInfoTest extends MediaWikiIntegrationTestCase { ) { $this->setMwGlobals( $migrationStageSettings ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $queryInfo = $store->getSlotsQueryInfo( $options ); $this->assertQueryInfoEquals( $expected, $queryInfo ); @@ -412,7 +411,7 @@ class RevisionQueryInfoTest extends MediaWikiIntegrationTestCase { public function testRevisionStoreGetArchiveQueryInfo( $migrationStageSettings, $expected ) { $this->setMwGlobals( $migrationStageSettings ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $queryInfo = $store->getArchiveQueryInfo(); $this->assertQueryInfoEquals( $expected, $queryInfo ); diff --git a/tests/phpunit/includes/Revision/RevisionStoreDbTest.php b/tests/phpunit/includes/Revision/RevisionStoreDbTest.php index 8b081f81c267..2b8395b2fbd4 100644 --- a/tests/phpunit/includes/Revision/RevisionStoreDbTest.php +++ b/tests/phpunit/includes/Revision/RevisionStoreDbTest.php @@ -230,16 +230,16 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $blobStore, new WANObjectCache( [ 'cache' => new HashBagOStuff() ] ), new HashBagOStuff(), - MediaWikiServices::getInstance()->getCommentStore(), - MediaWikiServices::getInstance()->getContentModelStore(), - MediaWikiServices::getInstance()->getSlotRoleStore(), - MediaWikiServices::getInstance()->getSlotRoleRegistry(), - MediaWikiServices::getInstance()->getActorMigration(), - MediaWikiServices::getInstance()->getActorStoreFactory()->getActorStore( $dbDomain ), - MediaWikiServices::getInstance()->getContentHandlerFactory(), - MediaWikiServices::getInstance()->getPageStore(), - MediaWikiServices::getInstance()->getTitleFactory(), - MediaWikiServices::getInstance()->getHookContainer(), + $this->getServiceContainer()->getCommentStore(), + $this->getServiceContainer()->getContentModelStore(), + $this->getServiceContainer()->getSlotRoleStore(), + $this->getServiceContainer()->getSlotRoleRegistry(), + $this->getServiceContainer()->getActorMigration(), + $this->getServiceContainer()->getActorStoreFactory()->getActorStore( $dbDomain ), + $this->getServiceContainer()->getContentHandlerFactory(), + $this->getServiceContainer()->getPageStore(), + $this->getServiceContainer()->getTitleFactory(), + $this->getServiceContainer()->getHookContainer(), $dbDomain ); @@ -418,7 +418,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $title = $this->getTestPageTitle(); $rev = $this->getRevisionRecordFromDetailsArray( $revDetails ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $return = $store->insertRevisionOn( $rev, wfGetDB( DB_PRIMARY ) ); // is the new revision correct? @@ -446,7 +446,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { [ [ (string)$numberOfSlots ] ] ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $revQuery = $store->getSlotsQueryInfo( [ 'content' ] ); $this->assertSelect( @@ -519,7 +519,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { 'user' => true, ]; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); // Insert the first revision $revOne = $this->getRevisionRecordFromDetailsArray( $revDetails ); @@ -621,7 +621,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { ) { $rev = $this->getRevisionRecordFromDetailsArray( $revDetails ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $this->expectException( get_class( $exception ) ); $this->expectExceptionMessage( $exception->getMessage() ); @@ -677,7 +677,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $revDetails['user'] = $user; $baseRev = $this->getRevisionRecordFromDetailsArray( $revDetails ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $dbw = wfGetDB( DB_PRIMARY ); $baseRev = $store->insertRevisionOn( $baseRev, $dbw ); @@ -717,7 +717,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::newNullRevision */ public function testNewNullRevision_nonExistingTitle() { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $record = $store->newNullRevision( wfGetDB( DB_PRIMARY ), Title::newFromText( __METHOD__ . '.iDontExist!' ), @@ -741,7 +741,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { /** @var RevisionRecord $revRecord */ $revRecord = $status->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->getRevisionById( $revRecord->getId() ); $result = $store->getRcIdIfUnpatrolled( $storeRecord ); @@ -767,7 +767,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { /** @var RevisionRecord $revRecord */ $revRecord = $status->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->getRevisionById( $revRecord->getId() ); $result = $store->getRcIdIfUnpatrolled( $storeRecord ); @@ -788,7 +788,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { /** @var RevisionRecord $revRecord */ $revRecord = $status->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->getRevisionById( $revRecord->getId() ); $recentChange = $store->getRecentChange( $storeRecord ); @@ -809,7 +809,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { /** @var RevisionRecord $revRecord */ $revRecord = $status->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->getRevisionById( $revRecord->getId() ); $this->assertSame( $revRecord->getId(), $storeRecord->getId() ); @@ -834,7 +834,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { // Pretend the local test DB is a sister site $wikiId = $this->db->getDomainID(); - $store = MediaWikiServices::getInstance()->getRevisionStoreFactory() + $store = $this->getServiceContainer()->getRevisionStoreFactory() ->getRevisionStore( $wikiId ); // Construct a ProperPageIdentity with the sister site's wiki Id @@ -871,7 +871,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { // Pretend the local test DB is a sister site $wikiId = $this->db->getDomainID(); - $store = MediaWikiServices::getInstance()->getRevisionStoreFactory() + $store = $this->getServiceContainer()->getRevisionStoreFactory() ->getRevisionStore( $wikiId ); $storeRecord = $store->getRevisionById( $revId ); @@ -906,7 +906,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { ->willReturn( false ); $this->setService( 'ContentHandlerFactory', $mockContentHandlerFactory ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->getRevisionById( $revRecord->getId() ); @@ -935,7 +935,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { /** @var RevisionRecord $revRecord */ $revRecord = $status->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->getRevisionByTitle( $title ); $this->assertSame( $revRecord->getId(), $storeRecord->getId() ); @@ -1060,7 +1060,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { /** @var RevisionRecord $revRecord */ $revRecord = $status->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->getRevisionByPageId( $page->getId() ); $this->assertSame( $revRecord->getId(), $storeRecord->getId() ); @@ -1090,7 +1090,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { /** @var RevisionRecord $revRecord */ $revRecord = $status->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->getRevisionByTimestamp( $title, $revRecord->getTimestamp() @@ -1185,7 +1185,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ . 'a' )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $info = $store->getQueryInfo(); $row = $this->db->selectRow( $info['tables'], @@ -1231,7 +1231,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ . 'a' )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $info = $store->getQueryInfo(); $row = $this->db->selectRow( $info['tables'], @@ -1264,7 +1264,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ . 'a' )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->newRevisionFromRow( $this->revisionRecordToRow( $revRecord ), 0, @@ -1289,7 +1289,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ . 'a' )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->newRevisionFromRow( $this->revisionRecordToRow( $revRecord ), 0, @@ -1313,7 +1313,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ . 'b' )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->newRevisionFromRow( $this->revisionRecordToRow( $revRecord ), 0, @@ -1324,7 +1324,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { } private function buildRevisionStore( string $text, PageIdentity $pageIdentity ) { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $page = WikiPage::factory( $pageIdentity ); /** @var RevisionRecord $orig */ $orig = $page->doUserEditContent( @@ -1444,7 +1444,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::getArchiveQueryInfo */ public function testNewRevisionFromArchiveRow_getArchiveQueryInfo() { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $title = Title::newFromText( __METHOD__ ); $text = __METHOD__ . '-bä'; $page = WikiPage::factory( $title ); @@ -1478,7 +1478,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { */ public function testNewRevisionFromArchiveRow_legacyEncoding() { $this->setMwGlobals( 'wgLegacyEncoding', 'windows-1252' ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $title = Title::newFromText( __METHOD__ ); $text = __METHOD__ . '-bä'; $page = WikiPage::factory( $title ); @@ -1511,7 +1511,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromArchiveRowAndSlots */ public function testNewRevisionFromArchiveRow_no_user() { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $row = (object)[ 'ar_id' => '1', @@ -1549,7 +1549,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromArchiveRowAndSlots */ public function testNewRevisionFromArchiveRow_empty_actor() { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $row = (object)[ 'ar_id' => '1', @@ -1596,7 +1596,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromRowAndSlots */ public function testNewRevisionFromRow_no_user() { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $title = Title::newFromText( __METHOD__ ); $row = (object)[ @@ -1636,7 +1636,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::wrapPage */ public function testNewRevisionFromRow_noPage() { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $page = $this->getExistingTestPage(); $info = $store->getQueryInfo(); @@ -1671,7 +1671,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { // Pretend the local test DB is a sister site $wikiId = $this->db->getDomainID(); - $store = MediaWikiServices::getInstance()->getRevisionStoreFactory() + $store = $this->getServiceContainer()->getRevisionStoreFactory() ->getRevisionStore( $wikiId ); $page = $this->getExistingTestPage(); @@ -1705,7 +1705,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { // This is a round trip test for deletion and undeletion of a // revision row via the archive table. list( $title, $pageIdentity ) = $getPageIdentity(); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $page = WikiPage::factory( $title ); $user = $this->getTestSysop()->getUser(); @@ -1789,7 +1789,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $this->assertSame( [ $revRecordOne->getId() => strlen( __METHOD__ ), @@ -1825,7 +1825,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $this->assertNull( $store->getPreviousRevision( $store->getRevisionById( $revRecordOne->getId() ) @@ -1857,7 +1857,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $this->assertSame( $revRecordTwo->getId(), $store->getNextRevision( @@ -1894,7 +1894,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::getPreviousRevision */ public function testGetPreviousRevision_bad( RevisionRecord $rev ) { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $this->assertNull( $store->getPreviousRevision( $rev ) ); } @@ -1903,7 +1903,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::getNextRevision */ public function testGetNextRevision_bad( RevisionRecord $rev ) { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $this->assertNull( $store->getNextRevision( $rev ) ); } @@ -1919,7 +1919,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $result = $store->getTimestampFromId( $revRecord->getId() ); $this->assertSame( $revRecord->getTimestamp(), $result ); @@ -1937,7 +1937,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $result = $store->getTimestampFromId( $revRecord->getId() + 1 ); $this->assertFalse( $result ); @@ -1947,7 +1947,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::countRevisionsByPageId */ public function testCountRevisionsByPageId() { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $page = WikiPage::factory( Title::newFromText( __METHOD__ ) ); $user = $this->getTestSysop()->getUser(); @@ -1971,7 +1971,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::countRevisionsByTitle */ public function testCountRevisionsByTitle() { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $page = WikiPage::factory( Title::newFromText( __METHOD__ ) ); $user = $this->getTestSysop()->getUser(); @@ -2003,7 +2003,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $result = $store->userWasLastToEdit( wfGetDB( DB_PRIMARY ), $page->getId(), @@ -2026,7 +2026,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $result = $store->userWasLastToEdit( wfGetDB( DB_PRIMARY ), $page->getId(), @@ -2048,7 +2048,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $this->getTestUser()->getUser(), __METHOD__ . 'b' )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->getKnownCurrentRevision( $getPageIdentity(), $revRecord->getId() @@ -2090,7 +2090,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] ); $this->setService( 'MainWANObjectCache', $cache ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $page = $this->getNonexistingTestPage(); $rev = $this->createRevisionStoreCacheRecord( $page, $store ); @@ -2125,7 +2125,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] ); $this->setService( 'MainWANObjectCache', $cache ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $page = $this->getNonexistingTestPage(); $rev = $this->createRevisionStoreCacheRecord( $page, $store ); @@ -2145,7 +2145,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] ); $this->setService( 'MainWANObjectCache', $cache ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $page = $this->getNonexistingTestPage(); $rev = $this->createRevisionStoreCacheRecord( $page, $store ); @@ -2164,7 +2164,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] ); $this->setService( 'MainWANObjectCache', $cache ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $page = $this->getNonexistingTestPage(); $rev = $this->createRevisionStoreCacheRecord( $page, $store ); @@ -2201,7 +2201,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->newRevisionFromRow( $this->revisionRecordToRow( $revRecord ), 0, @@ -2251,7 +2251,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { __METHOD__ )->value['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $storeRecord = $store->newRevisionFromRow( $this->revisionRecordToRow( $revRecord ), 0, @@ -2307,7 +2307,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { /** @var RevisionRecord $revRecord2 */ $revRecord2 = $editStatus->getValue()['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $result = $store->getContentBlobsForBatch( [ $revRecord1->getId(), $revRecord2->getId() ], $slots @@ -2368,7 +2368,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $revRecord2 = $editStatus->getValue()['revision-record']; $this->deletePage( $page2 ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $result = $store->getContentBlobsForBatch( [ (object)[ 'ar_rev_id' => $revRecord1->getId() ], (object)[ 'ar_rev_id' => $revRecord2->getId() ], @@ -2386,7 +2386,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { */ public function testGetContentBlobsForBatch_emptyBatch() { $rows = new FakeResultWrapper( [] ); - $result = MediaWikiServices::getInstance()->getRevisionStore() + $result = $this->getServiceContainer()->getRevisionStore() ->getContentBlobsForBatch( $rows ); $this->assertTrue( $result->isGood() ); $this->assertSame( [], $result->getValue() ); @@ -2495,7 +2495,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { /** @var RevisionRecord $revRecord2 */ $revRecord2 = $editStatus->getValue()['revision-record']; - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $result = $store->newRevisionsFromBatch( [ $this->revisionRecordToRow( $revRecord1, $queryOptions ), @@ -2574,7 +2574,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $this->deletePage( $page2 ); } - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $queryInfo = $store->getArchiveQueryInfo(); $rows = $this->db->select( @@ -2626,7 +2626,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { */ public function testNewRevisionsFromBatch_emptyBatch() { $rows = new FakeResultWrapper( [] ); - $result = MediaWikiServices::getInstance()->getRevisionStore() + $result = $this->getServiceContainer()->getRevisionStore() ->newRevisionsFromBatch( $rows, [ @@ -2651,7 +2651,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $revRecord1 = $editStatus->getValue()['revision-record']; $this->expectException( InvalidArgumentException::class ); - MediaWikiServices::getInstance()->getRevisionStore() + $this->getServiceContainer()->getRevisionStore() ->newRevisionsFromBatch( [ $this->revisionRecordToRow( $revRecord1 ) ], [], @@ -2671,7 +2671,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { /** @var RevisionRecord $revRecord1 */ $revRecord1 = $editStatus->getValue()['revision-record']; - $status = MediaWikiServices::getInstance()->getRevisionStore() + $status = $this->getServiceContainer()->getRevisionStore() ->newRevisionsFromBatch( [ $this->revisionRecordToRow( $revRecord1 ), @@ -2701,7 +2701,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $revisionIds[] = $newRevision->getId(); } - $revisionStore = MediaWikiServices::getInstance()->getRevisionStore(); + $revisionStore = $this->getServiceContainer()->getRevisionStore(); $this->assertArrayEquals( [], $revisionStore->getRevisionIdsBetween( $page->getId(), $revisions[0], $revisions[0] ), @@ -2795,7 +2795,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $revisions[] = $editStatus->getValue()['revision-record']; } - $revisionStore = MediaWikiServices::getInstance()->getRevisionStore(); + $revisionStore = $this->getServiceContainer()->getRevisionStore(); $this->assertSame( 0, $revisionStore->countRevisionsBetween( $page->getId(), $revisions[0], $revisions[0] ), 'Must return 0 if the same old and new revisions provided' ); @@ -2851,7 +2851,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $revisions[] = $editStatus->getValue()['revision-record']; } - $revisionStore = MediaWikiServices::getInstance()->getRevisionStore(); + $revisionStore = $this->getServiceContainer()->getRevisionStore(); $this->assertSame( 0, $revisionStore->countAuthorsBetween( $page->getId(), $revisions[0], $revisions[0] ), 'countAuthorsBetween must return 0 if the same old and new revisions provided' ); @@ -2903,7 +2903,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $rev2 = $editStatus->getValue()['revision-record']; $this->expectException( InvalidArgumentException::class ); - MediaWikiServices::getInstance()->getRevisionStore() + $this->getServiceContainer()->getRevisionStore() ->{$method}( $page1->getId(), $rev1, $rev2 ); } @@ -2922,7 +2922,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $rev2 = new MutableRevisionRecord( $this->getTestPageTitle() ); $this->expectException( InvalidArgumentException::class ); - MediaWikiServices::getInstance()->getRevisionStore()->{$method}( + $this->getServiceContainer()->getRevisionStore()->{$method}( $this->getTestPage()->getId(), $rev1, $rev2 ); } @@ -2946,7 +2946,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { ); $this->assertSame( $firstRevId, - MediaWikiServices::getInstance() + $this->getServiceContainer() ->getRevisionStore() ->getFirstRevision( $pageIdentity ) ->getId() @@ -2971,7 +2971,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { */ public function testGetFirstRevision_nonexistent_page() { $this->assertNull( - MediaWikiServices::getInstance() + $this->getServiceContainer() ->getRevisionStore() ->getFirstRevision( $this->getNonexistingTestPage( __METHOD__ )->getTitle() ) ); @@ -3050,7 +3050,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Revision\RevisionStore::getQueryInfo */ public function testGetQueryInfo_NoSlotDataJoin() { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $queryInfo = $store->getQueryInfo(); // with the new schema enabled, query info should not join the main slot info @@ -3092,7 +3092,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { ->setContent( 'main', new WikitextContent( 'Text' ) ) ->setPageId( $page->getId() ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $return = $store->insertRevisionOn( $rev, $this->db ); $this->assertSame( $maxRevId + 2, $return->getId() ); @@ -3130,7 +3130,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $mockBlobStore->method( 'getBlobBatch' ) ->willReturn( $blobStatus ); - $revStore = MediaWikiServices::getInstance() + $revStore = $this->getServiceContainer() ->getRevisionStoreFactory() ->getRevisionStore(); $wrappedRevStore = TestingAccessWrapper::newFromObject( $revStore ); @@ -3190,7 +3190,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { ->expects( $this->never() ) ->method( 'getBlob' ); - $revStore = MediaWikiServices::getInstance() + $revStore = $this->getServiceContainer() ->getRevisionStoreFactory() ->getRevisionStore(); $wrappedRevStore = TestingAccessWrapper::newFromObject( $revStore ); @@ -3221,7 +3221,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { $invalidRow = $this->revisionRecordToRow( $revRecord1 ); $invalidRow->rev_id = 100500; - $result = MediaWikiServices::getInstance()->getRevisionStore() + $result = $this->getServiceContainer()->getRevisionStore() ->newRevisionsFromBatch( [ $this->revisionRecordToRow( $revRecord1 ), $invalidRow ], [ @@ -3273,7 +3273,7 @@ class RevisionStoreDbTest extends MediaWikiIntegrationTestCase { ->expects( $this->never() ) ->method( 'getBlob' ); - $revStore = MediaWikiServices::getInstance() + $revStore = $this->getServiceContainer() ->getRevisionStoreFactory() ->getRevisionStore(); $wrappedRevStore = TestingAccessWrapper::newFromObject( $revStore ); diff --git a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php index d1099d8db7de..71c609282144 100644 --- a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php +++ b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php @@ -11,7 +11,6 @@ use DummyContentHandlerForTesting; use JobQueueGroup; use MediaWiki\Config\ServiceOptions; use MediaWiki\Deferred\LinksUpdate\LinksUpdate; -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\MutableRevisionSlots; use MediaWiki\Revision\RevisionRecord; @@ -145,7 +144,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { $updater->prepareContent( $user, $update, false ); $options1 = $updater->getCanonicalParserOptions(); - $this->assertSame( MediaWikiServices::getInstance()->getContentLanguage(), + $this->assertSame( $this->getServiceContainer()->getContentLanguage(), $options1->getUserLangObj() ); $speculativeId = $options1->getSpeculativeRevId(); @@ -204,7 +203,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Storage\DerivedPageDataUpdater::getCanonicalParserOutput() */ public function testPrepareContent() { - $slotRoleRegistry = MediaWikiServices::getInstance()->getSlotRoleRegistry(); + $slotRoleRegistry = $this->getServiceContainer()->getSlotRoleRegistry(); if ( !$slotRoleRegistry->isDefinedRole( 'aux' ) ) { $slotRoleRegistry->defineRoleWithModel( 'aux', @@ -588,7 +587,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { ], ] ); - MediaWikiServices::getInstance()->resetServiceForTesting( 'ContentHandlerFactory' ); + $this->getServiceContainer()->resetServiceForTesting( 'ContentHandlerFactory' ); $user = $this->getTestUser()->getUser(); $page = $this->getPage( __METHOD__ ); $this->createRevision( $page, __METHOD__ ); @@ -596,7 +595,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { $contentHandler = new DummyContentHandlerForTesting( 'testing' ); $mainContent1 = $contentHandler->unserializeContent( serialize( 'first' ) ); $update = new RevisionSlotsUpdate(); - $pcache = MediaWikiServices::getInstance()->getParserCache(); + $pcache = $this->getServiceContainer()->getParserCache(); $pcache->deleteOptionsKey( $page ); $rev = $this->createRevision( $page, 'first', $mainContent1 ); @@ -705,7 +704,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { $m2 = $this->defineMockContentModelForUpdateTesting( 'M2' ); $role = 'dpdu-test-a1'; - $slotRoleRegistry = MediaWikiServices::getInstance()->getSlotRoleRegistry(); + $slotRoleRegistry = $this->getServiceContainer()->getSlotRoleRegistry(); $slotRoleRegistry->defineRoleWithModel( $role, $a1->getModelID() @@ -1043,7 +1042,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { $content['aux'] = new WikitextContent( 'Aux [[Nix]]' ); - $slotRoleRegistry = MediaWikiServices::getInstance()->getSlotRoleRegistry(); + $slotRoleRegistry = $this->getServiceContainer()->getSlotRoleRegistry(); if ( !$slotRoleRegistry->isDefinedRole( 'aux' ) ) { $slotRoleRegistry->defineRoleWithModel( 'aux', @@ -1057,7 +1056,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { $oldStats = $this->db->selectRow( 'site_stats', '*', '1=1' ); $this->db->delete( 'pagelinks', '*' ); - $pcache = MediaWikiServices::getInstance()->getParserCache(); + $pcache = $this->getServiceContainer()->getParserCache(); $pcache->deleteOptionsKey( $page ); $updater = $this->getDerivedPageDataUpdater( $page, $rev ); @@ -1118,7 +1117,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { // Case where user has canonical parser options $content = [ 'main' => new WikitextContent( 'rev ID ver #1: {{REVISIONID}}' ) ]; $rev = $this->createRevision( $page, 'first', $content ); - $pcache = MediaWikiServices::getInstance()->getParserCache(); + $pcache = $this->getServiceContainer()->getParserCache(); $pcache->deleteOptionsKey( $page ); $this->db->startAtomic( __METHOD__ ); // let deferred updates queue up @@ -1207,7 +1206,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { ] ); $updater->doUpdates(); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $editResultCache = new EditResultCache( $services->getMainObjectStash(), $services->getDBLoadBalancer(), @@ -1242,7 +1241,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\Storage\DerivedPageDataUpdater::doParserCacheUpdate() */ public function testDoParserCacheUpdate() { - $slotRoleRegistry = MediaWikiServices::getInstance()->getSlotRoleRegistry(); + $slotRoleRegistry = $this->getServiceContainer()->getSlotRoleRegistry(); if ( !$slotRoleRegistry->isDefinedRole( 'aux' ) ) { $slotRoleRegistry->defineRoleWithModel( 'aux', @@ -1260,7 +1259,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase { $update->modifyContent( 'aux', new WikitextContent( 'Aux [[Nix]]' ) ); // Emulate update after edit ---------- - $pcache = MediaWikiServices::getInstance()->getParserCache(); + $pcache = $this->getServiceContainer()->getParserCache(); $pcache->deleteOptionsKey( $page ); $rev = $this->makeRevision( $page->getTitle(), $update, $user, 'rev', null ); diff --git a/tests/phpunit/includes/Storage/NameTableStoreFactoryTest.php b/tests/phpunit/includes/Storage/NameTableStoreFactoryTest.php index 9f30bc87cecc..4510fc4f65dd 100644 --- a/tests/phpunit/includes/Storage/NameTableStoreFactoryTest.php +++ b/tests/phpunit/includes/Storage/NameTableStoreFactoryTest.php @@ -3,7 +3,6 @@ namespace MediaWiki\Tests\Storage; use MediaWiki\Logger\LoggerFactory; -use MediaWiki\MediaWikiServices; use MediaWiki\Storage\NameTableStore; use MediaWiki\Storage\NameTableStoreFactory; use MediaWikiIntegrationTestCase; @@ -38,7 +37,7 @@ class NameTableStoreFactoryTest extends MediaWikiIntegrationTestCase { $mock = $this->getMockBuilder( ILBFactory::class ) ->disableOriginalConstructor()->getMock(); - $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + $lbFactory = $this->getServiceContainer()->getDBLoadBalancerFactory(); $localDomain = $lbFactory->getLocalDomainID(); $mock->method( 'getLocalDomainID' )->willReturn( $localDomain ); @@ -80,7 +79,7 @@ class NameTableStoreFactoryTest extends MediaWikiIntegrationTestCase { /** @dataProvider provideTestGet */ public function testGet( $tableName, $wiki, $expectedWiki ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $wiki2 = ( $wiki === false ) ? $services->getDBLoadBalancerFactory()->getLocalDomainID() : $wiki; @@ -102,21 +101,21 @@ class NameTableStoreFactoryTest extends MediaWikiIntegrationTestCase { */ public function testIntegratedGetChangeTagDef() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $factory = $services->getNameTableStoreFactory(); $store = $factory->getChangeTagDef(); $this->assertIsArray( $store->getMap() ); } public function testIntegratedGetContentModels() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $factory = $services->getNameTableStoreFactory(); $store = $factory->getContentModels(); $this->assertIsArray( $store->getMap() ); } public function testIntegratedGetSlotRoles() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $factory = $services->getNameTableStoreFactory(); $store = $factory->getSlotRoles(); $this->assertIsArray( $store->getMap() ); diff --git a/tests/phpunit/includes/Storage/NameTableStoreTest.php b/tests/phpunit/includes/Storage/NameTableStoreTest.php index b84cc05571cd..6960e0cbf21a 100644 --- a/tests/phpunit/includes/Storage/NameTableStoreTest.php +++ b/tests/phpunit/includes/Storage/NameTableStoreTest.php @@ -5,7 +5,6 @@ namespace MediaWiki\Tests\Storage; use BagOStuff; use EmptyBagOStuff; use HashBagOStuff; -use MediaWiki\MediaWikiServices; use MediaWiki\Storage\NameTableAccessException; use MediaWiki\Storage\NameTableStore; use MediaWikiIntegrationTestCase; @@ -350,7 +349,7 @@ class NameTableStoreTest extends MediaWikiIntegrationTestCase { } public function testTransactionRollback() { - $lb = MediaWikiServices::getInstance()->getDBLoadBalancer(); + $lb = $this->getServiceContainer()->getDBLoadBalancer(); // Two instances hitting the real database using separate caches. $store1 = new NameTableStore( @@ -416,7 +415,7 @@ class NameTableStoreTest extends MediaWikiIntegrationTestCase { // FIXME: https://phabricator.wikimedia.org/T259085 $this->markTestSkippedIfDbType( 'sqlite' ); - $lb = MediaWikiServices::getInstance()->getDBLoadBalancer(); + $lb = $this->getServiceContainer()->getDBLoadBalancer(); // Two instances hitting the real database using separate caches. $store1 = new NameTableStore( @@ -463,7 +462,7 @@ class NameTableStoreTest extends MediaWikiIntegrationTestCase { public function testTransactionDoubleRollback() { $fname = __METHOD__; - $lb = MediaWikiServices::getInstance()->getDBLoadBalancer(); + $lb = $this->getServiceContainer()->getDBLoadBalancer(); $store = new NameTableStore( $lb, $this->getHashWANObjectCache( new HashBagOStuff() ), diff --git a/tests/phpunit/includes/Storage/SqlBlobStoreTest.php b/tests/phpunit/includes/Storage/SqlBlobStoreTest.php index 4d435b311acd..b329eb1bb287 100644 --- a/tests/phpunit/includes/Storage/SqlBlobStoreTest.php +++ b/tests/phpunit/includes/Storage/SqlBlobStoreTest.php @@ -6,7 +6,6 @@ use ExternalStoreAccess; use ExternalStoreFactory; use HashBagOStuff; use InvalidArgumentException; -use MediaWiki\MediaWikiServices; use MediaWiki\Storage\BlobAccessException; use MediaWiki\Storage\SqlBlobStore; use MediaWikiIntegrationTestCase; @@ -31,7 +30,7 @@ class SqlBlobStoreTest extends MediaWikiIntegrationTestCase { WANObjectCache $cache = null, ExternalStoreAccess $extStore = null ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $store = new SqlBlobStore( $services->getDBLoadBalancer(), @@ -695,7 +694,7 @@ class SqlBlobStoreTest extends MediaWikiIntegrationTestCase { $lb = $this->getMockBuilder( LoadBalancer::class ) ->disableOriginalConstructor() ->getMock(); - $access = MediaWikiServices::getInstance()->getExternalStoreAccess(); + $access = $this->getServiceContainer()->getExternalStoreAccess(); $blobStore = new SqlBlobStore( $lb, $access, $cache ); diff --git a/tests/phpunit/includes/TimeAdjustTest.php b/tests/phpunit/includes/TimeAdjustTest.php index ef1097cf0574..5e9a5b86a6b6 100644 --- a/tests/phpunit/includes/TimeAdjustTest.php +++ b/tests/phpunit/includes/TimeAdjustTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - class TimeAdjustTest extends MediaWikiLangTestCase { /** * Test offset usage for a given Language::userAdjust @@ -13,7 +11,7 @@ class TimeAdjustTest extends MediaWikiLangTestCase { $this->assertEquals( $expected, - strval( MediaWikiServices::getInstance()->getContentLanguage()-> + strval( $this->getServiceContainer()->getContentLanguage()-> userAdjust( $date, '' ) ), "User adjust {$date} by {$localTZoffset} minutes should give {$expected}" ); diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php index 3d97501c040d..9dfc2c78464b 100644 --- a/tests/phpunit/includes/TitleTest.php +++ b/tests/phpunit/includes/TitleTest.php @@ -2,7 +2,6 @@ use MediaWiki\Cache\CacheKeyHelper; use MediaWiki\Linker\LinkTarget; -use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Permissions\RestrictionStore; @@ -1354,7 +1353,7 @@ class TitleTest extends MediaWikiIntegrationTestCase { */ public function testExists() { $title = Title::makeTitle( NS_PROJECT, 'New page' ); - $linkCache = MediaWikiServices::getInstance()->getLinkCache(); + $linkCache = $this->getServiceContainer()->getLinkCache(); $article = new Article( $title ); $page = $article->getPage(); @@ -1985,7 +1984,7 @@ class TitleTest extends MediaWikiIntegrationTestCase { */ public function testGetRestrictions() { $title = $this->getExistingTestPage( 'UTest1' )->getTitle(); - $rs = MediaWikiServices::getInstance()->getRestrictionStore(); + $rs = $this->getServiceContainer()->getRestrictionStore(); $wrapper = TestingAccessWrapper::newFromObject( $rs ); $wrapper->cache = [ CacheKeyHelper::getKeyForPage( $title ) => [ 'restrictions' => [ @@ -2009,7 +2008,7 @@ class TitleTest extends MediaWikiIntegrationTestCase { 'c' => [ 'sysop' ], ]; $title = $this->getExistingTestPage( 'UTest1' )->getTitle(); - $rs = MediaWikiServices::getInstance()->getRestrictionStore(); + $rs = $this->getServiceContainer()->getRestrictionStore(); $wrapper = TestingAccessWrapper::newFromObject( $rs ); $wrapper->cache = [ CacheKeyHelper::getKeyForPage( $title ) => [ 'restrictions' => $restrictions @@ -2025,7 +2024,7 @@ class TitleTest extends MediaWikiIntegrationTestCase { */ public function testGetRestrictionExpiry() { $title = $this->getExistingTestPage( 'UTest1' )->getTitle(); - $rs = MediaWikiServices::getInstance()->getRestrictionStore(); + $rs = $this->getServiceContainer()->getRestrictionStore(); $wrapper = TestingAccessWrapper::newFromObject( $rs ); $wrapper->cache = [ CacheKeyHelper::getKeyForPage( $title ) => [ 'expiry' => [ @@ -2055,7 +2054,7 @@ class TitleTest extends MediaWikiIntegrationTestCase { 'wgSemiprotectedRestrictionLevels' => [ 'autoconfirmed' ], 'wgRestrictionLevels' => [ '', 'autoconfirmed', 'sysop' ] ] ); - $rs = MediaWikiServices::getInstance()->getRestrictionStore(); + $rs = $this->getServiceContainer()->getRestrictionStore(); $wrapper = TestingAccessWrapper::newFromObject( $rs ); $wrapper->cache = [ CacheKeyHelper::getKeyForPage( $title ) => [ 'restrictions' => [ 'edit' => [ 'sysop' ] ], @@ -2084,7 +2083,7 @@ class TitleTest extends MediaWikiIntegrationTestCase { 'wgRestrictionLevels' => [ '', 'autoconfirmed', 'sysop' ], 'wgRestrictionTypes' => [ 'create', 'edit', 'move', 'upload' ] ] ); - $rs = MediaWikiServices::getInstance()->getRestrictionStore(); + $rs = $this->getServiceContainer()->getRestrictionStore(); $wrapper = TestingAccessWrapper::newFromObject( $rs ); $wrapper->cache = [ CacheKeyHelper::getKeyForPage( $title ) => [ 'restrictions' => [ 'edit' => [ 'sysop' ] ], @@ -2124,7 +2123,7 @@ class TitleTest extends MediaWikiIntegrationTestCase { public function testIsCascadeProtected() { $page = $this->getExistingTestPage( 'UTest1' ); $title = $page->getTitle(); - $rs = MediaWikiServices::getInstance()->getRestrictionStore(); + $rs = $this->getServiceContainer()->getRestrictionStore(); $wrapper = TestingAccessWrapper::newFromObject( $rs ); $wrapper->cache = [ CacheKeyHelper::getKeyForPage( $title ) => [ 'has_cascading' => true, diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php index 4a44b89320dd..d813174c5e04 100644 --- a/tests/phpunit/includes/XmlTest.php +++ b/tests/phpunit/includes/XmlTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * Split into separate \MediaWiki\Tests\Unit\XmlTest for unit tests * @@ -12,7 +10,7 @@ class XmlTest extends MediaWikiIntegrationTestCase { protected function setUp(): void { parent::setUp(); - $langObj = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $langObj = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $langObj->setNamespaces( [ -2 => 'Media', -1 => 'Special', diff --git a/tests/phpunit/includes/actions/WatchActionTest.php b/tests/phpunit/includes/actions/WatchActionTest.php index d9ba95c583a6..0737bed9d1f4 100644 --- a/tests/phpunit/includes/actions/WatchActionTest.php +++ b/tests/phpunit/includes/actions/WatchActionTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use MediaWiki\User\UserIdentityValue; @@ -58,7 +57,7 @@ class WatchActionTest extends MediaWikiIntegrationTestCase { } private function getWatchAction( Article $article, IContextSource $context ) { - $mwServices = MediaWikiServices::getInstance(); + $mwServices = $this->getServiceContainer(); return new WatchAction( $article, $context, @@ -254,7 +253,7 @@ class WatchActionTest extends MediaWikiIntegrationTestCase { ->with( $msg, $prefixedTitle, $expiryLabel ); $testContext->method( 'getOutput' )->willReturn( $testOutput ); // Set language to anything non-English/default, to catch assumptions. - $langDe = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'de' ); + $langDe = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'de' ); $testContext->method( 'getLanguage' )->willReturn( $langDe ); /** @var MockObject|WebRequest $testRequest */ $testRequest = $this->createMock( WebRequest::class ); diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php index e7cf45c88f99..c334fcfea288 100644 --- a/tests/phpunit/includes/api/ApiBaseTest.php +++ b/tests/phpunit/includes/api/ApiBaseTest.php @@ -1341,10 +1341,10 @@ class ApiBaseTest extends ApiTestCase { 'reason' => __METHOD__, 'expiry' => time() + 100500, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $mockTrait = $this->getMockForTrait( ApiBlockInfoTrait::class ); - $language = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $language = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $mockTrait->method( 'getLanguage' )->willReturn( $language ); $userInfoTrait = TestingAccessWrapper::newFromObject( $mockTrait ); $blockinfo = [ 'blockinfo' => $userInfoTrait->getBlockDetails( $block ) ]; @@ -1401,10 +1401,10 @@ class ApiBaseTest extends ApiTestCase { 'reason' => __METHOD__, 'expiry' => time() + 100500, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $mockTrait = $this->getMockForTrait( ApiBlockInfoTrait::class ); - $language = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $language = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $mockTrait->method( 'getLanguage' )->willReturn( $language ); $userInfoTrait = TestingAccessWrapper::newFromObject( $mockTrait ); $blockinfo = [ 'blockinfo' => $userInfoTrait->getBlockDetails( $block ) ]; diff --git a/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php b/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php index 70c4e9a196ab..d2e573683051 100644 --- a/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php +++ b/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php @@ -2,7 +2,6 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\SystemBlock; -use MediaWiki\MediaWikiServices; use Wikimedia\TestingAccessWrapper; /** @@ -13,7 +12,7 @@ class ApiBlockInfoTraitTest extends MediaWikiIntegrationTestCase { * @dataProvider provideGetBlockDetails */ public function testGetBlockDetails( $block, $expectedInfo ) { - $language = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ); + $language = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ); $mock = $this->getMockForTrait( ApiBlockInfoTrait::class ); $mock->method( 'getLanguage' )->willReturn( $language ); $info = TestingAccessWrapper::newFromObject( $mock )->getBlockDetails( $block ); diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php index 5f5fb3c3fdc4..a63ea5e85117 100644 --- a/tests/phpunit/includes/api/ApiBlockTest.php +++ b/tests/phpunit/includes/api/ApiBlockTest.php @@ -4,7 +4,6 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\ActionRestriction; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; /** @@ -93,7 +92,7 @@ class ApiBlockTest extends ApiTestCase { 'timestamp' => '19370101000000', 'expiry' => 'infinity', ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $this->doBlock( [], $blocked ); } @@ -282,7 +281,7 @@ class ApiBlockTest extends ApiTestCase { 'wgEnablePartialActionBlocks' => true, ] ); - $blockActionInfo = MediaWikiServices::getInstance()->getBlockActionInfo(); + $blockActionInfo = $this->getServiceContainer()->getBlockActionInfo(); $action = 'upload'; $this->doBlock( [ diff --git a/tests/phpunit/includes/api/ApiClearHasMsgTest.php b/tests/phpunit/includes/api/ApiClearHasMsgTest.php index 0a45a397fb74..a345dd69ba20 100644 --- a/tests/phpunit/includes/api/ApiClearHasMsgTest.php +++ b/tests/phpunit/includes/api/ApiClearHasMsgTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group API * @group medium @@ -14,7 +12,7 @@ class ApiClearHasMsgTest extends ApiTestCase { */ public function testClearFlag() { $user = self::$users['sysop']->getUser(); - $talkPageNotificationManager = MediaWikiServices::getInstance() + $talkPageNotificationManager = $this->getServiceContainer() ->getTalkPageNotificationManager(); $talkPageNotificationManager->setUserHasNewMessages( $user ); $this->assertTrue( $talkPageNotificationManager->userHasNewMessages( $user ) ); diff --git a/tests/phpunit/includes/api/ApiComparePagesTest.php b/tests/phpunit/includes/api/ApiComparePagesTest.php index 6fef787d3e4f..12663bad45f8 100644 --- a/tests/phpunit/includes/api/ApiComparePagesTest.php +++ b/tests/phpunit/includes/api/ApiComparePagesTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; /** @@ -83,7 +82,7 @@ class ApiComparePagesTest extends ApiTestCase { self::$repl['revG1'] = $this->addPage( 'G', "== Section 1 ==\nG 1.1", CONTENT_MODEL_TEXT ); self::$repl['pageG'] = Title::newFromText( 'ApiComparePagesTest G' )->getArticleID(); - $page = MediaWikiServices::getInstance()->getWikiPageFactory() + $page = $this->getServiceContainer()->getWikiPageFactory() ->newFromTitle( Title::newFromText( 'ApiComparePagesTest C' ) ); $this->deletePage( $page, 'Test for ApiComparePagesTest', $user ); diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php index 989d71fabe55..62274d68e9e7 100644 --- a/tests/phpunit/includes/api/ApiEditPageTest.php +++ b/tests/phpunit/includes/api/ApiEditPageTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Block\DatabaseBlock; -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; /** @@ -1365,7 +1364,7 @@ class ApiEditPageTest extends ApiTestCase { $this->editPage( $name, 'Some text' ); - $pageObj = MediaWikiServices::getInstance()->getWikiPageFactory()->newFromTitle( Title::newFromText( $name ) ); + $pageObj = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( Title::newFromText( $name ) ); $this->deletePage( $pageObj ); $this->assertFalse( $pageObj->exists() ); @@ -1394,7 +1393,7 @@ class ApiEditPageTest extends ApiTestCase { 'minor' => '', ] ); - $revisionStore = \MediaWiki\MediaWikiServices::getInstance()->getRevisionStore(); + $revisionStore = $this->getServiceContainer()->getRevisionStore(); $revision = $revisionStore->getRevisionByTitle( Title::newFromText( $name ) ); $this->assertTrue( $revision->isMinor() ); } @@ -1406,7 +1405,7 @@ class ApiEditPageTest extends ApiTestCase { $this->editPage( $name, 'Some text' ); - $pageObj = MediaWikiServices::getInstance()->getWikiPageFactory()->newFromTitle( Title::newFromText( $name ) ); + $pageObj = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( Title::newFromText( $name ) ); $this->deletePage( $pageObj ); $this->assertFalse( $pageObj->exists() ); @@ -1570,7 +1569,7 @@ class ApiEditPageTest extends ApiTestCase { 'expiry' => 'infinity', 'enableAutoblock' => true, ] ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); try { @@ -1595,7 +1594,7 @@ class ApiEditPageTest extends ApiTestCase { $this->expectException( ApiUsageException::class ); $this->expectExceptionMessage( 'The wiki is currently in read-only mode.' ); - $svc = \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode(); + $svc = $this->getServiceContainer()->getReadOnlyMode(); $svc->setReason( "Read-only for testing" ); try { diff --git a/tests/phpunit/includes/api/ApiErrorFormatterTest.php b/tests/phpunit/includes/api/ApiErrorFormatterTest.php index cb71f77e8f73..47c132c34456 100644 --- a/tests/phpunit/includes/api/ApiErrorFormatterTest.php +++ b/tests/phpunit/includes/api/ApiErrorFormatterTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\TestingAccessWrapper; /** @@ -14,7 +13,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { public function testErrorFormatterBasics() { $result = new ApiResult( 8388608 ); $formatter = new ApiErrorFormatter( $result, - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'de' ), 'wikitext', + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'de' ), 'wikitext', false ); $this->assertSame( 'de', $formatter->getLanguage()->getCode() ); $this->assertSame( 'wikitext', $formatter->getFormat() ); @@ -42,7 +41,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { public function testNewWithFormat() { $result = new ApiResult( 8388608 ); $formatter = new ApiErrorFormatter( $result, - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'de' ), 'wikitext', + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'de' ), 'wikitext', false ); $formatter2 = $formatter->newWithFormat( 'html' ); @@ -65,7 +64,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { ) { $result = new ApiResult( 8388608 ); $formatter = new ApiErrorFormatter( $result, - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( $lang ), $format, + $this->getServiceContainer()->getLanguageFactory()->getLanguage( $lang ), $format, $useDB ); // Add default type @@ -603,7 +602,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { public function testGetMessageFromException( $exception, $options, $expect ) { $result = new ApiResult( 8388608 ); $formatter = new ApiErrorFormatter( $result, - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ), 'html', + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ), 'html', false ); $msg = $formatter->getMessageFromException( $exception, $options ); @@ -698,7 +697,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { public function testAddMessagesFromStatus_filter() { $result = new ApiResult( 8388608 ); $formatter = new ApiErrorFormatter( $result, - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'qqx' ), + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'qqx' ), 'plaintext', false ); $status = Status::newGood(); diff --git a/tests/phpunit/includes/api/ApiLoginTest.php b/tests/phpunit/includes/api/ApiLoginTest.php index 4477cba8a503..1634e7a22561 100644 --- a/tests/phpunit/includes/api/ApiLoginTest.php +++ b/tests/phpunit/includes/api/ApiLoginTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Session\BotPasswordSessionProvider; use MediaWiki\Session\SessionManager; use Wikimedia\TestingAccessWrapper; @@ -296,7 +295,7 @@ class ApiLoginTest extends ApiTestCase { $this->assertNotSame( 0, $centralId ); $password = 'ngfhmjm64hv0854493hsj5nncjud2clk'; - $passwordFactory = MediaWikiServices::getInstance()->getPasswordFactory(); + $passwordFactory = $this->getServiceContainer()->getPasswordFactory(); // A is unsalted MD5 (thus fast) ... we don't care about security here, this is test only $passwordHash = $passwordFactory->newFromPlaintext( $password ); diff --git a/tests/phpunit/includes/api/ApiMoveTest.php b/tests/phpunit/includes/api/ApiMoveTest.php index d26bb47a030a..02e85fa9c4e7 100644 --- a/tests/phpunit/includes/api/ApiMoveTest.php +++ b/tests/phpunit/includes/api/ApiMoveTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Block\DatabaseBlock; -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\SlotRecord; /** @@ -51,7 +50,7 @@ class ApiMoveTest extends ApiTestCase { $this->assertTrue( $fromTitle->isRedirect(), "Source {$fromTitle->getPrefixedText()} is not a redirect" ); - $target = MediaWikiServices::getInstance() + $target = $this->getServiceContainer() ->getRevisionLookup() ->getRevisionByTitle( $fromTitle ) ->getContent( SlotRecord::MAIN ) @@ -149,7 +148,7 @@ class ApiMoveTest extends ApiTestCase { ] ); // Fetched stored expiry (maximum duration may override '99990123000000'). - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); $expiry = $store->getWatchedItem( $user, $title )->getExpiry(); // Move to new location, without changing the watched state. @@ -207,7 +206,7 @@ class ApiMoveTest extends ApiTestCase { public function testMoveWhileBlocked() { $this->assertNull( DatabaseBlock::newFromTarget( '127.0.0.1' ) ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $block = new DatabaseBlock( [ 'address' => self::$users['sysop']->getUser()->getName(), 'by' => self::$users['sysop']->getUser(), diff --git a/tests/phpunit/includes/api/ApiPageSetTest.php b/tests/phpunit/includes/api/ApiPageSetTest.php index e757e3a8a6b5..0f6848f2f190 100644 --- a/tests/phpunit/includes/api/ApiPageSetTest.php +++ b/tests/phpunit/includes/api/ApiPageSetTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Linker\LinkTarget; -use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageReference; use MediaWiki\Tests\Unit\DummyServicesTrait; @@ -242,7 +241,7 @@ class ApiPageSetTest extends ApiTestCase { // Prepare the gender cache for testing - this is a fresh instance due to service override $genderCache = TestingAccessWrapper::newFromObject( - MediaWikiServices::getInstance()->getGenderCache() + $this->getServiceContainer()->getGenderCache() ); $genderCache->missLimit = 0; diff --git a/tests/phpunit/includes/api/ApiResultTest.php b/tests/phpunit/includes/api/ApiResultTest.php index 54efaa4afb72..03b2121a46b8 100644 --- a/tests/phpunit/includes/api/ApiResultTest.php +++ b/tests/phpunit/includes/api/ApiResultTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers ApiResult * @group API @@ -478,7 +476,7 @@ class ApiResultTest extends MediaWikiIntegrationTestCase { $result = new ApiResult( 10 ); $formatter = new ApiErrorFormatter( $result, - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ), + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ), 'none', false ); $result->setErrorFormatter( $formatter ); $this->assertFalse( $result->addValue( null, 'foo', '12345678901' ) ); diff --git a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php index a1c5d5d50118..0e4a7d893940 100644 --- a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php +++ b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php @@ -2,7 +2,6 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\PageRestriction; -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; @@ -131,7 +130,7 @@ class ApiRevisionDeleteTest extends ApiTestCase { $block->setRestrictions( [ new PageRestriction( 0, Title::newFromText( self::$page )->getArticleID() ) ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $revid = array_shift( $this->revs ); diff --git a/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php b/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php index 867d178a5476..2b3c8f9f9829 100644 --- a/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php +++ b/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @author Addshore * @covers ApiSetNotificationTimestamp @@ -47,7 +45,7 @@ class ApiSetNotificationTimestampIntegrationTest extends ApiTestCase { $result[0] ); - $watchedItemStore = MediaWikiServices::getInstance()->getWatchedItemStore(); + $watchedItemStore = $this->getServiceContainer()->getWatchedItemStore(); $this->assertEquals( $watchedItemStore->getNotificationTimestampsBatch( $user, [ $page->getTitle() ] ), [ [ 'UTPage' => '20160101020202' ] ] diff --git a/tests/phpunit/includes/api/ApiStashEditTest.php b/tests/phpunit/includes/api/ApiStashEditTest.php index defad488b99c..745a5ecd8460 100644 --- a/tests/phpunit/includes/api/ApiStashEditTest.php +++ b/tests/phpunit/includes/api/ApiStashEditTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Storage\PageEditStash; use MediaWiki\User\UserIdentity; use Psr\Log\NullLogger; @@ -24,13 +23,13 @@ class ApiStashEditTest extends ApiTestCase { ->getUserEditTracker() ); $this->setService( 'PageEditStash', new PageEditStash( new HashBagOStuff( [] ), - MediaWikiServices::getInstance()->getDBLoadBalancer(), + $this->getServiceContainer()->getDBLoadBalancer(), new NullLogger(), new NullStatsdDataFactory(), - MediaWikiServices::getInstance()->getUserEditTracker(), - MediaWikiServices::getInstance()->getUserFactory(), - MediaWikiServices::getInstance()->getWikiPageFactory(), - MediaWikiServices::getInstance()->getHookContainer(), + $this->getServiceContainer()->getUserEditTracker(), + $this->getServiceContainer()->getUserFactory(), + $this->getServiceContainer()->getWikiPageFactory(), + $this->getServiceContainer()->getHookContainer(), PageEditStash::INITIATOR_USER ) ); // Clear rate-limiting cache between tests @@ -109,7 +108,7 @@ class ApiStashEditTest extends ApiTestCase { * @return string */ protected function getStashedText( $hash ) { - return MediaWikiServices::getInstance()->getPageEditStash()->fetchInputText( $hash ); + return $this->getServiceContainer()->getPageEditStash()->fetchInputText( $hash ); } /** @@ -127,7 +126,7 @@ class ApiStashEditTest extends ApiTestCase { $user = $this->getTestSysop()->getUser(); } $editStash = TestingAccessWrapper::newFromObject( - MediaWikiServices::getInstance()->getPageEditStash() ); + $this->getServiceContainer()->getPageEditStash() ); return $editStash->getStashKey( $titleObj, $editStash->getContentHash( $content ), $user ); } @@ -311,7 +310,7 @@ class ApiStashEditTest extends ApiTestCase { * @return stdClass|bool Return value of PageStashEdit::checkCache(), false if not in cache */ protected function doCheckCache( UserIdentity $user, $text = 'Content' ) { - return MediaWikiServices::getInstance()->getPageEditStash()->checkCache( + return $this->getServiceContainer()->getPageEditStash()->checkCache( Title::newFromText( __CLASS__ ), new WikitextContent( $text ), $user @@ -373,7 +372,7 @@ class ApiStashEditTest extends ApiTestCase { $key = $this->getStashKey( __CLASS__, $text, $user ); $editStash = TestingAccessWrapper::newFromObject( - MediaWikiServices::getInstance()->getPageEditStash() ); + $this->getServiceContainer()->getPageEditStash() ); $cache = $editStash->cache; $editInfo = $cache->get( $key ); @@ -424,7 +423,7 @@ class ApiStashEditTest extends ApiTestCase { $this->doStash( [ 'text' => $text ] ); $editStash = TestingAccessWrapper::newFromObject( - MediaWikiServices::getInstance()->getPageEditStash() ); + $this->getServiceContainer()->getPageEditStash() ); $cache = $editStash->cache; $key = $this->getStashKey( __CLASS__, $text ); diff --git a/tests/phpunit/includes/api/ApiUnblockTest.php b/tests/phpunit/includes/api/ApiUnblockTest.php index 062024a9f231..67dc3030efb2 100644 --- a/tests/phpunit/includes/api/ApiUnblockTest.php +++ b/tests/phpunit/includes/api/ApiUnblockTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Block\DatabaseBlock; -use MediaWiki\MediaWikiServices; /** * @group API @@ -33,7 +32,7 @@ class ApiUnblockTest extends ApiTestCase { 'address' => $this->blockee->getName(), 'by' => $this->blocker, ] ); - $result = MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $result = $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $this->assertNotFalse( $result, 'Could not insert block' ); $blockFromDB = DatabaseBlock::newFromID( $result['id'] ); $this->assertTrue( $blockFromDB !== null, 'Could not retrieve block' ); @@ -99,7 +98,7 @@ class ApiUnblockTest extends ApiTestCase { 'address' => $this->blocker->getName(), 'by' => $this->getTestUser( 'sysop' )->getUser(), ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $this->doUnblock(); } @@ -109,7 +108,7 @@ class ApiUnblockTest extends ApiTestCase { 'address' => $this->blocker->getName(), 'by' => $this->getTestUser( 'sysop' )->getUser(), ] ); - $result = MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $result = $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $this->assertNotFalse( $result, 'Could not insert block' ); $this->doUnblock( [ 'user' => $this->blocker->getName() ] ); diff --git a/tests/phpunit/includes/api/ApiUploadTestCase.php b/tests/phpunit/includes/api/ApiUploadTestCase.php index ee79b855d897..190f6f465d49 100644 --- a/tests/phpunit/includes/api/ApiUploadTestCase.php +++ b/tests/phpunit/includes/api/ApiUploadTestCase.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * Abstract class to support upload tests */ @@ -35,7 +33,7 @@ abstract class ApiUploadTestCase extends ApiTestCase { */ public function deleteFileByTitle( $title ) { if ( $title->exists() ) { - $file = MediaWikiServices::getInstance()->getRepoGroup() + $file = $this->getServiceContainer()->getRepoGroup() ->findFile( $title, [ 'ignoreRedirect' => true ] ); $noOldArchive = ""; // yes this really needs to be set this way $comment = "removing for test"; @@ -54,7 +52,7 @@ abstract class ApiUploadTestCase extends ApiTestCase { return false; } - $page = MediaWikiServices::getInstance()->getWikiPageFactory()->newFromTitle( $title ); + $page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title ); $this->deletePage( $page, "removing for test" ); // see if it now doesn't exist; reload @@ -85,7 +83,7 @@ abstract class ApiUploadTestCase extends ApiTestCase { */ public function deleteFileByContent( $filePath ) { $hash = FSFile::getSha1Base36FromPath( $filePath ); - $dupes = MediaWikiServices::getInstance()->getRepoGroup()->findBySha1( $hash ); + $dupes = $this->getServiceContainer()->getRepoGroup()->findBySha1( $hash ); $success = true; foreach ( $dupes as $dupe ) { $success &= $this->deleteFileByTitle( $dupe->getTitle() ); diff --git a/tests/phpunit/includes/api/ApiUserrightsTest.php b/tests/phpunit/includes/api/ApiUserrightsTest.php index 6bcb4cda272b..f485d5bfe0f7 100644 --- a/tests/phpunit/includes/api/ApiUserrightsTest.php +++ b/tests/phpunit/includes/api/ApiUserrightsTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Block\DatabaseBlock; -use MediaWiki\MediaWikiServices; /** * @group API @@ -141,7 +140,7 @@ class ApiUserrightsTest extends ApiTestCase { $user = $this->getTestSysop()->getUser(); $block = new DatabaseBlock( [ 'address' => $user, 'by' => $user, ] ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); try { @@ -158,7 +157,7 @@ class ApiUserrightsTest extends ApiTestCase { $this->setPermissions( true, true ); $block = new DatabaseBlock( [ 'address' => $user, 'by' => $user ] ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); try { diff --git a/tests/phpunit/includes/api/ApiWatchTest.php b/tests/phpunit/includes/api/ApiWatchTest.php index dec59c14c0e5..102d4d428f65 100644 --- a/tests/phpunit/includes/api/ApiWatchTest.php +++ b/tests/phpunit/includes/api/ApiWatchTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\Timestamp\ConvertibleTimestamp; /** @@ -55,7 +54,7 @@ class ApiWatchTest extends ApiTestCase { } public function testWatchWithExpiry() { - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); $user = $this->getTestUser()->getUser(); // First watch without expiry (indefinite). diff --git a/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php b/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php index 58877807ebd6..58531ff1b0cf 100644 --- a/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php +++ b/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php @@ -8,7 +8,6 @@ use ApiMessage; use ApiTestCase; use ApiUsageException; use FauxRequest; -use MediaWiki\MediaWikiServices; use Message; use Wikimedia\Message\DataMessageValue; use Wikimedia\Message\MessageValue; @@ -28,7 +27,7 @@ class ApiParamValidatorTest extends ApiTestCase { $context = $this->apiContext->newTestContext( $request, $this->getTestUser()->getUser() ); $main = new ApiMain( $context ); return [ - new ApiParamValidator( $main, MediaWikiServices::getInstance()->getObjectFactory() ), + new ApiParamValidator( $main, $this->getServiceContainer()->getObjectFactory() ), $main ]; } diff --git a/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php b/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php index d210c56ce9c3..96048ef3c8f0 100644 --- a/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php @@ -3,7 +3,6 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; -use MediaWiki\MediaWikiServices; /** * @group API @@ -38,7 +37,7 @@ class ApiQueryBlocksTest extends ApiTestCase { 'expiry' => 'infinity', ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); list( $data ) = $this->doApiRequest( [ 'action' => 'query', @@ -67,7 +66,7 @@ class ApiQueryBlocksTest extends ApiTestCase { 'ipb_sitewide' => 1, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); list( $data ) = $this->doApiRequest( [ 'action' => 'query', @@ -100,7 +99,7 @@ class ApiQueryBlocksTest extends ApiTestCase { 'sitewide' => 0, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $subset = [ 'id' => $block->getId(), diff --git a/tests/phpunit/includes/api/query/ApiQueryInfoTest.php b/tests/phpunit/includes/api/query/ApiQueryInfoTest.php index ebbc47752fe1..62c22c3d5c4b 100644 --- a/tests/phpunit/includes/api/query/ApiQueryInfoTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryInfoTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Block\DatabaseBlock; -use MediaWiki\MediaWikiServices; use Wikimedia\Timestamp\ConvertibleTimestamp; /** @@ -169,7 +168,7 @@ class ApiQueryInfoTest extends ApiTestCase { 'enableAutoblock' => true, ] ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); $page = $this->getExistingTestPage( 'Pluto' ); diff --git a/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php index cedd58904122..4264ab612617 100644 --- a/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Linker\LinkTarget; -use MediaWiki\MediaWikiServices; /** * @group API @@ -397,7 +396,7 @@ class ApiQueryRecentChangesIntegrationTest extends ApiTestCase { $target, 'Create the page that will be deleted' ); - $wikiPage = MediaWikiServices::getInstance()->getWikiPageFactory()->newFromLinkTarget( $target ); + $wikiPage = $this->getServiceContainer()->getWikiPageFactory()->newFromLinkTarget( $target ); $this->deletePage( $wikiPage, 'Important Reason' ); } @@ -648,7 +647,7 @@ class ApiQueryRecentChangesIntegrationTest extends ApiTestCase { ] ); $title = Title::newFromLinkTarget( $subjectTarget ); - $revision = MediaWikiServices::getInstance() + $revision = $this->getServiceContainer() ->getRevisionLookup() ->getRevisionByTitle( $title ); diff --git a/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php b/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php index 668ae9ceee4b..209d9a7a9343 100644 --- a/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php +++ b/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\TestingAccessWrapper; /** @@ -53,7 +52,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase { } public function testLinkPrefixCharset() { - $contLang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'ar' ); + $contLang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'ar' ); $this->setContentLang( $contLang ); $this->assertTrue( $contLang->linkPrefixExtension() ); @@ -63,7 +62,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase { } public function testVariants() { - $contLang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'zh' ); + $contLang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'zh' ); $this->setContentLang( $contLang ); $this->assertTrue( $contLang->hasVariants() ); @@ -80,7 +79,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase { } public function testReadOnly() { - $svc = MediaWikiServices::getInstance()->getReadOnlyMode(); + $svc = $this->getServiceContainer()->getReadOnlyMode(); $svc->setReason( 'Need more donations' ); try { $data = $this->doQuery(); @@ -94,7 +93,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase { public function testNamespacesBasic() { $this->assertSame( - array_keys( MediaWikiServices::getInstance()->getContentLanguage()->getFormattedNamespaces() ), + array_keys( $this->getServiceContainer()->getContentLanguage()->getFormattedNamespaces() ), array_keys( $this->doQuery( 'namespaces' ) ) ); } @@ -102,7 +101,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase { public function testNamespacesExtraNS() { $this->setMwGlobals( 'wgExtraNamespaces', [ '138' => 'Testing' ] ); $this->assertSame( - array_keys( MediaWikiServices::getInstance()->getContentLanguage()->getFormattedNamespaces() ), + array_keys( $this->getServiceContainer()->getContentLanguage()->getFormattedNamespaces() ), array_keys( $this->doQuery( 'namespaces' ) ) ); } @@ -133,7 +132,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase { } public function testNamespaceAliases() { - $expected = MediaWikiServices::getInstance()->getContentLanguage()->getNamespaceAliases(); + $expected = $this->getServiceContainer()->getContentLanguage()->getNamespaceAliases(); $expected = array_map( static function ( $key, $val ) { return [ 'id' => $val, 'alias' => strtr( $key, '_', ' ' ) ]; @@ -147,14 +146,14 @@ class ApiQuerySiteinfoTest extends ApiTestCase { public function testSpecialPageAliases() { $this->assertCount( - count( MediaWikiServices::getInstance()->getSpecialPageFactory()->getNames() ), + count( $this->getServiceContainer()->getSpecialPageFactory()->getNames() ), $this->doQuery( 'specialpagealiases' ) ); } public function testMagicWords() { $this->assertCount( - count( MediaWikiServices::getInstance()->getContentLanguage()->getMagicWords() ), + count( $this->getServiceContainer()->getContentLanguage()->getMagicWords() ), $this->doQuery( 'magicwords' ) ); } @@ -201,7 +200,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase { ] ); $this->resetServices(); - MediaWikiServices::getInstance()->getMessageCache()->enable(); + $this->getServiceContainer()->getMessageCache()->enable(); $this->editPage( 'MediaWiki:Interlanguage-link-self', 'Self!' ); $this->editPage( 'MediaWiki:Interlanguage-link-sitename-self', 'Circular logic' ); @@ -533,7 +532,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase { * @dataProvider languagesProvider */ public function testLanguages( $langCode ) { - $expected = MediaWikiServices::getInstance() + $expected = $this->getServiceContainer() ->getLanguageNameUtils() ->getLanguageNames( (string)$langCode ); @@ -561,10 +560,10 @@ class ApiQuerySiteinfoTest extends ApiTestCase { public function testLanguageVariants() { $expectedKeys = array_filter( LanguageConverter::$languagesWithVariants, - static function ( $langCode ) { - $lang = MediaWikiServices::getInstance()->getLanguageFactory() + function ( $langCode ) { + $lang = $this->getServiceContainer()->getLanguageFactory() ->getLanguage( $langCode ); - $converter = MediaWikiServices::getInstance()->getLanguageConverterFactory() + $converter = $this->getServiceContainer()->getLanguageConverterFactory() ->getLanguageConverter( $lang ); return $converter->hasVariants(); } @@ -590,7 +589,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase { */ public function testSkins( $code ) { $data = $this->doQuery( 'skins', $code !== null ? [ 'siinlanguagecode' => $code ] : [] ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $skinFactory = $services->getSkinFactory(); $skinNames = $skinFactory->getInstalledSkins(); $expectedAllowed = $skinFactory->getAllowedSkins(); @@ -635,20 +634,20 @@ class ApiQuerySiteinfoTest extends ApiTestCase { static function ( $tag ) { return "<$tag>"; }, - MediaWikiServices::getInstance()->getParser()->getTags() + $this->getServiceContainer()->getParser()->getTags() ); $this->assertSame( $expected, $this->doQuery( 'extensiontags' ) ); } public function testFunctionHooks() { - $this->assertSame( MediaWikiServices::getInstance()->getParser()->getFunctionHooks(), + $this->assertSame( $this->getServiceContainer()->getParser()->getFunctionHooks(), $this->doQuery( 'functionhooks' ) ); } public function testVariables() { $this->assertSame( - MediaWikiServices::getInstance()->getMagicWordFactory()->getVariableIDs(), + $this->getServiceContainer()->getMagicWordFactory()->getVariableIDs(), $this->doQuery( 'variables' ) ); } diff --git a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php index ccb758bd6947..222b76ba2f71 100644 --- a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Linker\LinkTarget; -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\SlotRecord; /** @@ -87,7 +86,7 @@ class ApiQueryWatchlistIntegrationTest extends ApiTestCase { $updater->setContent( SlotRecord::MAIN, ContentHandler::makeContent( $content, $title ) ); $rev = $updater->saveRevision( $summary ); - $rc = MediaWikiServices::getInstance()->getRevisionStore()->getRecentChange( $rev ); + $rc = $this->getServiceContainer()->getRevisionStore()->getRecentChange( $rev ); $rc->doMarkPatrolled( $patrollingUser, false, [] ); } @@ -131,7 +130,7 @@ class ApiQueryWatchlistIntegrationTest extends ApiTestCase { } private function getWatchedItemStore() { - return MediaWikiServices::getInstance()->getWatchedItemStore(); + return $this->getServiceContainer()->getWatchedItemStore(); } /** @@ -214,7 +213,7 @@ class ApiQueryWatchlistIntegrationTest extends ApiTestCase { } private function getPrefixedText( LinkTarget $target ) { - return MediaWikiServices::getInstance()->getTitleFormatter()->getPrefixedText( $target ); + return $this->getServiceContainer()->getTitleFormatter()->getPrefixedText( $target ); } private function cleanTestUsersWatchlist() { @@ -622,7 +621,7 @@ class ApiQueryWatchlistIntegrationTest extends ApiTestCase { 'Some Content', 'Create the page that will be deleted' ); - $wikiPage = MediaWikiServices::getInstance()->getWikiPageFactory()->newFromLinkTarget( $target ); + $wikiPage = $this->getServiceContainer()->getWikiPageFactory()->newFromLinkTarget( $target ); $this->deletePage( $wikiPage, 'Important Reason' ); } @@ -1140,7 +1139,7 @@ class ApiQueryWatchlistIntegrationTest extends ApiTestCase { ] ); $title = Title::newFromLinkTarget( $subjectTarget ); - $revision = MediaWikiServices::getInstance() + $revision = $this->getServiceContainer() ->getRevisionLookup() ->getRevisionByTitle( $title ); diff --git a/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php index 501456c55d8a..b41cbb736147 100644 --- a/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group API * @group Database @@ -34,7 +32,7 @@ class ApiQueryWatchlistRawIntegrationTest extends ApiTestCase { } private function getWatchedItemStore() { - return MediaWikiServices::getInstance()->getWatchedItemStore(); + return $this->getServiceContainer()->getWatchedItemStore(); } private function doListWatchlistRawRequest( array $params = [] ) { diff --git a/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php index a88c0d08cfa3..dae75d603e73 100644 --- a/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php @@ -2,7 +2,6 @@ namespace MediaWiki\Auth; -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Auth\AuthenticationProviderTestTrait; use MultiConfig; use Wikimedia\TestingAccessWrapper; @@ -124,7 +123,7 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiIntegr 'InvalidPasswordReset' => true, ] ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $manager = new AuthManager( new \FauxRequest(), $services->getMainConfig(), diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php index 09385764c3b6..3ec6f31485e0 100644 --- a/tests/phpunit/includes/auth/AuthManagerTest.php +++ b/tests/phpunit/includes/auth/AuthManagerTest.php @@ -213,13 +213,13 @@ class AuthManagerTest extends \MediaWikiIntegrationTestCase { $this->objectFactory = new ObjectFactory( $services ); } if ( $regen || !$this->readOnlyMode ) { - $this->readOnlyMode = MediaWikiServices::getInstance()->getReadOnlyMode(); + $this->readOnlyMode = $this->getServiceContainer()->getReadOnlyMode(); } if ( $regen || !$this->blockManager ) { - $this->blockManager = MediaWikiServices::getInstance()->getBlockManager(); + $this->blockManager = $this->getServiceContainer()->getBlockManager(); } if ( $regen || !$this->watchlistManager ) { - $this->watchlistManager = MediaWikiServices::getInstance()->getWatchlistManager(); + $this->watchlistManager = $this->getServiceContainer()->getWatchlistManager(); } if ( $regen || !$this->hookContainer ) { // Set up a HookContainer similar to the normal one except that it @@ -241,28 +241,28 @@ class AuthManagerTest extends \MediaWikiIntegrationTestCase { ); } if ( $regen || !$this->userNameUtils ) { - $this->userNameUtils = MediaWikiServices::getInstance()->getUserNameUtils(); + $this->userNameUtils = $this->getServiceContainer()->getUserNameUtils(); } if ( $regen || !$this->loadBalancer ) { - $this->loadBalancer = MediaWikiServices::getInstance()->getDBLoadBalancer(); + $this->loadBalancer = $this->getServiceContainer()->getDBLoadBalancer(); } if ( $regen || !$this->contentLanguage ) { - $this->contentLanguage = MediaWikiServices::getInstance()->getContentLanguage(); + $this->contentLanguage = $this->getServiceContainer()->getContentLanguage(); } if ( $regen || !$this->languageConverterFactory ) { - $this->languageConverterFactory = MediaWikiServices::getInstance()->getLanguageConverterFactory(); + $this->languageConverterFactory = $this->getServiceContainer()->getLanguageConverterFactory(); } if ( $regen || !$this->botPasswordStore ) { - $this->botPasswordStore = MediaWikiServices::getInstance()->getBotPasswordStore(); + $this->botPasswordStore = $this->getServiceContainer()->getBotPasswordStore(); } if ( $regen || !$this->userFactory ) { - $this->userFactory = MediaWikiServices::getInstance()->getUserFactory(); + $this->userFactory = $this->getServiceContainer()->getUserFactory(); } if ( $regen || !$this->userIdentityLookup ) { - $this->userIdentityLookup = MediaWikiServices::getInstance()->getUserIdentityLookup(); + $this->userIdentityLookup = $this->getServiceContainer()->getUserIdentityLookup(); } if ( $regen || !$this->userOptionsManager ) { - $this->userOptionsManager = MediaWikiServices::getInstance()->getUserOptionsManager(); + $this->userOptionsManager = $this->getServiceContainer()->getUserOptionsManager(); } if ( !$this->logger ) { $this->logger = new \TestLogger(); @@ -1815,7 +1815,7 @@ class AuthManagerTest extends \MediaWikiIntegrationTestCase { $this->assertSame( 'noname', $ret->message->getKey() ); $this->hook( 'LocalUserCreated', LocalUserCreatedHook::class, $this->never() ); - $readOnlyMode = \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode(); + $readOnlyMode = $this->getServiceContainer()->getReadOnlyMode(); $readOnlyMode->setReason( 'Because' ); $userReq->username = self::usernameForCreation(); $ret = $this->manager->beginAccountCreation( $creator, [ $userReq ], 'http://localhost/' ); @@ -1988,7 +1988,7 @@ class AuthManagerTest extends \MediaWikiIntegrationTestCase { $this->hook( 'LocalUserCreated', LocalUserCreatedHook::class, $this->never() ); $this->request->getSession()->setSecret( 'AuthManager::accountCreationState', [ 'username' => $creator->getName() ] + $session ); - $readOnlyMode = \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode(); + $readOnlyMode = $this->getServiceContainer()->getReadOnlyMode(); $readOnlyMode->setReason( 'Because' ); $ret = $this->manager->continueAccountCreation( [] ); $this->unhook( 'LocalUserCreated' ); @@ -2687,7 +2687,7 @@ class AuthManagerTest extends \MediaWikiIntegrationTestCase { // Wiki is read-only $session->clear(); $this->hook( 'LocalUserCreated', LocalUserCreatedHook::class, $this->never() ); - $readOnlyMode = \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode(); + $readOnlyMode = $this->getServiceContainer()->getReadOnlyMode(); $readOnlyMode->setReason( 'Because' ); $user = \User::newFromName( $username ); $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true, true ); diff --git a/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php index 69cd5bdf9be3..6935862a5933 100644 --- a/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php @@ -4,7 +4,6 @@ namespace MediaWiki\Auth; use HashConfig; use MediaWiki\Block\DatabaseBlock; -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Auth\AuthenticationProviderTestTrait; use Wikimedia\TestingAccessWrapper; @@ -74,7 +73,7 @@ class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiIntegrati \TestUser::setPasswordForUser( $user, 'UTBlockeePassword' ); $user->saveSettings(); } - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $oldBlock = DatabaseBlock::newFromTarget( 'UTBlockee' ); if ( $oldBlock ) { // An old block will prevent our new one from saving. @@ -162,7 +161,7 @@ class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiIntegrati 'sitewide' => false, ]; $block = new DatabaseBlock( $blockOptions ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $user = \User::newFromName( 'UTNormalUser' ); if ( $user->getId() == 0 ) { diff --git a/tests/phpunit/includes/auth/ConfirmLinkSecondaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/ConfirmLinkSecondaryAuthenticationProviderTest.php index 0c4250211805..25f80881dc1c 100644 --- a/tests/phpunit/includes/auth/ConfirmLinkSecondaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/ConfirmLinkSecondaryAuthenticationProviderTest.php @@ -2,7 +2,6 @@ namespace MediaWiki\Auth; -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Auth\AuthenticationProviderTestTrait; use MediaWiki\User\UserNameUtils; use Psr\Container\ContainerInterface; @@ -137,7 +136,7 @@ class ConfirmLinkSecondaryAuthenticationProviderTest extends \MediaWikiIntegrati $provider = new ConfirmLinkSecondaryAuthenticationProvider; $providerPriv = TestingAccessWrapper::newFromObject( $provider ); $request = new \FauxRequest(); - $mwServices = MediaWikiServices::getInstance(); + $mwServices = $this->getServiceContainer(); $manager = $this->getMockBuilder( AuthManager::class ) ->onlyMethods( [ 'allowsAuthenticationDataChange' ] ) ->setConstructorArgs( [ @@ -248,7 +247,7 @@ class ConfirmLinkSecondaryAuthenticationProviderTest extends \MediaWikiIntegrati $request = new \FauxRequest(); $services = $this->createNoOpMock( ContainerInterface::class ); $objectFactory = new \Wikimedia\ObjectFactory( $services ); - $mwServices = MediaWikiServices::getInstance(); + $mwServices = $this->getServiceContainer(); $hookContainer = $mwServices->getHookContainer(); $readOnlyMode = $mwServices->getReadOnlyMode(); $userNameUtils = $mwServices->getUserNameUtils(); diff --git a/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php index dc80f4c3f520..61a4752b7a5f 100644 --- a/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php @@ -2,7 +2,6 @@ namespace MediaWiki\Auth; -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Auth\AuthenticationProviderTestTrait; use MediaWiki\User\UserNameUtils; use Psr\Container\ContainerInterface; @@ -88,7 +87,7 @@ class EmailNotificationSecondaryAuthenticationProviderTest extends \MediaWikiInt } public function testBeginSecondaryAccountCreation() { - $mwServices = MediaWikiServices::getInstance(); + $mwServices = $this->getServiceContainer(); $services = $this->createNoOpAbstractMock( ContainerInterface::class ); $objectFactory = new \Wikimedia\ObjectFactory( $services ); $hookContainer = $this->createHookContainer(); diff --git a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php index 7044f26a214d..c110ab7b6eea 100644 --- a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php @@ -2,7 +2,6 @@ namespace MediaWiki\Auth; -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Auth\AuthenticationProviderTestTrait; use MediaWiki\User\UserNameUtils; use Psr\Container\ContainerInterface; @@ -30,7 +29,7 @@ class LocalPasswordPrimaryAuthenticationProviderTest extends \MediaWikiIntegrati * @return LocalPasswordPrimaryAuthenticationProvider */ protected function getProvider( $loginOnly = false ) { - $mwServices = MediaWikiServices::getInstance(); + $mwServices = $this->getServiceContainer(); if ( !$this->config ) { $this->config = new \HashConfig(); } diff --git a/tests/phpunit/includes/auth/ResetPasswordSecondaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/ResetPasswordSecondaryAuthenticationProviderTest.php index e882593fac9d..3d2ca467f6d4 100644 --- a/tests/phpunit/includes/auth/ResetPasswordSecondaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/ResetPasswordSecondaryAuthenticationProviderTest.php @@ -2,7 +2,6 @@ namespace MediaWiki\Auth; -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Auth\AuthenticationProviderTestTrait; use MediaWiki\User\UserNameUtils; use Psr\Container\ContainerInterface; @@ -91,7 +90,7 @@ class ResetPasswordSecondaryAuthenticationProviderTest extends \MediaWikiIntegra ], ], ] ); - $mwServices = MediaWikiServices::getInstance(); + $mwServices = $this->getServiceContainer(); $services = $this->createNoOpAbstractMock( ContainerInterface::class ); $objectFactory = new \Wikimedia\ObjectFactory( $services ); $hookContainer = $this->createHookContainer(); diff --git a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php index 443db40078a1..400f67499374 100644 --- a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php @@ -2,7 +2,6 @@ namespace MediaWiki\Auth; -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Auth\AuthenticationProviderTestTrait; use MediaWiki\User\UserNameUtils; use Psr\Container\ContainerInterface; @@ -33,7 +32,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiInteg * @return TemporaryPasswordPrimaryAuthenticationProvider */ protected function getProvider( $params = [] ) { - $mwServices = MediaWikiServices::getInstance(); + $mwServices = $this->getServiceContainer(); if ( !$this->config ) { $this->config = new \HashConfig( [ 'EmailEnabled' => true, @@ -87,7 +86,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiInteg } protected function hookMailer( $func = null ) { - $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); + $hookContainer = $this->getServiceContainer()->getHookContainer(); if ( $func ) { $reset = $hookContainer->scopedRegister( 'AlternateUserMailer', $func, true ); } else { @@ -156,7 +155,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiInteg $user = self::getMutableTestUser()->getUser(); $dbw = wfGetDB( DB_PRIMARY ); - $config = MediaWikiServices::getInstance()->getMainConfig(); + $config = $this->getServiceContainer()->getMainConfig(); // A is unsalted MD5 (thus fast) ... we don't care about security here, this is test only $passwordFactory = new \PasswordFactory( $config->get( 'PasswordConfig' ), 'A' ); diff --git a/tests/phpunit/includes/block/BlockErrorFormatterTest.php b/tests/phpunit/includes/block/BlockErrorFormatterTest.php index 10c3e4120032..56129ce8702e 100644 --- a/tests/phpunit/includes/block/BlockErrorFormatterTest.php +++ b/tests/phpunit/includes/block/BlockErrorFormatterTest.php @@ -3,7 +3,6 @@ use MediaWiki\Block\CompositeBlock; use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\SystemBlock; -use MediaWiki\MediaWikiServices; /** * @todo Can this be converted to unit tests? @@ -29,11 +28,11 @@ class BlockErrorFormatterTest extends MediaWikiIntegrationTestCase { ->willReturn( '1.2.3.4' ); $context->setRequest( $request ); - $formatter = MediaWikiServices::getInstance()->getBlockErrorFormatter(); + $formatter = $this->getServiceContainer()->getBlockErrorFormatter(); $message = $formatter->getMessage( $block, $context->getUser(), - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'qqx' ), + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'qqx' ), $context->getRequest()->getIP() ); @@ -179,7 +178,7 @@ class BlockErrorFormatterTest extends MediaWikiIntegrationTestCase { $context = RequestContext::getMain(); - $formatter = MediaWikiServices::getInstance()->getBlockErrorFormatter(); + $formatter = $this->getServiceContainer()->getBlockErrorFormatter(); $this->assertContains( $expected, $formatter->getMessage( diff --git a/tests/phpunit/includes/block/BlockManagerTest.php b/tests/phpunit/includes/block/BlockManagerTest.php index d52e6041fca0..f80a7388697a 100644 --- a/tests/phpunit/includes/block/BlockManagerTest.php +++ b/tests/phpunit/includes/block/BlockManagerTest.php @@ -4,7 +4,6 @@ use MediaWiki\Block\BlockManager; use MediaWiki\Block\CompositeBlock; use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\SystemBlock; -use MediaWiki\MediaWikiServices; use Psr\Log\NullLogger; use Wikimedia\TestingAccessWrapper; @@ -49,7 +48,7 @@ class BlockManagerTest extends MediaWikiIntegrationTestCase { private function getBlockManagerConstructorArgs( $overrideConfig ) { $blockManagerConfig = array_merge( $this->blockManagerConfig, $overrideConfig ); $this->setMwGlobals( $blockManagerConfig ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return [ new LoggedServiceOptions( self::$serviceOptionsAccessLog, @@ -68,7 +67,7 @@ class BlockManagerTest extends MediaWikiIntegrationTestCase { */ public function testGetBlock() { // Reset so that hooks are called - $permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); + $permissionManager = $this->getServiceContainer()->getPermissionManager(); $permissionManager->invalidateUsersRightsCache(); // Ensure that the `UserGetRights` hook in PermissionManager is triggerred @@ -130,7 +129,7 @@ class BlockManagerTest extends MediaWikiIntegrationTestCase { ] ) ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $block = new DatabaseBlock( array_merge( [ 'address' => $options['target'] ?: $this->user, 'by' => $this->sysopUser, @@ -162,7 +161,7 @@ class BlockManagerTest extends MediaWikiIntegrationTestCase { ] ) ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $block = new DatabaseBlock( array_merge( [ 'address' => $options['target'] ?: $this->user, 'by' => $this->sysopUser, diff --git a/tests/phpunit/includes/block/BlockRestrictionStoreTest.php b/tests/phpunit/includes/block/BlockRestrictionStoreTest.php index d43dfc5114d7..fc05583240f3 100644 --- a/tests/phpunit/includes/block/BlockRestrictionStoreTest.php +++ b/tests/phpunit/includes/block/BlockRestrictionStoreTest.php @@ -7,7 +7,6 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; use MediaWiki\Block\Restriction\Restriction; -use MediaWiki\MediaWikiServices; /** * @group Database @@ -22,7 +21,7 @@ class BlockRestrictionStoreTest extends \MediaWikiLangTestCase { protected function setUp(): void { parent::setUp(); - $this->blockRestrictionStore = MediaWikiServices::getInstance()->getBlockRestrictionStore(); + $this->blockRestrictionStore = $this->getServiceContainer()->getBlockRestrictionStore(); } protected function tearDown(): void { @@ -593,7 +592,7 @@ class BlockRestrictionStoreTest extends \MediaWikiLangTestCase { 'enableAutoblock' => true, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); return $block; } diff --git a/tests/phpunit/includes/block/CompositeBlockTest.php b/tests/phpunit/includes/block/CompositeBlockTest.php index 33b325fb9572..036136268976 100644 --- a/tests/phpunit/includes/block/CompositeBlockTest.php +++ b/tests/phpunit/includes/block/CompositeBlockTest.php @@ -6,7 +6,6 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; use MediaWiki\Block\SystemBlock; -use MediaWiki\MediaWikiServices; /** * @group Database @@ -28,7 +27,7 @@ class CompositeBlockTest extends MediaWikiLangTestCase { 'sitewide' => false, ] ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $userBlock ); $blockStore->insertBlock( $ipBlock ); @@ -39,7 +38,7 @@ class CompositeBlockTest extends MediaWikiLangTestCase { } private function deleteBlocks( $blocks ) { - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); foreach ( $blocks as $block ) { $blockStore->deleteBlock( $block ); } @@ -289,7 +288,7 @@ class CompositeBlockTest extends MediaWikiLangTestCase { ->willReturn( '1.2.3.4' ); $context->setRequest( $request ); - $formatter = MediaWikiServices::getInstance()->getBlockErrorFormatter(); + $formatter = $this->getServiceContainer()->getBlockErrorFormatter(); $message = $formatter->getMessage( $compositeBlock, $context->getUser(), @@ -319,6 +318,6 @@ class CompositeBlockTest extends MediaWikiLangTestCase { * @return BlockRestrictionStore */ protected function getBlockRestrictionStore(): BlockRestrictionStore { - return MediaWikiServices::getInstance()->getBlockRestrictionStore(); + return $this->getServiceContainer()->getBlockRestrictionStore(); } } diff --git a/tests/phpunit/includes/block/DatabaseBlockTest.php b/tests/phpunit/includes/block/DatabaseBlockTest.php index 3ac62649b130..5898f5d11865 100644 --- a/tests/phpunit/includes/block/DatabaseBlockTest.php +++ b/tests/phpunit/includes/block/DatabaseBlockTest.php @@ -6,7 +6,6 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; use MediaWiki\DAO\WikiAwareEntity; -use MediaWiki\MediaWikiServices; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; use MediaWiki\User\UserNameUtils; @@ -41,7 +40,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { * @throws MWException */ private function addBlockForUser( UserIdentity $user ) { - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); // Delete the last round's block if it's still there $oldBlock = DatabaseBlock::newFromTarget( $user ); if ( $oldBlock ) { @@ -148,7 +147,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { * @covers ::newFromTarget */ public function testNewFromTargetRangeBlocks( $targets, $ip, $expectedTarget ) { - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blocker = $this->getTestSysop()->getUser(); foreach ( $targets as $target ) { @@ -254,7 +253,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { 'by' => UserIdentityValue::newExternal( 'm', 'MetaWikiUser' ), ]; $block = new DatabaseBlock( $blockOptions ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); // Reload block from DB $userBlock = DatabaseBlock::newFromTarget( $username ); @@ -283,7 +282,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { * @covers ::insert */ public function testCrappyCrossWikiBlocks() { - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); // Delete the last round's block if it's still there $oldBlock = DatabaseBlock::newFromTarget( 'UserOnForeignWiki' ); if ( $oldBlock ) { @@ -385,7 +384,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { ], ]; - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blocker = $this->getTestUser()->getUser(); foreach ( $blockList as $insBlock ) { $target = $insBlock['target']; @@ -479,7 +478,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { 'by' => $sysop, 'expiry' => 'infinity', ] ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); $blockQuery = DatabaseBlock::getQueryInfo(); @@ -661,7 +660,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { * @covers ::insert */ public function testRestrictionsFromDatabase() { - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $badActor = $this->getTestUser()->getUser(); $sysop = $this->getTestSysop()->getUser(); @@ -690,7 +689,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { * @covers ::insert */ public function testInsertExistingBlock() { - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $badActor = $this->getTestUser()->getUser(); $sysop = $this->getTestSysop()->getUser(); @@ -739,7 +738,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { $block->setTarget( new UserIdentityValue( $user->getId(), $user->getName() ) ); $block->setBlocker( $this->getTestSysop()->getUser() ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); $title = $this->getExistingTestPage( 'Foo' )->getTitle(); @@ -770,7 +769,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { $block->setTarget( $user ); $block->setBlocker( $this->getTestSysop()->getUser() ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); $pageFoo = $this->getExistingTestPage( 'Foo' ); @@ -806,7 +805,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { $block->setTarget( $user ); $block->setBlocker( $this->getTestSysop()->getUser() ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); $title = $this->getExistingTestPage()->getTitle(); @@ -835,7 +834,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { $block->setTarget( $user ); $block->setBlocker( $this->getTestSysop()->getUser() ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); $title = $this->getExistingTestPage()->getTitle(); @@ -868,7 +867,7 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { $block->setTarget( $user ); $block->setBlocker( $this->getTestSysop()->getUser() ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); $namespaceRestriction = new NamespaceRestriction( $block->getId(), NS_MAIN ); @@ -897,6 +896,6 @@ class DatabaseBlockTest extends MediaWikiLangTestCase { * @return BlockRestrictionStore */ protected function getBlockRestrictionStore(): BlockRestrictionStore { - return MediaWikiServices::getInstance()->getBlockRestrictionStore(); + return $this->getServiceContainer()->getBlockRestrictionStore(); } } diff --git a/tests/phpunit/includes/cache/GenderCacheTest.php b/tests/phpunit/includes/cache/GenderCacheTest.php index b5bb5cabc7b7..3c333784de25 100644 --- a/tests/phpunit/includes/cache/GenderCacheTest.php +++ b/tests/phpunit/includes/cache/GenderCacheTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group Database * @group Cache @@ -43,7 +41,7 @@ class GenderCacheTest extends MediaWikiLangTestCase { * @covers GenderCache::getGenderOf */ public function testUserName( $userKey, $expectedGender ) { - $genderCache = MediaWikiServices::getInstance()->getGenderCache(); + $genderCache = $this->getServiceContainer()->getGenderCache(); $username = self::$nameMap[$userKey] ?? $userKey; $gender = $genderCache->getGenderOf( $username ); $this->assertEquals( $gender, $expectedGender, "GenderCache normal" ); @@ -57,7 +55,7 @@ class GenderCacheTest extends MediaWikiLangTestCase { */ public function testUserObjects( $userKey, $expectedGender ) { $username = self::$nameMap[$userKey] ?? $userKey; - $genderCache = MediaWikiServices::getInstance()->getGenderCache(); + $genderCache = $this->getServiceContainer()->getGenderCache(); $gender = $genderCache->getGenderOf( $username ); $this->assertEquals( $gender, $expectedGender, "GenderCache normal" ); } @@ -83,7 +81,7 @@ class GenderCacheTest extends MediaWikiLangTestCase { */ public function testStripSubpages( $userKey, $expectedGender ) { $username = self::$nameMap[$userKey] ?? $userKey; - $genderCache = MediaWikiServices::getInstance()->getGenderCache(); + $genderCache = $this->getServiceContainer()->getGenderCache(); $gender = $genderCache->getGenderOf( "$username/subpage" ); $this->assertEquals( $gender, $expectedGender, "GenderCache must strip of subpages" ); } @@ -95,7 +93,7 @@ class GenderCacheTest extends MediaWikiLangTestCase { public function testWithoutDB() { $this->overrideMwServices(); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $services->disableService( 'DBLoadBalancer' ); $services->disableService( 'DBLoadBalancerFactory' ); diff --git a/tests/phpunit/includes/cache/LinkBatchTest.php b/tests/phpunit/includes/cache/LinkBatchTest.php index e041ad3df416..88b561acf0cd 100644 --- a/tests/phpunit/includes/cache/LinkBatchTest.php +++ b/tests/phpunit/includes/cache/LinkBatchTest.php @@ -161,7 +161,7 @@ class LinkBatchTest extends MediaWikiIntegrationTestCase { $bad["$title"] = $title; } ); - $services = \MediaWiki\MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $batch = new LinkBatch( [], diff --git a/tests/phpunit/includes/cache/MessageCacheTest.php b/tests/phpunit/includes/cache/MessageCacheTest.php index b7f6967a77dc..c27bbad8a5de 100644 --- a/tests/phpunit/includes/cache/MessageCacheTest.php +++ b/tests/phpunit/includes/cache/MessageCacheTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; use Wikimedia\TestingAccessWrapper; @@ -15,7 +14,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { protected function setUp(): void { parent::setUp(); $this->configureLanguages(); - MediaWikiServices::getInstance()->getMessageCache()->enable(); + $this->getServiceContainer()->getMessageCache()->enable(); } /** @@ -64,7 +63,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { if ( $content === null ) { $content = $lang; } - if ( $lang !== MediaWikiServices::getInstance()->getContentLanguage()->getCode() ) { + if ( $lang !== $this->getServiceContainer()->getContentLanguage()->getCode() ) { $title = "$title/$lang"; } @@ -87,7 +86,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { * @dataProvider provideMessagesForFallback */ public function testMessageFallbacks( $message, $lang, $expectedContent ) { - $result = MediaWikiServices::getInstance()->getMessageCache()->get( $message, true, $lang ); + $result = $this->getServiceContainer()->getMessageCache()->get( $message, true, $lang ); $this->assertEquals( $expectedContent, $result, "Message fallback failed." ); } @@ -106,9 +105,9 @@ class MessageCacheTest extends MediaWikiLangTestCase { } public function testReplaceMsg() { - $messageCache = MediaWikiServices::getInstance()->getMessageCache(); + $messageCache = $this->getServiceContainer()->getMessageCache(); $message = 'go'; - $uckey = MediaWikiServices::getInstance()->getContentLanguage()->ucfirst( $message ); + $uckey = $this->getServiceContainer()->getContentLanguage()->ucfirst( $message ); $oldText = $messageCache->get( $message ); // "Ausführen" $dbw = wfGetDB( DB_PRIMARY ); @@ -149,7 +148,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { ] ] ); - $messageCache = MediaWikiServices::getInstance()->getMessageCache(); + $messageCache = $this->getServiceContainer()->getMessageCache(); $messageCache->enable(); // Populate one key @@ -205,7 +204,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { $dbr = wfGetDB( DB_REPLICA ); - $messageCache = MediaWikiServices::getInstance()->getMessageCache(); + $messageCache = $this->getServiceContainer()->getMessageCache(); $messageCache->getMsgFromNamespace( 'allpages', $wgLanguageCode ); $this->assertSame( 0, $dbr->trxLevel() ); @@ -221,7 +220,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { public function testNoDBAccessNonContentLanguage() { $dbr = wfGetDB( DB_REPLICA ); - $messageCache = MediaWikiServices::getInstance()->getMessageCache(); + $messageCache = $this->getServiceContainer()->getMessageCache(); $messageCache->getMsgFromNamespace( 'allpages/nl', 'nl' ); $this->assertSame( 0, $dbr->trxLevel() ); @@ -256,11 +255,11 @@ class MessageCacheTest extends MediaWikiLangTestCase { $importRevision->setContent( SlotRecord::MAIN, $content ); $importRevision->setUsername( 'ext>Alan Smithee' ); - $importer = MediaWikiServices::getInstance()->getWikiRevisionOldRevisionImporterNoUpdates(); + $importer = $this->getServiceContainer()->getWikiRevisionOldRevisionImporterNoUpdates(); $importer->import( $importRevision ); // Now, load the message from the wiki page - $messageCache = MediaWikiServices::getInstance()->getMessageCache(); + $messageCache = $this->getServiceContainer()->getMessageCache(); $messageCache->enable(); $messageCache = TestingAccessWrapper::newFromObject( $messageCache ); @@ -280,7 +279,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { */ public function testIsMainCacheable( $code, $message, $expected ) { $messageCache = TestingAccessWrapper::newFromObject( - MediaWikiServices::getInstance()->getMessageCache() ); + $this->getServiceContainer()->getMessageCache() ); $this->assertSame( $expected, $messageCache->isMainCacheable( $message, $code ) ); } diff --git a/tests/phpunit/includes/changes/CategoryMembershipChangeTest.php b/tests/phpunit/includes/changes/CategoryMembershipChangeTest.php index 7139f899f287..7345c57b74c5 100644 --- a/tests/phpunit/includes/changes/CategoryMembershipChangeTest.php +++ b/tests/phpunit/includes/changes/CategoryMembershipChangeTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; use MediaWiki\User\UserIdentity; @@ -120,7 +119,7 @@ class CategoryMembershipChangeTest extends MediaWikiLangTestCase { } public function testChangeAddedWithRev() { - $revision = MediaWikiServices::getInstance() + $revision = $this->getServiceContainer() ->getRevisionLookup() ->getRevisionByTitle( Title::newFromText( self::$pageName ) ); $change = $this->newChange( $revision ); @@ -143,7 +142,7 @@ class CategoryMembershipChangeTest extends MediaWikiLangTestCase { } public function testChangeRemovedWithRev() { - $revision = MediaWikiServices::getInstance() + $revision = $this->getServiceContainer() ->getRevisionLookup() ->getRevisionByTitle( Title::newFromText( self::$pageName ) ); $change = $this->newChange( $revision ); diff --git a/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php b/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php index 69f32c2ee8c3..64fbcad3956e 100644 --- a/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php +++ b/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Linker\LinkRenderer; -use MediaWiki\MediaWikiServices; /** * @covers RCCacheEntryFactory @@ -29,7 +28,7 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase { 'wgArticlePath' => '/wiki/$1' ] ); - $this->linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); + $this->linkRenderer = $this->getServiceContainer()->getLinkRenderer(); $this->testRecentChangesHelper = new TestRecentChangesHelper(); } diff --git a/tests/phpunit/includes/changetags/ChangeTagsTest.php b/tests/phpunit/includes/changetags/ChangeTagsTest.php index 4160bc467cbb..8d231543b14f 100644 --- a/tests/phpunit/includes/changetags/ChangeTagsTest.php +++ b/tests/phpunit/includes/changetags/ChangeTagsTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers ChangeTags * @group Database @@ -523,7 +521,7 @@ class ChangeTagsTest extends MediaWikiIntegrationTestCase { public function testDeleteTags() { $this->emptyChangeTagsTables(); - MediaWikiServices::getInstance()->resetServiceForTesting( 'NameTableStoreFactory' ); + $this->getServiceContainer()->resetServiceForTesting( 'NameTableStoreFactory' ); $rcId = 123; ChangeTags::updateTags( [ 'tag1', 'tag2' ], [], $rcId ); @@ -611,7 +609,7 @@ class ChangeTagsTest extends MediaWikiIntegrationTestCase { public function testTagUsageStatistics() { $this->emptyChangeTagsTables(); - MediaWikiServices::getInstance()->resetServiceForTesting( 'NameTableStoreFactory' ); + $this->getServiceContainer()->resetServiceForTesting( 'NameTableStoreFactory' ); $rcId = 123; ChangeTags::updateTags( [ 'tag1', 'tag2' ], [], $rcId ); diff --git a/tests/phpunit/includes/collation/CustomUppercaseCollationTest.php b/tests/phpunit/includes/collation/CustomUppercaseCollationTest.php index e1bb26d59a84..65abef740625 100644 --- a/tests/phpunit/includes/collation/CustomUppercaseCollationTest.php +++ b/tests/phpunit/includes/collation/CustomUppercaseCollationTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * TODO convert to a Unit test * @@ -12,7 +10,7 @@ class CustomUppercaseCollationTest extends MediaWikiIntegrationTestCase { protected function setUp(): void { parent::setUp(); $this->collation = new CustomUppercaseCollation( - MediaWikiServices::getInstance()->getLanguageFactory(), + $this->getServiceContainer()->getLanguageFactory(), [ 'D', 'C', diff --git a/tests/phpunit/includes/config/ConfigFactoryTest.php b/tests/phpunit/includes/config/ConfigFactoryTest.php index 34df7f235f43..67b68eca27b5 100644 --- a/tests/phpunit/includes/config/ConfigFactoryTest.php +++ b/tests/phpunit/includes/config/ConfigFactoryTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - class ConfigFactoryTest extends \MediaWikiIntegrationTestCase { /** @@ -161,7 +159,7 @@ class ConfigFactoryTest extends \MediaWikiIntegrationTestCase { public function testGetDefaultInstance() { // NOTE: the global config factory returned here has been overwritten // for operation in test mode. It may not reflect LocalSettings. - $factory = MediaWikiServices::getInstance()->getConfigFactory(); + $factory = $this->getServiceContainer()->getConfigFactory(); $this->assertInstanceOf( Config::class, $factory->makeConfig( 'main' ) ); } diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php index 0d719dc774cf..514f4b996892 100644 --- a/tests/phpunit/includes/content/ContentHandlerTest.php +++ b/tests/phpunit/includes/content/ContentHandlerTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Content\ValidationParams; -use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; use Wikimedia\TestingAccessWrapper; @@ -39,12 +38,12 @@ class ContentHandlerTest extends MediaWikiIntegrationTestCase { ] ); // Reset LinkCache - MediaWikiServices::getInstance()->resetServiceForTesting( 'LinkCache' ); + $this->getServiceContainer()->resetServiceForTesting( 'LinkCache' ); } protected function tearDown(): void { // Reset LinkCache - MediaWikiServices::getInstance()->resetServiceForTesting( 'LinkCache' ); + $this->getServiceContainer()->resetServiceForTesting( 'LinkCache' ); parent::tearDown(); } @@ -98,7 +97,7 @@ class ContentHandlerTest extends MediaWikiIntegrationTestCase { public function testGetForTitle( $title, $expectedContentModel ) { $this->hideDeprecated( 'ContentHandler::getForTitle' ); $title = Title::newFromText( $title ); - MediaWikiServices::getInstance()->getLinkCache()->addBadLinkObj( $title ); + $this->getServiceContainer()->getLinkCache()->addBadLinkObj( $title ); $handler = ContentHandler::getForTitle( $title ); $this->assertEquals( $expectedContentModel, $handler->getModelID() ); } @@ -152,9 +151,9 @@ class ContentHandlerTest extends MediaWikiIntegrationTestCase { */ public function testGetPageLanguage( $title, $expected ) { $title = Title::newFromText( $title ); - MediaWikiServices::getInstance()->getLinkCache()->addBadLinkObj( $title ); + $this->getServiceContainer()->getLinkCache()->addBadLinkObj( $title ); - $handler = MediaWikiServices::getInstance() + $handler = $this->getServiceContainer() ->getContentHandlerFactory() ->getContentHandler( $title->getContentModel() ); $lang = $handler->getPageLanguage( $title ); @@ -299,7 +298,7 @@ class ContentHandlerTest extends MediaWikiIntegrationTestCase { $expectedModelId, $shouldFail ) { $title = Title::newFromText( $title ); - MediaWikiServices::getInstance()->getLinkCache()->addBadLinkObj( $title ); + $this->getServiceContainer()->getLinkCache()->addBadLinkObj( $title ); try { $content = ContentHandler::makeContent( $data, $title, $modelId, $format ); @@ -656,7 +655,7 @@ class ContentHandlerTest extends MediaWikiIntegrationTestCase { */ public function testValidateSave( $content, $expectedResult ) { $page = new PageIdentityValue( 0, 1, 'Foo', PageIdentity::LOCAL ); - $contentHandlerFactory = MediaWikiServices::getInstance()->getContentHandlerFactory(); + $contentHandlerFactory = $this->getServiceContainer()->getContentHandlerFactory(); $contentHandler = $contentHandlerFactory->getContentHandler( $content->getModel() ); $validateParams = new ValidationParams( $page, 0 ); diff --git a/tests/phpunit/includes/content/JavaScriptContentTest.php b/tests/phpunit/includes/content/JavaScriptContentTest.php index 0801d56451f8..05f1f11f79f7 100644 --- a/tests/phpunit/includes/content/JavaScriptContentTest.php +++ b/tests/phpunit/includes/content/JavaScriptContentTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group ContentHandler * @group Database @@ -196,7 +194,7 @@ class JavaScriptContentTest extends TextContentTest { * @covers JavaScriptContent::matchMagicWord */ public function testMatchMagicWord() { - $mw = MediaWikiServices::getInstance()->getMagicWordFactory()->get( "staticredirect" ); + $mw = $this->getServiceContainer()->getMagicWordFactory()->get( "staticredirect" ); $content = $this->newContent( "#REDIRECT [[FOO]]\n__STATICREDIRECT__" ); $this->assertFalse( diff --git a/tests/phpunit/includes/content/RegistrationContentHandlerFactoryToMediaWikiServicesTest.php b/tests/phpunit/includes/content/RegistrationContentHandlerFactoryToMediaWikiServicesTest.php index fd261aa25c93..2290789965a0 100644 --- a/tests/phpunit/includes/content/RegistrationContentHandlerFactoryToMediaWikiServicesTest.php +++ b/tests/phpunit/includes/content/RegistrationContentHandlerFactoryToMediaWikiServicesTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group ContentHandlerFactory */ @@ -24,11 +22,11 @@ class RegistrationContentHandlerFactoryToMediaWikiServicesTest extends MediaWiki ], ] ); - MediaWikiServices::getInstance()->resetServiceForTesting( 'ContentHandlerFactory' ); + $this->getServiceContainer()->resetServiceForTesting( 'ContentHandlerFactory' ); } protected function tearDown(): void { - MediaWikiServices::getInstance()->resetServiceForTesting( 'ContentHandlerFactory' ); + $this->getServiceContainer()->resetServiceForTesting( 'ContentHandlerFactory' ); parent::tearDown(); } @@ -39,7 +37,7 @@ class RegistrationContentHandlerFactoryToMediaWikiServicesTest extends MediaWiki public function testCallFromService_get_ok(): void { $this->assertInstanceOf( \MediaWiki\Content\IContentHandlerFactory::class, - MediaWikiServices::getInstance()->getContentHandlerFactory() + $this->getServiceContainer()->getContentHandlerFactory() ); $this->assertSame( @@ -52,7 +50,7 @@ class RegistrationContentHandlerFactoryToMediaWikiServicesTest extends MediaWiki 'testing', 'testing-callbacks', ], - MediaWikiServices::getInstance()->getContentHandlerFactory()->getContentModels() + $this->getServiceContainer()->getContentHandlerFactory()->getContentModels() ); } @@ -61,8 +59,8 @@ class RegistrationContentHandlerFactoryToMediaWikiServicesTest extends MediaWiki */ public function testCallFromService_second_same(): void { $this->assertSame( - MediaWikiServices::getInstance()->getContentHandlerFactory(), - MediaWikiServices::getInstance()->getContentHandlerFactory() + $this->getServiceContainer()->getContentHandlerFactory(), + $this->getServiceContainer()->getContentHandlerFactory() ); } @@ -70,19 +68,19 @@ class RegistrationContentHandlerFactoryToMediaWikiServicesTest extends MediaWiki * @covers \MediaWiki\MediaWikiServices::getContentHandlerFactory */ public function testCallFromService_afterCustomDefine_same(): void { - $factory = MediaWikiServices::getInstance()->getContentHandlerFactory(); + $factory = $this->getServiceContainer()->getContentHandlerFactory(); $factory->defineContentHandler( 'model name', DummyContentHandlerForTesting::class ); $this->assertTrue( - MediaWikiServices::getInstance() + $this->getServiceContainer() ->getContentHandlerFactory() ->isDefinedModel( 'model name' ) ); $this->assertSame( $factory, - MediaWikiServices::getInstance()->getContentHandlerFactory() + $this->getServiceContainer()->getContentHandlerFactory() ); } } diff --git a/tests/phpunit/includes/content/Transform/ContentTransformerTest.php b/tests/phpunit/includes/content/Transform/ContentTransformerTest.php index 9b99236793fd..283b6d9f1d17 100644 --- a/tests/phpunit/includes/content/Transform/ContentTransformerTest.php +++ b/tests/phpunit/includes/content/Transform/ContentTransformerTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - class ContentTransformerTest extends MediaWikiIntegrationTestCase { public function preSaveTransformProvider() { @@ -19,7 +17,7 @@ class ContentTransformerTest extends MediaWikiIntegrationTestCase { * @dataProvider preSaveTransformProvider */ public function testPreSaveTransform( $content, $expectedContainText ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $title = Title::newFromText( 'Test' ); $user = new User(); $user->setName( "127.0.0.1" ); @@ -44,7 +42,7 @@ class ContentTransformerTest extends MediaWikiIntegrationTestCase { * @dataProvider preloadTransformProvider */ public function testPreloadTransform( $content, $expectedContainText ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $title = Title::newFromText( 'Test' ); $options = ParserOptions::newFromAnon(); diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/includes/content/WikitextContentHandlerTest.php index 36c19ca9efa4..515b2c80639b 100644 --- a/tests/phpunit/includes/content/WikitextContentHandlerTest.php +++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageReferenceValue; /** @@ -15,7 +14,7 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase { protected function setUp(): void { parent::setUp(); - $this->handler = MediaWikiServices::getInstance()->getContentHandlerFactory() + $this->handler = $this->getServiceContainer()->getContentHandlerFactory() ->getContentHandler( CONTENT_MODEL_WIKITEXT ); } @@ -26,9 +25,9 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase { * @covers WikitextContentHandler::makeRedirectContent */ public function testMakeRedirectContent( $title, $expected ) { - MediaWikiServices::getInstance()->getContentLanguage()->resetNamespaces(); + $this->getServiceContainer()->getContentLanguage()->resetNamespaces(); - MediaWikiServices::getInstance()->resetServiceForTesting( 'MagicWordFactory' ); + $this->getServiceContainer()->resetServiceForTesting( 'MagicWordFactory' ); if ( is_string( $title ) ) { $title = Title::newFromText( $title ); diff --git a/tests/phpunit/includes/content/WikitextContentTest.php b/tests/phpunit/includes/content/WikitextContentTest.php index de6dc0e43a44..d6e0becbd762 100644 --- a/tests/phpunit/includes/content/WikitextContentTest.php +++ b/tests/phpunit/includes/content/WikitextContentTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate; -use MediaWiki\MediaWikiServices; /** * @group ContentHandler @@ -228,7 +227,7 @@ just a test" * @covers WikitextContent::matchMagicWord */ public function testMatchMagicWord() { - $mw = MediaWikiServices::getInstance()->getMagicWordFactory()->get( "staticredirect" ); + $mw = $this->getServiceContainer()->getMagicWordFactory()->get( "staticredirect" ); $content = $this->newContent( "#REDIRECT [[FOO]]\n__STATICREDIRECT__" ); $this->assertTrue( $content->matchMagicWord( $mw ), "should have matched magic word" ); diff --git a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php index 78adfc2bf8b6..54563686bb00 100644 --- a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php +++ b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - class DeferredUpdatesTest extends MediaWikiIntegrationTestCase { /** @@ -210,7 +208,7 @@ class DeferredUpdatesTest extends MediaWikiIntegrationTestCase { ]; // clear anything - $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + $lbFactory = $this->getServiceContainer()->getDBLoadBalancerFactory(); $lbFactory->commitPrimaryChanges( __METHOD__ ); DeferredUpdates::addCallableUpdate( @@ -276,7 +274,7 @@ class DeferredUpdatesTest extends MediaWikiIntegrationTestCase { $x = false; $y = false; // clear anything - $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + $lbFactory = $this->getServiceContainer()->getDBLoadBalancerFactory(); $lbFactory->commitPrimaryChanges( __METHOD__ ); DeferredUpdates::addCallableUpdate( @@ -304,7 +302,7 @@ class DeferredUpdatesTest extends MediaWikiIntegrationTestCase { public function testRunUpdateTransactionScope() { $this->setMwGlobals( 'wgCommandLineMode', false ); - $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + $lbFactory = $this->getServiceContainer()->getDBLoadBalancerFactory(); $this->assertFalse( $lbFactory->hasTransactionRound(), 'Initial state' ); $ran = 0; @@ -325,7 +323,7 @@ class DeferredUpdatesTest extends MediaWikiIntegrationTestCase { public function testRunOuterScopeUpdate() { $this->setMwGlobals( 'wgCommandLineMode', false ); - $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + $lbFactory = $this->getServiceContainer()->getDBLoadBalancerFactory(); $this->assertFalse( $lbFactory->hasTransactionRound(), 'Initial state' ); $ran = 0; @@ -355,7 +353,7 @@ class DeferredUpdatesTest extends MediaWikiIntegrationTestCase { $calls[] = 2; }; - $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + $lbFactory = $this->getServiceContainer()->getDBLoadBalancerFactory(); $lbFactory->beginPrimaryChanges( __METHOD__ ); DeferredUpdates::addCallableUpdate( $callback1 ); @@ -385,7 +383,7 @@ class DeferredUpdatesTest extends MediaWikiIntegrationTestCase { * @covers DeferredUpdates::attemptUpdate */ public function testCallbackUpdateRounds() { - $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + $lbFactory = $this->getServiceContainer()->getDBLoadBalancerFactory(); $fname = __METHOD__; $called = false; diff --git a/tests/phpunit/includes/deferred/RefreshSecondaryDataUpdateTest.php b/tests/phpunit/includes/deferred/RefreshSecondaryDataUpdateTest.php index 13144860b79e..5f7ef66706b6 100644 --- a/tests/phpunit/includes/deferred/RefreshSecondaryDataUpdateTest.php +++ b/tests/phpunit/includes/deferred/RefreshSecondaryDataUpdateTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Storage\DerivedPageDataUpdater; use MediaWiki\Storage\MutableRevisionRecord; use Psr\Log\NullLogger; @@ -11,7 +10,7 @@ use Wikimedia\ScopedCallback; */ class RefreshSecondaryDataUpdateTest extends MediaWikiIntegrationTestCase { public function testSuccess() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $lbFactory = $services->getDBLoadBalancerFactory(); $queue = JobQueueGroup::singleton()->get( 'refreshLinksPrioritized' ); $user = $this->getTestUser()->getUser(); @@ -71,7 +70,7 @@ class RefreshSecondaryDataUpdateTest extends MediaWikiIntegrationTestCase { } public function testEnqueueOnFailure() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $lbFactory = $services->getDBLoadBalancerFactory(); $queue = JobQueueGroup::singleton()->get( 'refreshLinksPrioritized' ); $user = $this->getTestUser()->getUser(); @@ -167,7 +166,7 @@ class RefreshSecondaryDataUpdateTest extends MediaWikiIntegrationTestCase { * rollback shouldn't cause DeferredUpdates to fail to get a ticket. */ public function testT248003() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $lbFactory = $services->getDBLoadBalancerFactory(); $user = $this->getTestUser()->getUser(); diff --git a/tests/phpunit/includes/diff/TextSlotDiffRendererTest.php b/tests/phpunit/includes/diff/TextSlotDiffRendererTest.php index 917ac0a1cbe0..4c70622a715b 100644 --- a/tests/phpunit/includes/diff/TextSlotDiffRendererTest.php +++ b/tests/phpunit/includes/diff/TextSlotDiffRendererTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\Assert\ParameterTypeException; /** @@ -97,7 +96,7 @@ class TextSlotDiffRendererTest extends MediaWikiIntegrationTestCase { $slotDiffRenderer = new TextSlotDiffRenderer(); $slotDiffRenderer->setStatsdDataFactory( new NullStatsdDataFactory() ); $slotDiffRenderer->setLanguage( - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ) ); + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ) ); $slotDiffRenderer->setEngine( TextSlotDiffRenderer::ENGINE_PHP ); return $slotDiffRenderer; } diff --git a/tests/phpunit/includes/filebackend/FileBackendIntegrationTest.php b/tests/phpunit/includes/filebackend/FileBackendIntegrationTest.php index 7049a8ed377f..bed5bf902497 100644 --- a/tests/phpunit/includes/filebackend/FileBackendIntegrationTest.php +++ b/tests/phpunit/includes/filebackend/FileBackendIntegrationTest.php @@ -1548,7 +1548,7 @@ class FileBackendIntegrationTest extends MediaWikiIntegrationTestCase { $url = $this->backend->getFileHttpUrl( [ 'src' => $source ] ); if ( $url !== null ) { // supported - $data = MediaWikiServices::getInstance()->getHttpRequestFactory()-> + $data = $this->getServiceContainer()->getHttpRequestFactory()-> get( $url, [], __METHOD__ ); $this->assertEquals( $content, $data, "HTTP GET of URL has right contents ($backendName)." ); diff --git a/tests/phpunit/includes/filerepo/LocalRepoTest.php b/tests/phpunit/includes/filerepo/LocalRepoTest.php index d956e4067cb1..5b6a9e90772e 100644 --- a/tests/phpunit/includes/filerepo/LocalRepoTest.php +++ b/tests/phpunit/includes/filerepo/LocalRepoTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @coversDefaultClass LocalRepo * @group Database @@ -226,7 +224,7 @@ class LocalRepoTest extends MediaWikiIntegrationTestCase { $repo = $this->newRepo(); - $tmpFileFactory = MediaWikiServices::getInstance()->getTempFSFileFactory(); + $tmpFileFactory = $this->getServiceContainer()->getTempFSFileFactory(); foreach ( [ 'File1', 'File2', 'File3' ] as $name ) { $fsFile = $tmpFileFactory->newTempFSFile( '' ); file_put_contents( $fsFile->getPath(), "$name contents" ); @@ -316,7 +314,7 @@ class LocalRepoTest extends MediaWikiIntegrationTestCase { public function testGetInfo_displayNameCustomMsg() { $this->editPage( 'MediaWiki:Shared-repo-name-not-local', 'Name to display please' ); // Allow the message to take effect - MediaWikiServices::getInstance()->getMessageCache()->enable(); + $this->getServiceContainer()->getMessageCache()->enable(); $this->assertSame( 'Name to display please', $this->newRepo( [ 'name' => 'not-local' ] )->getInfo()['displayname'] ); diff --git a/tests/phpunit/includes/filerepo/RepoGroupTest.php b/tests/phpunit/includes/filerepo/RepoGroupTest.php index 7b31196c23ec..162f18ac8f2d 100644 --- a/tests/phpunit/includes/filerepo/RepoGroupTest.php +++ b/tests/phpunit/includes/filerepo/RepoGroupTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers RepoGroup */ @@ -9,12 +7,12 @@ class RepoGroupTest extends MediaWikiIntegrationTestCase { public function testHasForeignRepoNegative() { $this->setMwGlobals( 'wgForeignFileRepos', [] ); - $this->assertFalse( MediaWikiServices::getInstance()->getRepoGroup()->hasForeignRepos() ); + $this->assertFalse( $this->getServiceContainer()->getRepoGroup()->hasForeignRepos() ); } public function testHasForeignRepoPositive() { $this->setUpForeignRepo(); - $this->assertTrue( MediaWikiServices::getInstance()->getRepoGroup()->hasForeignRepos() ); + $this->assertTrue( $this->getServiceContainer()->getRepoGroup()->hasForeignRepos() ); } public function testForEachForeignRepo() { diff --git a/tests/phpunit/includes/filerepo/file/LocalFileTest.php b/tests/phpunit/includes/filerepo/file/LocalFileTest.php index b4453ffae49a..a05d6fb065ac 100644 --- a/tests/phpunit/includes/filerepo/file/LocalFileTest.php +++ b/tests/phpunit/includes/filerepo/file/LocalFileTest.php @@ -566,7 +566,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase { * or false if there will be no such item. */ public function testLoadFromDBAndCache( $meta, $blobs, $largeItemSize ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $cache = new HashBagOStuff; $this->setService( @@ -926,7 +926,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase { */ public function testReserializeMetadata( $input, $expected ) { $dbw = wfGetDB( DB_PRIMARY ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $norm = $services->getActorNormalization(); $user = $this->getTestSysop()->getUserIdentity(); $actorId = $norm->acquireActorId( $user, $dbw ); @@ -996,7 +996,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase { ] ) ] ); $dbw = wfGetDB( DB_PRIMARY ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $norm = $services->getActorNormalization(); $user = $this->getTestSysop()->getUserIdentity(); $actorId = $norm->acquireActorId( $user, $dbw ); diff --git a/tests/phpunit/includes/import/ImportExportTest.php b/tests/phpunit/includes/import/ImportExportTest.php index a52936e563d3..2abd38f70ebb 100644 --- a/tests/phpunit/includes/import/ImportExportTest.php +++ b/tests/phpunit/includes/import/ImportExportTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Tests\Maintenance\DumpAsserter; @@ -16,7 +15,7 @@ class ImportExportTest extends MediaWikiLangTestCase { public function setUp(): void { parent::setUp(); - $slotRoleRegistry = MediaWikiServices::getInstance()->getSlotRoleRegistry(); + $slotRoleRegistry = $this->getServiceContainer()->getSlotRoleRegistry(); if ( !$slotRoleRegistry->isDefinedRole( 'ImportExportTest' ) ) { $slotRoleRegistry->defineRoleWithModel( 'ImportExportTest', CONTENT_MODEL_WIKITEXT ); @@ -121,7 +120,7 @@ class ImportExportTest extends MediaWikiLangTestCase { * @return RevisionRecord[] */ private function getRevisions( Title $title ) { - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $qi = $store->getQueryInfo(); $conds = [ 'rev_page' => $title->getArticleID() ]; @@ -185,14 +184,14 @@ class ImportExportTest extends MediaWikiLangTestCase { $vars['site_name'] = $wgSitename; $vars['project_namespace'] = - MediaWikiServices::getInstance()->getTitleFormatter()->getNamespaceName( + $this->getServiceContainer()->getTitleFormatter()->getNamespaceName( NS_PROJECT, 'Dummy' ); $vars['site_db'] = $wgDBname; $vars['site_case'] = $wgCapitalLinks ? 'first-letter' : 'case-sensitive'; $vars['site_base'] = Title::newMainPage()->getCanonicalURL(); - $vars['site_language'] = MediaWikiServices::getInstance()->getContentLanguage()->getHtmlCode(); + $vars['site_language'] = $this->getServiceContainer()->getContentLanguage()->getHtmlCode(); return $vars; } diff --git a/tests/phpunit/includes/import/ImportFailureTest.php b/tests/phpunit/includes/import/ImportFailureTest.php index 963706a6376e..e9f1bc7e4394 100644 --- a/tests/phpunit/includes/import/ImportFailureTest.php +++ b/tests/phpunit/includes/import/ImportFailureTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * Import failure test. * @@ -13,7 +11,7 @@ class ImportFailureTest extends MediaWikiLangTestCase { public function setUp(): void { parent::setUp(); - $slotRoleRegistry = MediaWikiServices::getInstance()->getSlotRoleRegistry(); + $slotRoleRegistry = $this->getServiceContainer()->getSlotRoleRegistry(); if ( !$slotRoleRegistry->isDefinedRole( 'ImportFailureTest' ) ) { $slotRoleRegistry->defineRoleWithModel( 'ImportFailureTest', CONTENT_MODEL_WIKITEXT ); diff --git a/tests/phpunit/includes/import/ImportableOldRevisionImporterTest.php b/tests/phpunit/includes/import/ImportableOldRevisionImporterTest.php index 8fea5228f42f..b854af09deae 100644 --- a/tests/phpunit/includes/import/ImportableOldRevisionImporterTest.php +++ b/tests/phpunit/includes/import/ImportableOldRevisionImporterTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\SlotRecord; use Psr\Log\NullLogger; @@ -29,7 +28,7 @@ class ImportableOldRevisionImporterTest extends MediaWikiIntegrationTestCase { * @dataProvider provideTestCases */ public function testImport( $expectedTags ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $title = Title::newFromText( __CLASS__ . rand() ); $revision = new WikiRevision( $services->getMainConfig() ); diff --git a/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php b/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php index fcb78f1663a4..4d0bd048c331 100644 --- a/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php +++ b/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers MediaWiki\Interwiki\ClassicInterwikiLookup * @group Database @@ -38,10 +36,10 @@ class ClassicInterwikiLookupTest extends MediaWikiIntegrationTestCase { $this->populateDB( [ $dewiki, $zzwiki ] ); $lookup = new \MediaWiki\Interwiki\ClassicInterwikiLookup( - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ), + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ), WANObjectCache::newEmpty(), - MediaWikiServices::getInstance()->getHookContainer(), - MediaWikiServices::getInstance()->getDBLoadBalancer(), + $this->getServiceContainer()->getHookContainer(), + $this->getServiceContainer()->getDBLoadBalancer(), 60 * 60, false, 3, @@ -154,10 +152,10 @@ class ClassicInterwikiLookupTest extends MediaWikiIntegrationTestCase { [ $zzwiki ] ); $lookup = new \MediaWiki\Interwiki\ClassicInterwikiLookup( - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ), + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ), WANObjectCache::newEmpty(), - MediaWikiServices::getInstance()->getHookContainer(), - MediaWikiServices::getInstance()->getDBLoadBalancer(), + $this->getServiceContainer()->getHookContainer(), + $this->getServiceContainer()->getDBLoadBalancer(), 60 * 60, $cdbFile, 3, @@ -207,10 +205,10 @@ class ClassicInterwikiLookupTest extends MediaWikiIntegrationTestCase { [ $zzwiki ] ); $lookup = new \MediaWiki\Interwiki\ClassicInterwikiLookup( - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ), + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ), WANObjectCache::newEmpty(), - MediaWikiServices::getInstance()->getHookContainer(), - MediaWikiServices::getInstance()->getDBLoadBalancer(), + $this->getServiceContainer()->getHookContainer(), + $this->getServiceContainer()->getDBLoadBalancer(), 60 * 60, $hash, 3, @@ -262,10 +260,10 @@ class ClassicInterwikiLookupTest extends MediaWikiIntegrationTestCase { [ $zz, $de, $azz ] ); $lookup = new \MediaWiki\Interwiki\ClassicInterwikiLookup( - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ), + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ), WANObjectCache::newEmpty(), - MediaWikiServices::getInstance()->getHookContainer(), - MediaWikiServices::getInstance()->getDBLoadBalancer(), + $this->getServiceContainer()->getHookContainer(), + $this->getServiceContainer()->getDBLoadBalancer(), 60 * 60, $hash, 3, diff --git a/tests/phpunit/includes/interwiki/InterwikiTest.php b/tests/phpunit/includes/interwiki/InterwikiTest.php index bebd4fe5dc25..518dc074f712 100644 --- a/tests/phpunit/includes/interwiki/InterwikiTest.php +++ b/tests/phpunit/includes/interwiki/InterwikiTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers Interwiki * @group Database @@ -49,7 +47,7 @@ class InterwikiTest extends MediaWikiIntegrationTestCase { } private function setWgInterwikiCache( $interwikiCache ) { - MediaWikiServices::getInstance()->resetServiceForTesting( 'InterwikiLookup' ); + $this->getServiceContainer()->resetServiceForTesting( 'InterwikiLookup' ); $this->setMwGlobals( 'wgInterwikiCache', $interwikiCache ); } @@ -78,7 +76,7 @@ class InterwikiTest extends MediaWikiIntegrationTestCase { $this->setWgInterwikiCache( false ); - $interwikiLookup = MediaWikiServices::getInstance()->getInterwikiLookup(); + $interwikiLookup = $this->getServiceContainer()->getInterwikiLookup(); $this->assertEquals( [ $dewiki, $zzwiki ], $interwikiLookup->getAllPrefixes(), diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php index 83bdb7ffb138..7bd0c888167e 100644 --- a/tests/phpunit/includes/jobqueue/JobQueueTest.php +++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php @@ -17,7 +17,7 @@ class JobQueueTest extends MediaWikiIntegrationTestCase { $this->tablesUsed[] = 'job'; - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); if ( $this->getCliArg( 'use-jobqueue' ) ) { $name = $this->getCliArg( 'use-jobqueue' ); if ( !isset( $wgJobTypeConf[$name] ) ) { diff --git a/tests/phpunit/includes/jobqueue/JobRunnerTest.php b/tests/phpunit/includes/jobqueue/JobRunnerTest.php index dff08545a8f3..77795835cc71 100644 --- a/tests/phpunit/includes/jobqueue/JobRunnerTest.php +++ b/tests/phpunit/includes/jobqueue/JobRunnerTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Page\DeletePage; /** @@ -34,7 +33,7 @@ class JobRunnerTest extends MediaWikiIntegrationTestCase { $this->assertTrue( $this->page->exists(), 'The created page exists' ); - $this->jobRunner = MediaWikiServices::getInstance()->getJobRunner(); + $this->jobRunner = $this->getServiceContainer()->getJobRunner(); $jobParams = [ 'namespace' => $this->page->getNamespace(), 'title' => $this->page->getDBkey(), diff --git a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php index 70372da559ca..9c76ff61b51c 100644 --- a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php +++ b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers ClearUserWatchlistJob * @@ -24,7 +22,7 @@ class ClearUserWatchlistJobTest extends MediaWikiIntegrationTestCase { } private function getWatchedItemStore() { - return MediaWikiServices::getInstance()->getWatchedItemStore(); + return $this->getServiceContainer()->getWatchedItemStore(); } public function testRun() { diff --git a/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php b/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php index c39df900e280..ae70f2a55700 100644 --- a/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php +++ b/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers RefreshLinksJob * @@ -49,7 +47,7 @@ class RefreshLinksJobTest extends MediaWikiIntegrationTestCase { // TODO: test partition public function testRunForSinglePage() { - MediaWikiServices::getInstance()->getSlotRoleRegistry()->defineRoleWithModel( + $this->getServiceContainer()->getSlotRoleRegistry()->defineRoleWithModel( 'aux', CONTENT_MODEL_WIKITEXT ); @@ -59,7 +57,7 @@ class RefreshLinksJobTest extends MediaWikiIntegrationTestCase { $page = $this->createPage( __METHOD__, [ 'main' => $mainContent, 'aux' => $auxContent ] ); // clear state - $parserCache = MediaWikiServices::getInstance()->getParserCache(); + $parserCache = $this->getServiceContainer()->getParserCache(); $parserCache->deleteOptionsKey( $page ); $this->db->delete( 'pagelinks', '*', __METHOD__ ); @@ -84,7 +82,7 @@ class RefreshLinksJobTest extends MediaWikiIntegrationTestCase { } public function testRunForMultiPage() { - MediaWikiServices::getInstance()->getSlotRoleRegistry()->defineRoleWithModel( + $this->getServiceContainer()->getSlotRoleRegistry()->defineRoleWithModel( 'aux', CONTENT_MODEL_WIKITEXT ); @@ -100,7 +98,7 @@ class RefreshLinksJobTest extends MediaWikiIntegrationTestCase { $page2 = $this->createPage( "$fname-2", [ 'main' => $mainContent, 'aux' => $auxContent ] ); // clear state - $parserCache = MediaWikiServices::getInstance()->getParserCache(); + $parserCache = $this->getServiceContainer()->getParserCache(); $parserCache->deleteOptionsKey( $page1 ); $parserCache->deleteOptionsKey( $page2 ); diff --git a/tests/phpunit/includes/jobqueue/jobs/UserEditCountInitJobTest.php b/tests/phpunit/includes/jobqueue/jobs/UserEditCountInitJobTest.php index f81227804d6b..32888bd72521 100644 --- a/tests/phpunit/includes/jobqueue/jobs/UserEditCountInitJobTest.php +++ b/tests/phpunit/includes/jobqueue/jobs/UserEditCountInitJobTest.php @@ -1,5 +1,4 @@ <?php -use MediaWiki\MediaWikiServices; /** * @group JobQueue @@ -22,7 +21,7 @@ class UserEditCountInitJobTest extends MediaWikiIntegrationTestCase { $user = $this->getMutableTestUser()->getUser(); if ( $startingEditCount !== false ) { - MediaWikiServices::getInstance()->getDbLoadBalancer() + $this->getServiceContainer()->getDbLoadBalancer() ->getConnectionRef( DB_PRIMARY ) ->update( 'user', diff --git a/tests/phpunit/includes/language/LanguageFallbackIntegrationTest.php b/tests/phpunit/includes/language/LanguageFallbackIntegrationTest.php index 9ed77adb2693..b5f69b217f2a 100644 --- a/tests/phpunit/includes/language/LanguageFallbackIntegrationTest.php +++ b/tests/phpunit/includes/language/LanguageFallbackIntegrationTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Languages\LanguageFallback; -use MediaWiki\MediaWikiServices; /** * @coversDefaultClass MediaWiki\Languages\LanguageFallback @@ -18,7 +17,7 @@ class LanguageFallbackIntegrationTest extends MediaWikiIntegrationTestCase { $this->setService( 'LocalisationCache', $this->getMockLocalisationCache( 1, $options['fallbackMap'] ) ); } - return MediaWikiServices::getInstance()->getLanguageFallback(); + return $this->getServiceContainer()->getLanguageFallback(); } private function getMessagesKey() { diff --git a/tests/phpunit/includes/languages/LanguageSrTest.php b/tests/phpunit/includes/languages/LanguageSrTest.php index aa47feb5d0a5..1f8fe779e32e 100644 --- a/tests/phpunit/includes/languages/LanguageSrTest.php +++ b/tests/phpunit/includes/languages/LanguageSrTest.php @@ -5,8 +5,6 @@ * @file */ -use MediaWiki\MediaWikiServices; - /** * Tests for Serbian * @@ -36,7 +34,7 @@ class LanguageSrTest extends LanguageClassesTestCase { * @covers Language::hasVariant */ public function testHasVariant() { - $langFactory = MediaWikiServices::getInstance()->getLanguageFactory(); + $langFactory = $this->getServiceContainer()->getLanguageFactory(); $langs = [ 'sr' => $this->getLang(), 'sr-ec' => $langFactory->getLanguage( 'sr-ec' ), @@ -62,7 +60,7 @@ class LanguageSrTest extends LanguageClassesTestCase { * @covers Language::hasVariant */ public function testHasVariantBogus() { - $langFactory = MediaWikiServices::getInstance()->getLanguageFactory(); + $langFactory = $this->getServiceContainer()->getLanguageFactory(); $langs = [ // Note that case matters when calling getLanguage(); these are all bogus language codes 'sr-EC' => $langFactory->getLanguage( 'sr-EC' ), diff --git a/tests/phpunit/includes/libs/filebackend/fsfile/TempFSFileIntegrationTest.php b/tests/phpunit/includes/libs/filebackend/fsfile/TempFSFileIntegrationTest.php index fbb05bf38b49..3e1503074d03 100644 --- a/tests/phpunit/includes/libs/filebackend/fsfile/TempFSFileIntegrationTest.php +++ b/tests/phpunit/includes/libs/filebackend/fsfile/TempFSFileIntegrationTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\TestingAccessWrapper; /** @@ -14,7 +13,7 @@ class TempFSFileIntegrationTest extends MediaWikiIntegrationTestCase { */ public function testServiceWiring() { $this->setMwGlobals( 'wgTmpDirectory', '/hopefully invalid' ); - $factory = MediaWikiServices::getInstance()->getTempFSFileFactory(); + $factory = $this->getServiceContainer()->getTempFSFileFactory(); $this->assertSame( '/hopefully invalid', ( TestingAccessWrapper::newFromObject( $factory ) )->tmpDirectory ); } diff --git a/tests/phpunit/includes/linker/LinkRendererTest.php b/tests/phpunit/includes/linker/LinkRendererTest.php index 9eb19a169609..fcadb8041d4d 100644 --- a/tests/phpunit/includes/linker/LinkRendererTest.php +++ b/tests/phpunit/includes/linker/LinkRendererTest.php @@ -3,7 +3,6 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Linker\LinkRendererFactory; -use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageReference; use MediaWiki\Page\PageReferenceValue; @@ -27,7 +26,7 @@ class LinkRendererTest extends MediaWikiLangTestCase { 'wgScriptPath' => '/w', 'wgScript' => '/w/index.php', ] ); - $this->factory = MediaWikiServices::getInstance()->getLinkRendererFactory(); + $this->factory = $this->getServiceContainer()->getLinkRendererFactory(); } public function provideMergeAttribs() { @@ -203,7 +202,7 @@ class LinkRendererTest extends MediaWikiLangTestCase { * @covers \MediaWiki\Linker\LinkRenderer::getLinkClasses */ public function testGetLinkClasses( $foobarTitle, $redirectTitle, $userTitle ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $titleFormatter = $services->getTitleFormatter(); $specialPageFactory = $services->getSpecialPageFactory(); $hookContainer = $services->getHookContainer(); diff --git a/tests/phpunit/includes/logging/DatabaseLogEntryTest.php b/tests/phpunit/includes/logging/DatabaseLogEntryTest.php index 63c1d36bb7c8..82311fd05bb9 100644 --- a/tests/phpunit/includes/logging/DatabaseLogEntryTest.php +++ b/tests/phpunit/includes/logging/DatabaseLogEntryTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\User\ActorStore; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; @@ -11,13 +10,13 @@ class DatabaseLogEntryTest extends MediaWikiIntegrationTestCase { parent::setUp(); // These services cache their joins - MediaWikiServices::getInstance()->resetServiceForTesting( 'CommentStore' ); - MediaWikiServices::getInstance()->resetServiceForTesting( 'ActorMigration' ); + $this->getServiceContainer()->resetServiceForTesting( 'CommentStore' ); + $this->getServiceContainer()->resetServiceForTesting( 'ActorMigration' ); } protected function tearDown(): void { - MediaWikiServices::getInstance()->resetServiceForTesting( 'CommentStore' ); - MediaWikiServices::getInstance()->resetServiceForTesting( 'ActorMigration' ); + $this->getServiceContainer()->resetServiceForTesting( 'CommentStore' ); + $this->getServiceContainer()->resetServiceForTesting( 'ActorMigration' ); parent::tearDown(); } diff --git a/tests/phpunit/includes/mail/EmailNotificationTest.php b/tests/phpunit/includes/mail/EmailNotificationTest.php index bb00b9e6594d..70c9617693d2 100644 --- a/tests/phpunit/includes/mail/EmailNotificationTest.php +++ b/tests/phpunit/includes/mail/EmailNotificationTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - class EmailNotificationTest extends MediaWikiIntegrationTestCase { protected $emailNotification; @@ -25,7 +23,7 @@ class EmailNotificationTest extends MediaWikiIntegrationTestCase { * @covers EmailNotification::notifyOnPageChange */ public function testNotifyOnPageChange(): void { - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); // both Alice and Bob watch 'Foobar' $title = Title::newFromText( 'Foobar' ); diff --git a/tests/phpunit/includes/media/WebPHandlerTest.php b/tests/phpunit/includes/media/WebPHandlerTest.php index 885f500a1fb1..dd773e422a8a 100644 --- a/tests/phpunit/includes/media/WebPHandlerTest.php +++ b/tests/phpunit/includes/media/WebPHandlerTest.php @@ -181,7 +181,7 @@ class WebPHandlerTest extends MediaWikiIntegrationTestCase { * @dataProvider provideTestGetMimeType */ public function testGuessMimeType( $path ) { - $mime = MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer(); + $mime = $this->getServiceContainer()->getMimeAnalyzer(); $this->assertEquals( 'image/webp', $mime->guessMimeType( $path, false ) ); } diff --git a/tests/phpunit/includes/page/ArticleViewTest.php b/tests/phpunit/includes/page/ArticleViewTest.php index ab2096ada3eb..ea6a6ef8b23d 100644 --- a/tests/phpunit/includes/page/ArticleViewTest.php +++ b/tests/phpunit/includes/page/ArticleViewTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; @@ -128,7 +127,7 @@ class ArticleViewTest extends MediaWikiIntegrationTestCase { $article = new Article( $page->getTitle(), 0 ); $article->getContext()->getOutput()->setTitle( $page->getTitle() ); - $cache = MediaWikiServices::getInstance()->getParserCache(); + $cache = $this->getServiceContainer()->getParserCache(); $cache->save( $po, $page, $article->getParserOptions() ); $article->view(); @@ -604,7 +603,7 @@ class ArticleViewTest extends MediaWikiIntegrationTestCase { } private function getRevDelRevisionList( $title, $revisionId ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new RevDelRevisionList( RequestContext::getMain(), $title, diff --git a/tests/phpunit/includes/page/UndeletePageTest.php b/tests/phpunit/includes/page/UndeletePageTest.php index 0df1821133e0..f0b8905ea8de 100644 --- a/tests/phpunit/includes/page/UndeletePageTest.php +++ b/tests/phpunit/includes/page/UndeletePageTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Storage\SlotRecord; @@ -122,7 +121,7 @@ class UndeletePageTest extends MediaWikiIntegrationTestCase { $this->assertFalse( $row ); // Restore the page - $undeletePage = MediaWikiServices::getInstance()->getUndeletePageFactory()->newUndeletePage( + $undeletePage = $this->getServiceContainer()->getUndeletePageFactory()->newUndeletePage( $this->page, $this->getTestSysop()->getUser() ); diff --git a/tests/phpunit/includes/page/WikiPageDbTest.php b/tests/phpunit/includes/page/WikiPageDbTest.php index e471f22da8c4..46dbeb1b89a8 100644 --- a/tests/phpunit/includes/page/WikiPageDbTest.php +++ b/tests/phpunit/includes/page/WikiPageDbTest.php @@ -3,7 +3,6 @@ use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate; use MediaWiki\Edit\PreparedEdit; -use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Permissions\Authority; @@ -606,7 +605,7 @@ class WikiPageDbTest extends MediaWikiLangTestCase { // Test deletion logging $logId = $status->getValue(); - $commentQuery = MediaWikiServices::getInstance()->getCommentStore()->getJoin( 'log_comment' ); + $commentQuery = $this->getServiceContainer()->getCommentStore()->getJoin( 'log_comment' ); $this->assertSelect( [ 'logging' ] + $commentQuery['tables'], /* table */ [ @@ -652,7 +651,7 @@ class WikiPageDbTest extends MediaWikiLangTestCase { // Test suppression logging $logId = $status->getValue(); - $commentQuery = MediaWikiServices::getInstance()->getCommentStore()->getJoin( 'log_comment' ); + $commentQuery = $this->getServiceContainer()->getCommentStore()->getJoin( 'log_comment' ); $this->assertSelect( [ 'logging' ] + $commentQuery['tables'], /* table */ [ @@ -676,12 +675,12 @@ class WikiPageDbTest extends MediaWikiLangTestCase { $commentQuery['joins'] ); - $archive = new PageArchive( $page->getTitle(), MediaWikiServices::getInstance()->getMainConfig() ); + $archive = new PageArchive( $page->getTitle(), $this->getServiceContainer()->getMainConfig() ); $archivedRevs = $archive->listRevisions(); if ( !$archivedRevs || $archivedRevs->numRows() !== 1 ) { $this->fail( 'Unexpected number of archived revisions' ); } - $archivedRev = MediaWikiServices::getInstance()->getRevisionStore() + $archivedRev = $this->getServiceContainer()->getRevisionStore() ->newRevisionFromArchiveRow( $archivedRevs->current() ); $this->assertNull( @@ -1909,7 +1908,7 @@ more stuff // Make sure the log entry looks good // log_params is not checked here - $commentQuery = MediaWikiServices::getInstance()->getCommentStore()->getJoin( 'log_comment' ); + $commentQuery = $this->getServiceContainer()->getCommentStore()->getJoin( 'log_comment' ); $this->assertSelect( [ 'logging' ] + $commentQuery['tables'], [ @@ -2224,7 +2223,7 @@ more stuff $this->assertFalse( $title->isRedirect() ); $dbw = wfGetDB( DB_PRIMARY ); - $store = MediaWikiServices::getInstance()->getRevisionStore(); + $store = $this->getServiceContainer()->getRevisionStore(); $page = $this->newPage( $title ); $page->insertOn( $dbw ); diff --git a/tests/phpunit/includes/parser/CoreParserFunctionsTest.php b/tests/phpunit/includes/parser/CoreParserFunctionsTest.php index 60305b2c5ead..5fd21eaa9496 100644 --- a/tests/phpunit/includes/parser/CoreParserFunctionsTest.php +++ b/tests/phpunit/includes/parser/CoreParserFunctionsTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group Database * @covers CoreParserFunctions @@ -44,7 +42,7 @@ class CoreParserFunctionsTest extends MediaWikiLangTestCase { * @dataProvider provideTalkpagename */ public function testTalkpagename( $expected, $title ) { - $parser = MediaWikiServices::getInstance()->getParser(); + $parser = $this->getServiceContainer()->getParser(); $this->assertSame( $expected, CoreParserFunctions::talkpagename( $parser, $title ) ); } @@ -70,7 +68,7 @@ class CoreParserFunctionsTest extends MediaWikiLangTestCase { * @dataProvider provideSubjectpagename */ public function testSubjectpagename( $expected, $title ) { - $parser = MediaWikiServices::getInstance()->getParser(); + $parser = $this->getServiceContainer()->getParser(); $this->assertSame( $expected, CoreParserFunctions::subjectpagename( $parser, $title ) ); } diff --git a/tests/phpunit/includes/parser/MagicVariableTest.php b/tests/phpunit/includes/parser/MagicVariableTest.php index 62ccd2f5016e..cd91e5ac618f 100644 --- a/tests/phpunit/includes/parser/MagicVariableTest.php +++ b/tests/phpunit/includes/parser/MagicVariableTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * This file is intended to test magic variables in the parser * It was inspired by Raymond & Matěj Grabovský commenting about r66200 @@ -30,7 +28,7 @@ class MagicVariableTest extends MediaWikiIntegrationTestCase { protected function setUp(): void { parent::setUp(); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $contLang = $services->getLanguageFactory()->getLanguage( 'en' ); $this->setContentLang( $contLang ); diff --git a/tests/phpunit/includes/parser/ParserMethodsTest.php b/tests/phpunit/includes/parser/ParserMethodsTest.php index 17e65b951630..0a8971eba327 100644 --- a/tests/phpunit/includes/parser/ParserMethodsTest.php +++ b/tests/phpunit/includes/parser/ParserMethodsTest.php @@ -33,7 +33,7 @@ class ParserMethodsTest extends MediaWikiLangTestCase { $user = new User(); $user->setName( "127.0.0.1" ); $popts = ParserOptions::newFromUser( $user ); - $text = MediaWikiServices::getInstance()->getParser() + $text = $this->getServiceContainer()->getParser() ->preSaveTransform( $text, $title, $user, $popts ); $this->assertEquals( $expected, $text ); @@ -76,7 +76,7 @@ class ParserMethodsTest extends MediaWikiLangTestCase { public function testRecursiveParse() { $title = Title::newFromText( 'foo' ); - $parser = MediaWikiServices::getInstance()->getParser(); + $parser = $this->getServiceContainer()->getParser(); $po = ParserOptions::newFromAnon(); $parser->setHook( 'recursivecallparser', [ $this, 'helperParserFunc' ] ); $this->expectException( MWException::class ); @@ -96,7 +96,7 @@ class ParserMethodsTest extends MediaWikiLangTestCase { public function testCallParserFunction() { // Normal parses test passing PPNodes. Test passing an array. $title = Title::newFromText( str_replace( '::', '__', __METHOD__ ) ); - $parser = MediaWikiServices::getInstance()->getParser(); + $parser = $this->getServiceContainer()->getParser(); $parser->startExternalParse( $title, ParserOptions::newFromAnon(), @@ -119,7 +119,7 @@ class ParserMethodsTest extends MediaWikiLangTestCase { */ public function testGetSections() { $title = Title::newFromText( str_replace( '::', '__', __METHOD__ ) ); - $out = MediaWikiServices::getInstance()->getParser()->parse( + $out = $this->getServiceContainer()->getParser()->parse( "==foo==\n<h2>bar</h2>\n==baz==\n", $title, ParserOptions::newFromAnon() @@ -203,7 +203,7 @@ class ParserMethodsTest extends MediaWikiLangTestCase { public function testWrapOutput() { $title = Title::newFromText( 'foo' ); $po = ParserOptions::newFromAnon(); - $parser = MediaWikiServices::getInstance()->getParser(); + $parser = $this->getServiceContainer()->getParser(); $parser->parse( 'Hello World', $title, $po ); $text = $parser->getOutput()->getText(); @@ -320,7 +320,7 @@ class ParserMethodsTest extends MediaWikiLangTestCase { $expectedInPst = null ) { $title = $this->makeMockTitle( 'ParserRevisionAccessTest', [ - 'language' => MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ) + 'language' => $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ) ] ); $oldRevision = new MutableRevisionRecord( $title ); @@ -356,7 +356,7 @@ class ParserMethodsTest extends MediaWikiLangTestCase { $this->setService( 'RevisionStore', $revisionStore ); - $parser = MediaWikiServices::getInstance()->getParser(); + $parser = $this->getServiceContainer()->getParser(); $parser->parse( $text, $title, $po, true, true, $revId ); $html = $parser->getOutput()->getText(); @@ -378,7 +378,7 @@ class ParserMethodsTest extends MediaWikiLangTestCase { /** @dataProvider provideGuessSectionNameFromWikiText */ public function testGuessSectionNameFromWikiText( $input, $mode, $expected ) { $this->setMwGlobals( [ 'wgFragmentMode' => [ $mode ] ] ); - $result = MediaWikiServices::getInstance()->getParser() + $result = $this->getServiceContainer()->getParser() ->guessSectionNameFromWikiText( $input ); $this->assertEquals( $result, $expected ); } diff --git a/tests/phpunit/includes/parser/ParserOptionsTest.php b/tests/phpunit/includes/parser/ParserOptionsTest.php index 332f1403ab73..5b95e10e57be 100644 --- a/tests/phpunit/includes/parser/ParserOptionsTest.php +++ b/tests/phpunit/includes/parser/ParserOptionsTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\User\UserIdentityValue; use Wikimedia\ScopedCallback; @@ -28,8 +27,8 @@ class ParserOptionsTest extends MediaWikiLangTestCase { public function testNewCanonical() { $user = $this->getMutableTestUser()->getUser(); - $userLang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'fr' ); - $contLang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'qqx' ); + $userLang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'fr' ); + $contLang = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'qqx' ); $this->setContentLang( $contLang ); $this->setMwGlobals( [ diff --git a/tests/phpunit/includes/parser/ParserPreloadTest.php b/tests/phpunit/includes/parser/ParserPreloadTest.php index 03f2c071bb3d..4968fdb6ed01 100644 --- a/tests/phpunit/includes/parser/ParserPreloadTest.php +++ b/tests/phpunit/includes/parser/ParserPreloadTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * Basic tests for Parser::getPreloadText * @author Antoine Musso @@ -37,10 +35,10 @@ class ParserPreloadTest extends MediaWikiIntegrationTestCase { protected function setUp(): void { parent::setUp(); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $this->testParserOptions = ParserOptions::newFromUserAndLang( new User, - MediaWikiServices::getInstance()->getContentLanguage() ); + $this->getServiceContainer()->getContentLanguage() ); $this->testParser = $services->getParserFactory()->create(); $this->testParser->setOptions( $this->testParserOptions ); diff --git a/tests/phpunit/includes/parser/PreprocessorTest.php b/tests/phpunit/includes/parser/PreprocessorTest.php index a46f65bdbd64..6490ff5525df 100644 --- a/tests/phpunit/includes/parser/PreprocessorTest.php +++ b/tests/phpunit/includes/parser/PreprocessorTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers Preprocessor * @@ -28,7 +26,7 @@ class PreprocessorTest extends MediaWikiIntegrationTestCase { protected function setUp(): void { parent::setUp(); $this->mOptions = ParserOptions::newFromUserAndLang( new User, - MediaWikiServices::getInstance()->getContentLanguage() ); + $this->getServiceContainer()->getContentLanguage() ); $wanCache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] ); $parser = $this->getMockBuilder( Parser::class ) diff --git a/tests/phpunit/includes/parser/TagHooksTest.php b/tests/phpunit/includes/parser/TagHooksTest.php index 39c913d99084..4e9cd7f928e5 100644 --- a/tests/phpunit/includes/parser/TagHooksTest.php +++ b/tests/phpunit/includes/parser/TagHooksTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group Database * @group Parser @@ -39,7 +37,7 @@ class TagHooksTest extends MediaWikiIntegrationTestCase { private function getParserOptions() { $popt = ParserOptions::newFromUserAndLang( new User, - MediaWikiServices::getInstance()->getContentLanguage() ); + $this->getServiceContainer()->getContentLanguage() ); return $popt; } @@ -47,7 +45,7 @@ class TagHooksTest extends MediaWikiIntegrationTestCase { * @dataProvider provideValidNames */ public function testTagHooks( $tag ) { - $parser = MediaWikiServices::getInstance()->getParserFactory()->create(); + $parser = $this->getServiceContainer()->getParserFactory()->create(); $parser->setHook( $tag, [ $this, 'tagCallback' ] ); $parserOutput = $parser->parse( @@ -62,7 +60,7 @@ class TagHooksTest extends MediaWikiIntegrationTestCase { * @dataProvider provideBadNames */ public function testBadTagHooks( $tag ) { - $parser = MediaWikiServices::getInstance()->getParserFactory()->create(); + $parser = $this->getServiceContainer()->getParserFactory()->create(); $this->expectException( MWException::class ); $parser->setHook( $tag, [ $this, 'tagCallback' ] ); diff --git a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php index 07d6ec8981a0..5521a6d35b45 100644 --- a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php +++ b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Logger\Spi as LoggerSpi; -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; @@ -89,7 +88,7 @@ class PoolWorkArticleViewTest extends MediaWikiIntegrationTestCase { $work = $this->newPoolWorkArticleView( $page, $rev1, $options ); $work->execute(); - $cache = MediaWikiServices::getInstance()->getParserCache(); + $cache = $this->getServiceContainer()->getParserCache(); $out = $cache->get( $page, $options ); $this->assertNotNull( $out ); diff --git a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php index e4a4e3a441f3..164542eeec02 100644 --- a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php +++ b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php @@ -57,7 +57,7 @@ class DefaultPreferencesFactoryTest extends \MediaWikiIntegrationTestCase { $this->context = new RequestContext(); $this->context->setTitle( Title::newFromText( self::class ) ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $this->setMwGlobals( 'wgParser', $services->getParserFactory()->create() ); $this->setMwGlobals( 'wgDisableLangConversion', false ); @@ -127,7 +127,7 @@ class DefaultPreferencesFactoryTest extends \MediaWikiIntegrationTestCase { // DummyServicesTrait::getDummyNamespaceInfo $nsInfo = $this->getDummyNamespaceInfo(); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); // The PermissionManager should not be used for anything, its only a parameter // until we figure out how to remove it without breaking the GlobalPreferences diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php index b2d24b265341..89f2eb25056b 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\TestingAccessWrapper; class ResourceLoaderTest extends ResourceLoaderTestCase { @@ -28,7 +27,7 @@ class ResourceLoaderTest extends ResourceLoaderTestCase { ] ] ); - MediaWikiServices::getInstance()->getResourceLoader(); + $this->getServiceContainer()->getResourceLoader(); $this->assertSame( 1, $ranHook, 'Hook was called' ); } @@ -269,7 +268,7 @@ class ResourceLoaderTest extends ResourceLoaderTestCase { $this->setMwGlobals( $config ); $reset = ExtensionRegistry::getInstance()->setAttributeForTest( 'SkinLessImportPaths', $importPaths ); // Reset Skin::getSkinNames for ResourceLoaderContext - MediaWiki\MediaWikiServices::getInstance()->resetServiceForTesting( 'SkinFactory' ); + $this->getServiceContainer()->resetServiceForTesting( 'SkinFactory' ); $context = $this->getResourceLoaderContext( [ 'skin' => $skin ] ); $module = new ResourceLoaderFileModule( [ @@ -959,7 +958,7 @@ END public function testMakeModuleResponseStartupError() { // This is an integration test that uses a lot of MediaWiki state, // provide the full Config object here. - $rl = new EmptyResourceLoader( MediaWikiServices::getInstance()->getMainConfig() ); + $rl = new EmptyResourceLoader( $this->getServiceContainer()->getMainConfig() ); $rl->register( [ 'foo' => [ 'factory' => function () { return $this->getSimpleModuleMock( 'foo();' ); diff --git a/tests/phpunit/includes/search/SearchEnginePrefixTest.php b/tests/phpunit/includes/search/SearchEnginePrefixTest.php index 806039e7434c..141141f0e881 100644 --- a/tests/phpunit/includes/search/SearchEnginePrefixTest.php +++ b/tests/phpunit/includes/search/SearchEnginePrefixTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group Search * @group Database @@ -60,7 +58,7 @@ class SearchEnginePrefixTest extends MediaWikiLangTestCase { 'wgHooks' => [], ] ); - $this->search = MediaWikiServices::getInstance()->newSearchEngine(); + $this->search = $this->getServiceContainer()->newSearchEngine(); $this->search->setNamespaces( [] ); } diff --git a/tests/phpunit/includes/search/SearchEngineTest.php b/tests/phpunit/includes/search/SearchEngineTest.php index 60aa897ca80c..2fe410ceda06 100644 --- a/tests/phpunit/includes/search/SearchEngineTest.php +++ b/tests/phpunit/includes/search/SearchEngineTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\LoadBalancerSingle; /** @@ -44,7 +43,7 @@ class SearchEngineTest extends MediaWikiLangTestCase { $lb = LoadBalancerSingle::newFromConnection( $this->db ); $this->search = new $searchType( $lb ); - $this->search->setHookContainer( MediaWikiServices::getInstance()->getHookContainer() ); + $this->search->setHookContainer( $this->getServiceContainer()->getHookContainer() ); } protected function tearDown(): void { @@ -316,7 +315,7 @@ class SearchEngineTest extends MediaWikiLangTestCase { $mockFieldBuilder( "testField", SearchIndexField::INDEX_TYPE_TEXT ); return true; } ); - $mockEngine->setHookContainer( MediaWikiServices::getInstance()->getHookContainer() ); + $mockEngine->setHookContainer( $this->getServiceContainer()->getHookContainer() ); $fields = $mockEngine->getSearchIndexFields(); $this->assertArrayHasKey( 'language', $fields ); @@ -388,7 +387,7 @@ class SearchEngineTest extends MediaWikiLangTestCase { $engine = new MockCompletionSearchEngine(); $engine->setLimitOffset( 10, 0 ); - $engine->setHookContainer( MediaWikiServices::getInstance()->getHookContainer() ); + $engine->setHookContainer( $this->getServiceContainer()->getHookContainer() ); $results = $engine->completionSearch( 'foo' ); $this->assertEquals( 5, $results->getSize() ); $this->assertTrue( $results->hasMoreResults() ); diff --git a/tests/phpunit/includes/search/SearchNearMatcherTest.php b/tests/phpunit/includes/search/SearchNearMatcherTest.php index 8efdaff44aaa..3f7e3a5412c7 100644 --- a/tests/phpunit/includes/search/SearchNearMatcherTest.php +++ b/tests/phpunit/includes/search/SearchNearMatcherTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers SearchNearMatcher */ @@ -75,7 +73,7 @@ class SearchNearMatcherTest extends MediaWikiIntegrationTestCase { $titleText, $enableSearchContributorsByIP = false ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $this->addGoodLinkObject( 42, Title::newFromText( $titleText ) ); $config = new HashConfig( [ 'EnableSearchContributorsByIP' => $enableSearchContributorsByIP, @@ -101,7 +99,7 @@ class SearchNearMatcherTest extends MediaWikiIntegrationTestCase { * @covers SearchNearMatcher::getNearMatch */ public function testNearMatch_Hooks( $hook ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $config = new HashConfig( [ 'EnableSearchContributorsByIP' => false, ] ); @@ -127,7 +125,7 @@ class SearchNearMatcherTest extends MediaWikiIntegrationTestCase { * @covers SearchNearMatcher::getNearMatchResultSet */ public function testGetNearMatchResultSet() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $this->addGoodLinkObject( 42, Title::newFromText( "Test Link" ) ); $config = new HashConfig( [ diff --git a/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php b/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php index f7f0165c1bc1..6fd99fdb104a 100644 --- a/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php +++ b/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php @@ -2,7 +2,6 @@ namespace MediaWiki\Session; -use MediaWiki\MediaWikiServices; use MediaWikiIntegrationTestCase; use MultiConfig; use Psr\Log\LogLevel; @@ -67,7 +66,7 @@ class BotPasswordSessionProviderTest extends MediaWikiIntegrationTestCase { } public function addDBDataOnce() { - $passwordFactory = MediaWikiServices::getInstance()->getPasswordFactory(); + $passwordFactory = $this->getServiceContainer()->getPasswordFactory(); $passwordHash = $passwordFactory->newFromPlaintext( 'foobaz' ); $sysop = static::getTestSysop()->getUser(); diff --git a/tests/phpunit/includes/session/CookieSessionProviderTest.php b/tests/phpunit/includes/session/CookieSessionProviderTest.php index f3b860c1638b..0b40c2064963 100644 --- a/tests/phpunit/includes/session/CookieSessionProviderTest.php +++ b/tests/phpunit/includes/session/CookieSessionProviderTest.php @@ -3,7 +3,6 @@ namespace MediaWiki\Session; use MediaWiki\HookContainer\HookContainer; -use MediaWiki\MediaWikiServices; use MediaWikiIntegrationTestCase; use Psr\Log\LogLevel; use Psr\Log\NullLogger; @@ -39,7 +38,7 @@ class CookieSessionProviderTest extends MediaWikiIntegrationTestCase { */ private function getHookContainer() { // Need a real HookContainer for testPersistSession() which modifies $wgHooks - return MediaWikiServices::getInstance()->getHookContainer(); + return $this->getServiceContainer()->getHookContainer(); } /** diff --git a/tests/phpunit/includes/session/SessionBackendTest.php b/tests/phpunit/includes/session/SessionBackendTest.php index e1a17cedae9e..51deab717e9a 100644 --- a/tests/phpunit/includes/session/SessionBackendTest.php +++ b/tests/phpunit/includes/session/SessionBackendTest.php @@ -4,7 +4,6 @@ namespace MediaWiki\Session; use Config; use MediaWiki\HookContainer\HookContainer; -use MediaWiki\MediaWikiServices; use MediaWikiIntegrationTestCase; use User; use Wikimedia\AtEase\AtEase; @@ -39,7 +38,7 @@ class SessionBackendTest extends MediaWikiIntegrationTestCase { */ private function getHookContainer() { // Need a real HookContainer to support modification of $wgHooks in the test - return MediaWikiServices::getInstance()->getHookContainer(); + return $this->getServiceContainer()->getHookContainer(); } /** diff --git a/tests/phpunit/includes/session/SessionProviderTest.php b/tests/phpunit/includes/session/SessionProviderTest.php index e17355bb3866..8b151e83122b 100644 --- a/tests/phpunit/includes/session/SessionProviderTest.php +++ b/tests/phpunit/includes/session/SessionProviderTest.php @@ -2,7 +2,6 @@ namespace MediaWiki\Session; -use MediaWiki\MediaWikiServices; use MediaWiki\User\UserNameUtils; use MediaWikiIntegrationTestCase; use TestLogger; @@ -203,7 +202,7 @@ class SessionProviderTest extends MediaWikiIntegrationTestCase { $this->assertSame( 'MockSessionProvider sessions', $provider->describe( - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ) ) + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ) ) ); } diff --git a/tests/phpunit/includes/site/DBSiteStoreTest.php b/tests/phpunit/includes/site/DBSiteStoreTest.php index b69c9f81379c..fe0408703f44 100644 --- a/tests/phpunit/includes/site/DBSiteStoreTest.php +++ b/tests/phpunit/includes/site/DBSiteStoreTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,7 +35,7 @@ class DBSiteStoreTest extends MediaWikiIntegrationTestCase { private function newDBSiteStore() { // NOTE: Use the real DB load balancer for now. Eventually, the test framework should // provide a LoadBalancer that is safe to use in unit tests. - $lb = MediaWikiServices::getInstance()->getDBLoadBalancer(); + $lb = $this->getServiceContainer()->getDBLoadBalancer(); return new DBSiteStore( $lb ); } diff --git a/tests/phpunit/includes/skins/SkinMustacheTest.php b/tests/phpunit/includes/skins/SkinMustacheTest.php index 6e2ac4b3461b..43ba482f11d5 100644 --- a/tests/phpunit/includes/skins/SkinMustacheTest.php +++ b/tests/phpunit/includes/skins/SkinMustacheTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use PHPUnit\Framework\MockObject\MockObject; /** @@ -91,7 +90,7 @@ class SkinMustacheTest extends MediaWikiIntegrationTestCase { * @covers SkinTemplate::buildSearchProps */ public function testGetTemplateData() { - $config = MediaWikiServices::getInstance()->getMainConfig(); + $config = $this->getServiceContainer()->getMainConfig(); $bodytext = '<p>hello</p>'; $context = new RequestContext(); $title = Title::newFromText( 'Mustache skin' ); diff --git a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php index 77ccba1c12eb..b3fc584858dc 100644 --- a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php +++ b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageReferenceValue; use Wikimedia\ScopedCallback; use Wikimedia\TestingAccessWrapper; @@ -28,7 +27,7 @@ use Wikimedia\TestingAccessWrapper; */ class SpecialPageFactoryTest extends MediaWikiIntegrationTestCase { private function getFactory() { - return MediaWikiServices::getInstance()->getSpecialPageFactory(); + return $this->getServiceContainer()->getSpecialPageFactory(); } public function testHookNotCalledTwice() { @@ -39,7 +38,7 @@ class SpecialPageFactoryTest extends MediaWikiIntegrationTestCase { $count++; } ] ] ); - $spf = MediaWikiServices::getInstance()->getSpecialPageFactory(); + $spf = $this->getServiceContainer()->getSpecialPageFactory(); $spf->getNames(); $spf->getNames(); $this->assertSame( 1, $count ); @@ -162,7 +161,7 @@ class SpecialPageFactoryTest extends MediaWikiIntegrationTestCase { public function testConflictResolution( $test, $aliasesList, $alias, $expectedName, $expectedAlias, $expectWarnings ) { - $lang = clone MediaWikiServices::getInstance()->getContentLanguage(); + $lang = clone $this->getServiceContainer()->getContentLanguage(); $wrappedLang = TestingAccessWrapper::newFromObject( $lang ); $wrappedLang->mExtendedSpecialPageAliases = $aliasesList; $this->setMwGlobals( 'wgSpecialPages', @@ -290,8 +289,8 @@ class SpecialPageFactoryTest extends MediaWikiIntegrationTestCase { $called = false; $this->mergeMwGlobalArrayValue( 'wgHooks', [ 'SpecialPage_initList' => [ - static function () use ( &$called ) { - MediaWikiServices::getInstance() + function () use ( &$called ) { + $this->getServiceContainer() ->getSpecialPageFactory() ->getLocalNameFor( 'Specialpages' ); $called = true; diff --git a/tests/phpunit/includes/specialpage/SpecialPageTest.php b/tests/phpunit/includes/specialpage/SpecialPageTest.php index 0dce257d9e5d..d5c453e66997 100644 --- a/tests/phpunit/includes/specialpage/SpecialPageTest.php +++ b/tests/phpunit/includes/specialpage/SpecialPageTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @covers SpecialPage * @@ -66,7 +64,7 @@ class SpecialPageTest extends MediaWikiIntegrationTestCase { $user = User::newFromId( 0 ); $specialPage->getContext()->setUser( $user ); $specialPage->getContext()->setLanguage( - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ) ); + $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' ) ); $this->expectException( UserNotLoggedIn::class ); $this->expectExceptionMessage( $expected ); diff --git a/tests/phpunit/includes/specials/ContribsPagerTest.php b/tests/phpunit/includes/specials/ContribsPagerTest.php index 0ed991db7699..b87df86064e8 100644 --- a/tests/phpunit/includes/specials/ContribsPagerTest.php +++ b/tests/phpunit/includes/specials/ContribsPagerTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; use Wikimedia\TestingAccessWrapper; @@ -39,7 +38,7 @@ class ContribsPagerTest extends MediaWikiIntegrationTestCase { protected function setUp(): void { parent::setUp(); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $this->linkRenderer = $services->getLinkRenderer(); $this->revisionStore = $services->getRevisionStore(); $this->linkBatchFactory = $services->getLinkBatchFactory(); diff --git a/tests/phpunit/includes/specials/DeletedContribsPagerTest.php b/tests/phpunit/includes/specials/DeletedContribsPagerTest.php index 83e23987ad21..dc450a7a7da0 100644 --- a/tests/phpunit/includes/specials/DeletedContribsPagerTest.php +++ b/tests/phpunit/includes/specials/DeletedContribsPagerTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group Database */ @@ -27,7 +25,7 @@ class DeletedContribsPagerTest extends MediaWikiIntegrationTestCase { protected function setUp(): void { parent::setUp(); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $this->linkRenderer = $services->getLinkRenderer(); $this->revisionStore = $services->getRevisionStore(); $this->hookContainer = $services->getHookContainer(); diff --git a/tests/phpunit/includes/specials/ImageListPagerTest.php b/tests/phpunit/includes/specials/ImageListPagerTest.php index acaa1e9c0e13..d371a2a2b0c2 100644 --- a/tests/phpunit/includes/specials/ImageListPagerTest.php +++ b/tests/phpunit/includes/specials/ImageListPagerTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * Test class for ImageListPagerTest class. * @@ -16,7 +14,7 @@ class ImageListPagerTest extends MediaWikiIntegrationTestCase { * @covers ImageListPager::formatValue */ public function testFormatValuesThrowException() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $page = new ImageListPager( RequestContext::getMain(), null, diff --git a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php index 7f8d160996ce..e651a555e8e7 100644 --- a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php +++ b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php @@ -7,8 +7,6 @@ * @author Antoine Musso */ -use MediaWiki\MediaWikiServices; - /** * @group Database * @covers QueryPage<extended> @@ -44,7 +42,7 @@ class QueryAllSpecialPagesTest extends MediaWikiIntegrationTestCase { foreach ( QueryPage::getPages() as [ $class, $name ] ) { if ( !in_array( $class, $this->manualTest ) ) { $this->queryPages[$class] = - MediaWikiServices::getInstance()->getSpecialPageFactory()->getPage( $name ); + $this->getServiceContainer()->getSpecialPageFactory()->getPage( $name ); } } } diff --git a/tests/phpunit/includes/specials/SpecialBlockTest.php b/tests/phpunit/includes/specials/SpecialBlockTest.php index 97bcd4764ae2..5420f9739257 100644 --- a/tests/phpunit/includes/specials/SpecialBlockTest.php +++ b/tests/phpunit/includes/specials/SpecialBlockTest.php @@ -5,7 +5,6 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\ActionRestriction; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; -use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\LoadBalancer; use Wikimedia\TestingAccessWrapper; @@ -19,7 +18,7 @@ class SpecialBlockTest extends SpecialPageTestBase { * @inheritDoc */ protected function newSpecialPage() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new SpecialBlock( $services->getBlockUtils(), $services->getBlockPermissionCheckerFactory(), @@ -136,7 +135,7 @@ class SpecialBlockTest extends SpecialPageTestBase { new ActionRestriction( 0, $actionId ), ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); // Refresh the block from the database. $block = DatabaseBlock::newFromTarget( $block->getTargetUserIdentity() ); @@ -211,7 +210,7 @@ class SpecialBlockTest extends SpecialPageTestBase { 'sitewide' => 0, 'enableAutoblock' => false, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $page = $this->newSpecialPage(); $reason = 'test'; @@ -639,7 +638,7 @@ class SpecialBlockTest extends SpecialPageTestBase { 'by' => $performer, 'hideName' => true, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); // Matches the existing block $defaultData = [ @@ -853,7 +852,7 @@ class SpecialBlockTest extends SpecialPageTestBase { 'enableAutoblock' => true, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $this->assertSame( SpecialBlock::checkUnblockSelf( $adjustTarget, $adjustPerformer ), @@ -953,7 +952,7 @@ class SpecialBlockTest extends SpecialPageTestBase { 'enableAutoblock' => true, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); return $block; } diff --git a/tests/phpunit/includes/specials/SpecialBooksourcesTest.php b/tests/phpunit/includes/specials/SpecialBooksourcesTest.php index 868f542f0fe5..18408cf2191e 100644 --- a/tests/phpunit/includes/specials/SpecialBooksourcesTest.php +++ b/tests/phpunit/includes/specials/SpecialBooksourcesTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - class SpecialBooksourcesTest extends SpecialPageTestBase { public static function provideISBNs() { return [ @@ -38,7 +36,7 @@ class SpecialBooksourcesTest extends SpecialPageTestBase { } protected function newSpecialPage() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new SpecialBookSources( $services->getRevisionLookup(), $services->getContentLanguage() diff --git a/tests/phpunit/includes/specials/SpecialContributionsTest.php b/tests/phpunit/includes/specials/SpecialContributionsTest.php index 0af99d1c50f7..80d357efa9bb 100644 --- a/tests/phpunit/includes/specials/SpecialContributionsTest.php +++ b/tests/phpunit/includes/specials/SpecialContributionsTest.php @@ -120,7 +120,7 @@ class SpecialContributionsTest extends SpecialPageTestBase { } protected function newSpecialPage(): SpecialContributions { - $services = MediaWiki\MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new SpecialContributions( $services->getLinkBatchFactory(), diff --git a/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php b/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php index 0111a30f96f7..3537b747d189 100644 --- a/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php +++ b/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @author Addshore * @@ -17,7 +15,7 @@ class SpecialEditWatchlistTest extends SpecialPageTestBase { * @return SpecialPage */ protected function newSpecialPage() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new SpecialEditWatchlist( $services->getWatchedItemStore(), $services->getTitleParser(), diff --git a/tests/phpunit/includes/specials/SpecialGoToInterwikiTest.php b/tests/phpunit/includes/specials/SpecialGoToInterwikiTest.php index 52dc18b89dba..591e3e63c981 100644 --- a/tests/phpunit/includes/specials/SpecialGoToInterwikiTest.php +++ b/tests/phpunit/includes/specials/SpecialGoToInterwikiTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Interwiki\InterwikiLookupAdapter; -use MediaWiki\MediaWikiServices; /** * @covers SpecialGoToInterwiki @@ -18,9 +17,9 @@ class SpecialGoToInterwikiTest extends MediaWikiIntegrationTestCase { 'https://nonlocal.example.com/api.php', 'unittest_nonlocalwiki', 0 ), ] ) ); - MediaWikiServices::getInstance()->resetServiceForTesting( 'TitleFormatter' ); - MediaWikiServices::getInstance()->resetServiceForTesting( 'TitleParser' ); - MediaWikiServices::getInstance()->resetServiceForTesting( '_MediaWikiTitleCodec' ); + $this->getServiceContainer()->resetServiceForTesting( 'TitleFormatter' ); + $this->getServiceContainer()->resetServiceForTesting( 'TitleParser' ); + $this->getServiceContainer()->resetServiceForTesting( '_MediaWikiTitleCodec' ); $this->assertNotTrue( Title::newFromText( 'Foo' )->isExternal() ); $this->assertTrue( Title::newFromText( 'local:Foo' )->isExternal() ); @@ -28,7 +27,7 @@ class SpecialGoToInterwikiTest extends MediaWikiIntegrationTestCase { $this->assertTrue( Title::newFromText( 'local:Foo' )->isLocal() ); $this->assertNotTrue( Title::newFromText( 'nonlocal:Foo' )->isLocal() ); - $goToInterwiki = MediaWikiServices::getInstance()->getSpecialPageFactory() + $goToInterwiki = $this->getServiceContainer()->getSpecialPageFactory() ->getPage( 'GoToInterwiki' ); RequestContext::resetMain(); diff --git a/tests/phpunit/includes/specials/SpecialMIMESearchTest.php b/tests/phpunit/includes/specials/SpecialMIMESearchTest.php index 287ae3ce782b..fd17f991e933 100644 --- a/tests/phpunit/includes/specials/SpecialMIMESearchTest.php +++ b/tests/phpunit/includes/specials/SpecialMIMESearchTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group Database * @covers SpecialMIMESearch @@ -14,7 +12,7 @@ class SpecialMIMESearchTest extends MediaWikiIntegrationTestCase { protected function setUp(): void { parent::setUp(); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $this->page = new SpecialMIMESearch( $services->getDBLoadBalancer(), $services->getLinkBatchFactory(), diff --git a/tests/phpunit/includes/specials/SpecialMyLanguageTest.php b/tests/phpunit/includes/specials/SpecialMyLanguageTest.php index 13acd5a63b9e..d555a6d89a3d 100644 --- a/tests/phpunit/includes/specials/SpecialMyLanguageTest.php +++ b/tests/phpunit/includes/specials/SpecialMyLanguageTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group Database * @covers SpecialMyLanguage @@ -38,7 +36,7 @@ class SpecialMyLanguageTest extends MediaWikiIntegrationTestCase { */ public function testFindTitle( $expected, $subpage, $langCode, $userLang ) { $this->setContentLang( $langCode ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $special = new SpecialMyLanguage( $services->getLanguageNameUtils(), $services->getRedirectLookup() diff --git a/tests/phpunit/includes/specials/SpecialPasswordResetTest.php b/tests/phpunit/includes/specials/SpecialPasswordResetTest.php index 3b6852a61d43..8c4dbc501388 100644 --- a/tests/phpunit/includes/specials/SpecialPasswordResetTest.php +++ b/tests/phpunit/includes/specials/SpecialPasswordResetTest.php @@ -1,14 +1,12 @@ <?php -use MediaWiki\MediaWikiServices; - class SpecialPasswordResetTest extends FormSpecialPageTestCase { /** * @inheritDoc */ protected function newSpecialPage() { return new SpecialPasswordReset( - MediaWikiServices::getInstance()->getPasswordReset() + $this->getServiceContainer()->getPasswordReset() ); } } diff --git a/tests/phpunit/includes/specials/SpecialPreferencesTest.php b/tests/phpunit/includes/specials/SpecialPreferencesTest.php index dd8f6405a611..f772e1040416 100644 --- a/tests/phpunit/includes/specials/SpecialPreferencesTest.php +++ b/tests/phpunit/includes/specials/SpecialPreferencesTest.php @@ -6,8 +6,6 @@ * Copyright © 2013, Wikimedia Foundation Inc. */ -use MediaWiki\MediaWikiServices; - /** * @group Preferences * @group Database @@ -47,7 +45,7 @@ class SpecialPreferencesTest extends MediaWikiIntegrationTestCase { $context->setUser( $user ); $context->setTitle( Title::newFromText( 'Test' ) ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); # Do the call, should not spurt a fatal error. $special = new SpecialPreferences( $services->getPreferencesFactory(), diff --git a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php index 5fc915a6ff53..fda71ad63c09 100644 --- a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php +++ b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use Wikimedia\TestingAccessWrapper; @@ -85,7 +84,7 @@ class SpecialRecentchangesTest extends AbstractChangesListSpecialPageTestCase { $this->assertStringContainsString( 'mw-changeslist-line-not-watched', $rc1->getOutput()->getHTML() ); // Watch the page, and check that it's now watched in RC. - $watchedItemStore = MediaWikiServices::getInstance()->getWatchedItemStore(); + $watchedItemStore = $this->getServiceContainer()->getWatchedItemStore(); $watchedItemStore->addWatch( $context->getUser(), $testPage ); $rc2 = $this->getPage(); $rc2->setContext( $context ); diff --git a/tests/phpunit/includes/specials/SpecialSearchTest.php b/tests/phpunit/includes/specials/SpecialSearchTest.php index c656488f5ddd..9e941b05ad40 100644 --- a/tests/phpunit/includes/specials/SpecialSearchTest.php +++ b/tests/phpunit/includes/specials/SpecialSearchTest.php @@ -13,7 +13,7 @@ use MediaWiki\MediaWikiServices; class SpecialSearchTest extends MediaWikiIntegrationTestCase { private function newSpecialPage() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new SpecialSearch( $services->getSearchEngineConfig(), $services->getSearchEngineFactory(), @@ -60,7 +60,7 @@ class SpecialSearchTest extends MediaWikiIntegrationTestCase { 'sort' => 'invalid', ] ) ); $sp = Title::makeTitle( NS_SPECIAL, 'Search' ); - MediaWikiServices::getInstance() + $this->getServiceContainer() ->getSpecialPageFactory() ->executePath( $sp, $ctx ); $html = $ctx->getOutput()->getHTML(); @@ -273,7 +273,7 @@ class SpecialSearchTest extends MediaWikiIntegrationTestCase { ); $mockSearchEngine = $this->mockSearchEngine( $searchResults ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $search = $this->getMockBuilder( SpecialSearch::class ) ->setConstructorArgs( [ $services->getSearchEngineConfig(), @@ -320,7 +320,7 @@ class SpecialSearchTest extends MediaWikiIntegrationTestCase { $mock->method( 'getNearMatcher' ) ->willReturn( $nearMatcherMock ); - $mock->setHookContainer( MediaWikiServices::getInstance()->getHookContainer() ); + $mock->setHookContainer( $this->getServiceContainer()->getHookContainer() ); return $mock; } @@ -335,7 +335,7 @@ class SpecialSearchTest extends MediaWikiIntegrationTestCase { $ctx = new RequestContext; $sp = Title::newFromText( 'Special:Search/foo_bar' ); - MediaWikiServices::getInstance()->getSpecialPageFactory()->executePath( $sp, $ctx ); + $this->getServiceContainer()->getSpecialPageFactory()->executePath( $sp, $ctx ); $url = $ctx->getOutput()->getRedirect(); $parts = parse_url( $url ); @@ -380,7 +380,7 @@ class SpecialSearchTest extends MediaWikiIntegrationTestCase { [ SearchResult::newFromTitle( Title::newMainPage() ) ] ); $mockSearchEngine = $this->mockSearchEngine( $searchResults ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $search = $this->getMockBuilder( SpecialSearch::class ) ->setConstructorArgs( [ $services->getSearchEngineConfig(), @@ -450,7 +450,7 @@ class SpecialSearchTest extends MediaWikiIntegrationTestCase { $mockSearchEngineFactory->method( "create" ) ->willReturn( $this->mockSearchEngine( new SpecialSearchTestMockResultSet() ) ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $specialSearch = new SpecialSearch( $services->getSearchEngineConfig(), $mockSearchEngineFactory, diff --git a/tests/phpunit/includes/specials/SpecialShortPagesTest.php b/tests/phpunit/includes/specials/SpecialShortPagesTest.php index 1fe05ad0d1f6..d295faa52588 100644 --- a/tests/phpunit/includes/specials/SpecialShortPagesTest.php +++ b/tests/phpunit/includes/specials/SpecialShortPagesTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * Test class for SpecialShortPages class * @@ -24,7 +22,7 @@ class SpecialShortPagesTest extends MediaWikiIntegrationTestCase { // empty hook handler } ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $page = new SpecialShortPages( $services->getNamespaceInfo(), $services->getDBLoadBalancer(), diff --git a/tests/phpunit/includes/specials/SpecialUnblockTest.php b/tests/phpunit/includes/specials/SpecialUnblockTest.php index b8ef3880222e..f18d5b5b2be1 100644 --- a/tests/phpunit/includes/specials/SpecialUnblockTest.php +++ b/tests/phpunit/includes/specials/SpecialUnblockTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Block\DatabaseBlock; -use MediaWiki\MediaWikiServices; use Wikimedia\TestingAccessWrapper; /** @@ -14,7 +13,7 @@ class SpecialUnblockTest extends SpecialPageTestBase { * @inheritDoc */ protected function newSpecialPage() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new SpecialUnblock( $services->getUnblockUserFactory(), $services->getBlockUtils(), @@ -79,7 +78,7 @@ class SpecialUnblockTest extends SpecialPageTestBase { 'by' => $performer, 'hideName' => true, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); } if ( !empty( $options['readOnly'] ) ) { @@ -140,7 +139,7 @@ class SpecialUnblockTest extends SpecialPageTestBase { 'by' => $blocker, 'address' => $performer, ] ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $request = new FauxRequest( [ 'wpTarget' => $performer->getName(), diff --git a/tests/phpunit/includes/specials/SpecialUncategorizedCategoriesTest.php b/tests/phpunit/includes/specials/SpecialUncategorizedCategoriesTest.php index e8d97305bb34..88313fbe03c8 100644 --- a/tests/phpunit/includes/specials/SpecialUncategorizedCategoriesTest.php +++ b/tests/phpunit/includes/specials/SpecialUncategorizedCategoriesTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * Tests for Special:UncategorizedCategories */ @@ -14,7 +12,7 @@ class SpecialUncategorizedCategoriesTest extends MediaWikiIntegrationTestCase { $msg = new RawMessage( $msgContent ); $mockContext = $this->getMockBuilder( RequestContext::class )->getMock(); $mockContext->method( 'msg' )->willReturn( $msg ); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $special = new SpecialUncategorizedCategories( $services->getNamespaceInfo(), $services->getDBLoadBalancer(), diff --git a/tests/phpunit/includes/specials/SpecialWatchlistTest.php b/tests/phpunit/includes/specials/SpecialWatchlistTest.php index a253aabe2b97..6f5ee297fb9c 100644 --- a/tests/phpunit/includes/specials/SpecialWatchlistTest.php +++ b/tests/phpunit/includes/specials/SpecialWatchlistTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\TestingAccessWrapper; /** @@ -44,7 +43,7 @@ class SpecialWatchlistTest extends SpecialPageTestBase { * @return SpecialWatchlist */ protected function newSpecialPage() { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new SpecialWatchlist( $services->getWatchedItemStore(), $services->getWatchlistManager(), diff --git a/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php b/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php index 622185cf4519..8443ae0a6079 100644 --- a/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php +++ b/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php @@ -8,7 +8,6 @@ use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentFormatter\RowCommentFormatter; -use MediaWiki\MediaWikiServices; use MediaWiki\SpecialPage\SpecialPageFactory; use Wikimedia\Rdbms\ILoadBalancer; use Wikimedia\TestingAccessWrapper; @@ -48,7 +47,7 @@ class BlockListPagerTest extends MediaWikiIntegrationTestCase { protected function setUp(): void { parent::setUp(); - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); $this->linkBatchFactory = $services->getLinkBatchFactory(); $this->blockRestrictionStore = $services->getBlockRestrictionStore(); $this->loadBalancer = $services->getDBLoadBalancer(); @@ -242,7 +241,7 @@ class BlockListPagerTest extends MediaWikiIntegrationTestCase { $this->tablesUsed[] = 'user'; // Test the Link Cache. - $linkCache = MediaWikiServices::getInstance()->getLinkCache(); + $linkCache = $this->getServiceContainer()->getLinkCache(); $wrappedlinkCache = TestingAccessWrapper::newFromObject( $linkCache ); $admin = $this->getTestSysop()->getUser(); @@ -305,7 +304,7 @@ class BlockListPagerTest extends MediaWikiIntegrationTestCase { $block->setRestrictions( [ new PageRestriction( 0, $page->getId() ), ] ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); $result = $this->db->newSelectQueryBuilder() diff --git a/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php b/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php index 5c083078cf92..eeed09735236 100644 --- a/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php +++ b/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php @@ -20,7 +20,6 @@ */ use MediaWiki\Interwiki\InterwikiLookup; -use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Tests\Unit\DummyServicesTrait; @@ -103,7 +102,7 @@ class MediaWikiTitleCodecTest extends MediaWikiIntegrationTestCase { protected function makeCodec( $lang ) { return new MediaWikiTitleCodec( - MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( $lang ), + $this->getServiceContainer()->getLanguageFactory()->getLanguage( $lang ), $this->getGenderCache(), [ 'localtestiw' ], $this->getInterwikiLookup(), diff --git a/tests/phpunit/includes/title/NamespaceInfoTest.php b/tests/phpunit/includes/title/NamespaceInfoTest.php index 79281ad1081f..637f243dcf7e 100644 --- a/tests/phpunit/includes/title/NamespaceInfoTest.php +++ b/tests/phpunit/includes/title/NamespaceInfoTest.php @@ -8,7 +8,6 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Linker\LinkTarget; -use MediaWiki\MediaWikiServices; class NamespaceInfoTest extends MediaWikiIntegrationTestCase { use TestAllServiceOptionsUsed; @@ -60,7 +59,7 @@ class NamespaceInfoTest extends MediaWikiIntegrationTestCase { * @return HookContainer */ private function getHookContainer() { - return MediaWikiServices::getInstance()->getHookContainer(); + return $this->getServiceContainer()->getHookContainer(); } private function newObj( array $options = [] ): NamespaceInfo { diff --git a/tests/phpunit/includes/upload/UploadFromUrlTest.php b/tests/phpunit/includes/upload/UploadFromUrlTest.php index 791d477b7b42..bc9b6aec679c 100644 --- a/tests/phpunit/includes/upload/UploadFromUrlTest.php +++ b/tests/phpunit/includes/upload/UploadFromUrlTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group large * @group Upload @@ -24,7 +22,7 @@ class UploadFromUrlTest extends ApiTestCase { ] ); $this->setGroupPermissions( 'sysop', 'upload_by_url', true ); - if ( MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo() + if ( $this->getServiceContainer()->getRepoGroup()->getLocalRepo() ->newFile( 'UploadFromUrlTest.png' )->exists() ) { $this->deleteFile( 'UploadFromUrlTest.png' ); @@ -202,11 +200,11 @@ class UploadFromUrlTest extends ApiTestCase { $this->assertTrue( $t->exists(), "File '$name' exists" ); if ( $t->exists() ) { - $file = MediaWikiServices::getInstance()->getRepoGroup() + $file = $this->getServiceContainer()->getRepoGroup() ->findFile( $name, [ 'ignoreRedirect' => true ] ); $empty = ""; FileDeleteForm::doDelete( $t, $file, $empty, "none", true, $this->user ); - $page = MediaWikiServices::getInstance()->getWikiPageFactory()->newFromTitle( $t ); + $page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $t ); $this->deletePage( $page ); } $t = Title::newFromText( $name, NS_FILE ); diff --git a/tests/phpunit/includes/user/BotPasswordTest.php b/tests/phpunit/includes/user/BotPasswordTest.php index 2cafe5019f09..d68a41d1a4c2 100644 --- a/tests/phpunit/includes/user/BotPasswordTest.php +++ b/tests/phpunit/includes/user/BotPasswordTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Session\SessionManager; use Wikimedia\ScopedCallback; use Wikimedia\TestingAccessWrapper; @@ -58,7 +57,7 @@ class BotPasswordTest extends MediaWikiIntegrationTestCase { } public function addDBData() { - $passwordFactory = MediaWikiServices::getInstance()->getPasswordFactory(); + $passwordFactory = $this->getServiceContainer()->getPasswordFactory(); $passwordHash = $passwordFactory->newFromPlaintext( 'foobaz' ); $dbw = wfGetDB( DB_PRIMARY ); @@ -347,7 +346,7 @@ class BotPasswordTest extends MediaWikiIntegrationTestCase { * @param string|null $password */ public function testSave( $password ) { - $passwordFactory = MediaWikiServices::getInstance()->getPasswordFactory(); + $passwordFactory = $this->getServiceContainer()->getPasswordFactory(); $bp = BotPassword::newUnsaved( [ 'centralId' => 42, diff --git a/tests/phpunit/includes/user/LocalIdLookupTest.php b/tests/phpunit/includes/user/LocalIdLookupTest.php index c2c4be92612a..1dac11a5f0c7 100644 --- a/tests/phpunit/includes/user/LocalIdLookupTest.php +++ b/tests/phpunit/includes/user/LocalIdLookupTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Block\DatabaseBlock; -use MediaWiki\MediaWikiServices; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use MediaWiki\User\UserIdentityValue; @@ -20,7 +19,7 @@ class LocalIdLookupTest extends MediaWikiIntegrationTestCase { } $sysop = static::getTestSysop()->getUserIdentity(); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $block = new DatabaseBlock( [ 'address' => $this->localUsers[2]->getName(), diff --git a/tests/phpunit/includes/user/TalkPageNotificationManagerTest.php b/tests/phpunit/includes/user/TalkPageNotificationManagerTest.php index ca56ae17446d..f1152f90cd2a 100644 --- a/tests/phpunit/includes/user/TalkPageNotificationManagerTest.php +++ b/tests/phpunit/includes/user/TalkPageNotificationManagerTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Config\ServiceOptions; -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionLookup; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Tests\Unit\DummyServicesTrait; @@ -44,7 +43,7 @@ class TalkPageNotificationManagerTest extends MediaWikiIntegrationTestCase { bool $isReadOnly = false, RevisionLookup $revisionLookup = null ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new TalkPageNotificationManager( new ServiceOptions( TalkPageNotificationManager::CONSTRUCTOR_OPTIONS, diff --git a/tests/phpunit/includes/user/UserGroupManagerTest.php b/tests/phpunit/includes/user/UserGroupManagerTest.php index 2cc642fbd18b..abc9bb408fab 100644 --- a/tests/phpunit/includes/user/UserGroupManagerTest.php +++ b/tests/phpunit/includes/user/UserGroupManagerTest.php @@ -25,7 +25,6 @@ use JobQueueGroup; use LogEntryBase; use MediaWiki\Block\DatabaseBlock; use MediaWiki\Config\ServiceOptions; -use MediaWiki\MediaWikiServices; use MediaWiki\Permissions\SimpleAuthority; use MediaWiki\Session\PHPSessionHandler; use MediaWiki\Session\SessionManager; @@ -63,7 +62,7 @@ class UserGroupManagerTest extends MediaWikiIntegrationTestCase { UserEditTracker $userEditTrackerOverride = null, callable $callback = null ): UserGroupManager { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new UserGroupManager( new ServiceOptions( UserGroupManager::CONSTRUCTOR_OPTIONS, @@ -285,7 +284,7 @@ class UserGroupManagerTest extends MediaWikiIntegrationTestCase { */ public function testAddUserToGroupReadonly() { $user = $this->getTestUser()->getUser(); - MediaWikiServices::getInstance()->getConfiguredReadOnlyMode()->setReason( 'TEST' ); + $this->getServiceContainer()->getConfiguredReadOnlyMode()->setReason( 'TEST' ); $manager = $this->getManager(); $this->assertFalse( $manager->addUserToGroup( $user, 'test' ) ); $this->assertNotContains( 'test', $manager->getUserGroups( $user ) ); @@ -451,7 +450,7 @@ class UserGroupManagerTest extends MediaWikiIntegrationTestCase { */ public function testRemoveUserFromGroupReadOnly() { $user = $this->getTestUser( [ 'test' ] )->getUser(); - MediaWikiServices::getInstance()->getConfiguredReadOnlyMode()->setReason( 'TEST' ); + $this->getServiceContainer()->getConfiguredReadOnlyMode()->setReason( 'TEST' ); $manager = $this->getManager(); $this->assertFalse( $manager->removeUserFromGroup( $user, 'test' ) ); $this->assertContains( 'test', $manager->getUserGroups( $user ) ); @@ -506,7 +505,7 @@ class UserGroupManagerTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\User\UserGroupManager::purgeExpired */ public function testPurgeExpiredReadOnly() { - MediaWikiServices::getInstance()->getConfiguredReadOnlyMode()->setReason( 'TEST' ); + $this->getServiceContainer()->getConfiguredReadOnlyMode()->setReason( 'TEST' ); $manager = $this->getManager(); $this->assertFalse( $manager->purgeExpired() ); } @@ -871,7 +870,7 @@ class UserGroupManagerTest extends MediaWikiIntegrationTestCase { $block->setTarget( $blockedUser ); $block->setBlocker( $this->getTestSysop()->getUser() ); $block->isSitewide( true ); - MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block ); + $this->getServiceContainer()->getDatabaseBlockStore()->insertBlock( $block ); $this->assertArrayEquals( [ 'test_autoconfirmed' ], $manager->getUserAutopromoteGroups( $blockedUser ) ); } @@ -1002,7 +1001,7 @@ class UserGroupManagerTest extends MediaWikiIntegrationTestCase { * @covers \MediaWiki\User\UserGroupManager::addUserToAutopromoteOnceGroups */ public function testAddUserToAutopromoteOnceGroupsForeignDomain() { - $manager = MediaWikiServices::getInstance() + $manager = $this->getServiceContainer() ->getUserGroupManagerFactory() ->getUserGroupManager( 'TEST_DOMAIN' ); $user = $this->getTestUser()->getUser(); @@ -1025,7 +1024,7 @@ class UserGroupManagerTest extends MediaWikiIntegrationTestCase { public function testAddUserToAutopromoteOnceGroupsReadOnly() { $manager = $this->getManager(); $user = $this->getTestUser()->getUser(); - MediaWikiServices::getInstance()->getConfiguredReadOnlyMode()->setReason( 'TEST' ); + $this->getServiceContainer()->getConfiguredReadOnlyMode()->setReason( 'TEST' ); $this->assertEmpty( $manager->addUserToAutopromoteOnceGroups( $user, 'TEST' ) ); } diff --git a/tests/phpunit/includes/user/UserOptionsLookupTest.php b/tests/phpunit/includes/user/UserOptionsLookupTest.php index 4cf16fdc5b53..1d48e53515ae 100644 --- a/tests/phpunit/includes/user/UserOptionsLookupTest.php +++ b/tests/phpunit/includes/user/UserOptionsLookupTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Config\ServiceOptions; -use MediaWiki\MediaWikiServices; use MediaWiki\User\DefaultOptionsLookup; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; @@ -48,7 +47,7 @@ abstract class UserOptionsLookupTest extends MediaWikiIntegrationTestCase { ] ) ), $lang, - MediaWikiServices::getInstance()->getHookContainer() + $this->getServiceContainer()->getHookContainer() ); } diff --git a/tests/phpunit/includes/user/UserOptionsManagerTest.php b/tests/phpunit/includes/user/UserOptionsManagerTest.php index 211dc7204fad..95040f99e386 100644 --- a/tests/phpunit/includes/user/UserOptionsManagerTest.php +++ b/tests/phpunit/includes/user/UserOptionsManagerTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Config\ServiceOptions; -use MediaWiki\MediaWikiServices; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; use MediaWiki\User\UserOptionsLookup; @@ -32,7 +31,7 @@ class UserOptionsManagerTest extends UserOptionsLookupTest { * @return UserOptionsManager */ private function getManager( array $overrides = [] ) { - $services = MediaWikiServices::getInstance(); + $services = $this->getServiceContainer(); return new UserOptionsManager( new ServiceOptions( UserOptionsManager::CONSTRUCTOR_OPTIONS, diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php index fb28d5f5cd18..4dc222c6ccad 100644 --- a/tests/phpunit/includes/user/UserTest.php +++ b/tests/phpunit/includes/user/UserTest.php @@ -5,7 +5,6 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; use MediaWiki\Block\SystemBlock; -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\SlotRecord; use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\User\CentralId\CentralIdLookupFactory; @@ -849,7 +848,7 @@ class UserTest extends MediaWikiIntegrationTestCase { // Anon user. Can't load by only user ID when that's 0. $user = User::newFromName( '192.168.12.34', false ); // Make sure an actor ID exists - MediaWikiServices::getInstance()->getActorNormalization()->acquireActorId( $user, $this->db ); + $this->getServiceContainer()->getActorNormalization()->acquireActorId( $user, $this->db ); $test = User::newFromAnyId( null, '192.168.12.34', null ); $this->assertSame( $user->getId(), $test->getId() ); @@ -1066,7 +1065,7 @@ class UserTest extends MediaWikiIntegrationTestCase { ] ); $block->setTarget( $user ); $block->setBlocker( $blocker ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $res = $blockStore->insertBlock( $block ); $this->assertTrue( (bool)$res['id'], 'Failed to insert block' ); @@ -1102,7 +1101,7 @@ class UserTest extends MediaWikiIntegrationTestCase { $request = $user->getRequest(); $this->setSessionUser( $user, $request ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $ipBlock = new DatabaseBlock( [ 'address' => $user->getRequest()->getIP(), 'by' => $this->getTestSysop()->getUser(), @@ -1134,7 +1133,7 @@ class UserTest extends MediaWikiIntegrationTestCase { $request = $user->getRequest(); $this->setSessionUser( $user, $request ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $ipBlock = new DatabaseBlock( [ 'address' => $user, 'by' => $this->getTestSysop()->getUser(), @@ -1192,7 +1191,7 @@ class UserTest extends MediaWikiIntegrationTestCase { if ( $restrictions ) { $block->setRestrictions( $restrictions ); } - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); try { @@ -1297,7 +1296,7 @@ class UserTest extends MediaWikiIntegrationTestCase { ] ); $block->setTarget( $user ); $block->setBlocker( $this->getTestSysop()->getUser() ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); try { @@ -1332,7 +1331,7 @@ class UserTest extends MediaWikiIntegrationTestCase { ] ); $block->setTarget( $user ); $block->setBlocker( $this->getTestSysop()->getUser() ); - $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + $blockStore = $this->getServiceContainer()->getDatabaseBlockStore(); $blockStore->insertBlock( $block ); try { diff --git a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceIntegrationTest.php b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceIntegrationTest.php index 020df28148a4..1c3b08f7720b 100644 --- a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceIntegrationTest.php +++ b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceIntegrationTest.php @@ -1,7 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; - /** * @group Database * @@ -19,8 +17,8 @@ class WatchedItemQueryServiceIntegrationTest extends MediaWikiIntegrationTestCas } public function testGetWatchedItemsForUser(): void { - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); - $queryService = MediaWikiServices::getInstance()->getWatchedItemQueryService(); + $store = $this->getServiceContainer()->getWatchedItemStore(); + $queryService = $this->getServiceContainer()->getWatchedItemQueryService(); $user = self::getTestUser()->getUser(); $initialCount = count( $store->getWatchedItemsForUser( $user ) ); @@ -71,8 +69,8 @@ class WatchedItemQueryServiceIntegrationTest extends MediaWikiIntegrationTestCas public function testGetWatchedItemsForUserWithExpiriesDisabled() { $this->setMwGlobals( 'wgWatchlistExpiry', false ); - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); - $queryService = MediaWikiServices::getInstance()->getWatchedItemQueryService(); + $store = $this->getServiceContainer()->getWatchedItemStore(); + $queryService = $this->getServiceContainer()->getWatchedItemQueryService(); $user = self::getTestUser()->getUser(); $initialCount = count( $store->getWatchedItemsForUser( $user ) ); $store->addWatch( $user, new TitleValue( 0, __METHOD__ ), '1 week ago' ); @@ -81,8 +79,8 @@ class WatchedItemQueryServiceIntegrationTest extends MediaWikiIntegrationTestCas } public function testGetWatchedItemsWithRecentChangeInfo_watchlistExpiry(): void { - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); - $queryService = MediaWikiServices::getInstance()->getWatchedItemQueryService(); + $store = $this->getServiceContainer()->getWatchedItemStore(); + $queryService = $this->getServiceContainer()->getWatchedItemQueryService(); $user = self::getTestUser()->getUser(); $options = []; $startFrom = null; @@ -158,7 +156,7 @@ class WatchedItemQueryServiceIntegrationTest extends MediaWikiIntegrationTestCas public function testGetWatchedItemsWithRecentChangeInfo_watchlistOwnerAndInvalidToken( $token ) { // Moved from the Unit test because the ApiUsageException call creates a Message object // and down the line needs MediaWikiServices - $queryService = MediaWikiServices::getInstance()->getWatchedItemQueryService(); + $queryService = $this->getServiceContainer()->getWatchedItemQueryService(); $user = $this->createNoOpMock( User::class, diff --git a/tests/phpunit/includes/watcheditem/WatchedItemStoreIntegrationTest.php b/tests/phpunit/includes/watcheditem/WatchedItemStoreIntegrationTest.php index 91e9b4f17447..9e76e3d756cb 100644 --- a/tests/phpunit/includes/watcheditem/WatchedItemStoreIntegrationTest.php +++ b/tests/phpunit/includes/watcheditem/WatchedItemStoreIntegrationTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use Wikimedia\TestingAccessWrapper; use Wikimedia\Timestamp\ConvertibleTimestamp; @@ -31,7 +30,7 @@ class WatchedItemStoreIntegrationTest extends MediaWikiIntegrationTestCase { public function testWatchAndUnWatchItem() { $user = $this->getUser(); $title = Title::newFromText( 'WatchedItemStoreIntegrationTestPage' ); - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); // Cleanup after previous tests $store->removeWatch( $user, $title ); $initialWatchers = $store->countWatchers( $title ); @@ -121,7 +120,7 @@ class WatchedItemStoreIntegrationTest extends MediaWikiIntegrationTestCase { public function testWatchAndUnWatchItemWithExpiry(): void { $user = $this->getUser(); $title = Title::newFromText( 'WatchedItemStoreIntegrationTestPage' ); - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); $initialUserWatchedItems = $store->countWatchedItems( $user ); // Watch for a duration greater than the max ($wgWatchlistExpiryMaxDuration), @@ -195,7 +194,7 @@ class WatchedItemStoreIntegrationTest extends MediaWikiIntegrationTestCase { $user = $this->getUser(); $title1 = Title::newFromText( 'WatchedItemStoreIntegrationTestPage1' ); $title2 = Title::newFromText( 'WatchedItemStoreIntegrationTestPage1' ); - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); // Use a relative timestamp in the near future to ensure we don't exceed the max. // See testWatchAndUnWatchItemWithExpiry() for tests regarding the max duration. @@ -226,7 +225,7 @@ class WatchedItemStoreIntegrationTest extends MediaWikiIntegrationTestCase { $user = $this->getUser(); $title1 = Title::newFromText( 'WatchedItemStoreIntegrationTestPage1' ); $title2 = Title::newFromText( 'WatchedItemStoreIntegrationTestPage2' ); - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); $store->addWatchBatchForUser( $user, [ $title1, $title2 ] ); @@ -243,7 +242,7 @@ class WatchedItemStoreIntegrationTest extends MediaWikiIntegrationTestCase { $user = $this->getUser(); $otherUser = ( new TestUser( 'WatchedItemStoreIntegrationTestUser_otherUser' ) )->getUser(); $title = Title::newFromText( 'WatchedItemStoreIntegrationTestPage' ); - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); $store->addWatch( $user, $title ); $this->assertNull( $store->loadWatchedItem( $user, $title )->getNotificationTimestamp() ); $initialVisitingWatchers = $store->countVisitingWatchers( $title, '20150202020202' ); @@ -345,7 +344,7 @@ class WatchedItemStoreIntegrationTest extends MediaWikiIntegrationTestCase { $user = $this->getUser(); $titleOld = Title::newFromText( 'WatchedItemStoreIntegrationTestPageOld' ); $titleNew = Title::newFromText( 'WatchedItemStoreIntegrationTestPageNew' ); - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); $store->addWatch( $user, $titleOld->getSubjectPage(), '99990123000000' ); $store->addWatch( $user, $titleOld->getTalkPage(), '99990123000000' ); @@ -390,7 +389,7 @@ class WatchedItemStoreIntegrationTest extends MediaWikiIntegrationTestCase { } public function testRemoveExpired() { - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); // Clear out any expired rows, to start from a known point. $store->removeExpired( 10 ); @@ -409,7 +408,7 @@ class WatchedItemStoreIntegrationTest extends MediaWikiIntegrationTestCase { } public function testRemoveOrphanedExpired() { - $store = MediaWikiServices::getInstance()->getWatchedItemStore(); + $store = $this->getServiceContainer()->getWatchedItemStore(); // Clear out any expired rows, to start from a known point. $store->removeExpired( 10 ); diff --git a/tests/phpunit/integration/includes/language/SpecialPageAliasTest.php b/tests/phpunit/integration/includes/language/SpecialPageAliasTest.php index 42da0263b7f9..b348eab84113 100644 --- a/tests/phpunit/integration/includes/language/SpecialPageAliasTest.php +++ b/tests/phpunit/integration/includes/language/SpecialPageAliasTest.php @@ -1,7 +1,6 @@ <?php use MediaWiki\Languages\LanguageNameUtils; -use MediaWiki\MediaWikiServices; /** * Verifies that special page aliases are valid, with no slashes. @@ -38,7 +37,7 @@ class SpecialPageAliasTest extends MediaWikiIntegrationTestCase { * @return Generator */ public function validSpecialPageAliasesProvider() { - $codes = array_keys( MediaWikiServices::getInstance() + $codes = array_keys( $this->getServiceContainer() ->getLanguageNameUtils() ->getLanguageNames( LanguageNameUtils::AUTONYMS, LanguageNameUtils::SUPPORTED ) ); diff --git a/tests/phpunit/integration/includes/page/DeletePageTest.php b/tests/phpunit/integration/includes/page/DeletePageTest.php index 4e5a3e5a98aa..ba1cfd5c40c4 100644 --- a/tests/phpunit/integration/includes/page/DeletePageTest.php +++ b/tests/phpunit/integration/includes/page/DeletePageTest.php @@ -6,7 +6,6 @@ use CommentStoreComment; use Content; use ContentHandler; use DeferredUpdates; -use MediaWiki\MediaWikiServices; use MediaWiki\Page\DeletePage; use MediaWiki\Page\ProperPageIdentity; use MediaWiki\Permissions\Authority; @@ -49,7 +48,7 @@ class DeletePageTest extends MediaWikiIntegrationTestCase { "[[Category:Felis catus]]"; private function getDeletePage( ProperPageIdentity $page, Authority $deleter ): DeletePage { - return MediaWikiServices::getInstance()->getDeletePageFactory()->newDeletePage( + return $this->getServiceContainer()->getDeletePageFactory()->newDeletePage( $page, $deleter ); @@ -63,7 +62,7 @@ class DeletePageTest extends MediaWikiIntegrationTestCase { private function createPage( string $titleText, string $content ): WikiPage { $ns = $this->getDefaultWikitextNS(); $title = Title::newFromText( $titleText, $ns ); - $page = MediaWikiServices::getInstance()->getWikiPageFactory()->newFromTitle( $title ); + $page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title ); $performer = static::getTestUser()->getUser(); @@ -90,7 +89,7 @@ class DeletePageTest extends MediaWikiIntegrationTestCase { string $logSubtype, int $logID ): void { - $commentQuery = MediaWikiServices::getInstance()->getCommentStore()->getJoin( 'log_comment' ); + $commentQuery = $this->getServiceContainer()->getCommentStore()->getJoin( 'log_comment' ); $this->assertSelect( [ 'logging' ] + $commentQuery['tables'], [ @@ -121,12 +120,12 @@ class DeletePageTest extends MediaWikiIntegrationTestCase { // in case of normal deletion. return; } - $archive = new PageArchive( $title, MediaWikiServices::getInstance()->getMainConfig() ); + $archive = new PageArchive( $title, $this->getServiceContainer()->getMainConfig() ); $archivedRevs = $archive->listRevisions(); if ( !$archivedRevs || $archivedRevs->numRows() !== 1 ) { $this->fail( 'Unexpected number of archived revisions' ); } - $archivedRev = MediaWikiServices::getInstance()->getRevisionStore() + $archivedRev = $this->getServiceContainer()->getRevisionStore() ->newRevisionFromArchiveRow( $archivedRevs->current() ); $this->assertNotNull( @@ -253,7 +252,7 @@ class DeletePageTest extends MediaWikiIntegrationTestCase { 'ct_tag_id', [ 'ct_log_id' => $logId ] ); - $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); + $changeTagDefStore = $this->getServiceContainer()->getChangeTagDefStore(); $expectedTags = array_map( [ $changeTagDefStore, 'acquireId' ], $tags ); $this->assertArrayEquals( $expectedTags, array_map( 'intval', $actualTags ) ); } |