From 7fb4a95563c684edabbb27818aca670e08f2aa81 Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Mon, 26 Aug 2019 12:13:49 +0300 Subject: [PATCH] Remove unneeded overrideMwServices/resetServices Change-Id: If6cbdec05b8f310ef3a0b4649aaa16d9fb80a047 --- tests/phpunit/includes/ActorMigrationTest.php | 1 - .../includes/ContentSecurityPolicyTest.php | 1 - .../includes/GlobalFunctions/GlobalTest.php | 4 --- .../GlobalFunctions/GlobalWithDBTest.php | 3 -- tests/phpunit/includes/MessageTest.php | 3 -- tests/phpunit/includes/MovePageTest.php | 1 - .../Permissions/PermissionManagerTest.php | 34 ++++++------------- tests/phpunit/includes/PrefixSearchTest.php | 2 -- .../MWBasicRequestAuthorizerTest.php | 1 - .../Revision/RevisionQueryInfoTest.php | 8 ----- .../Revision/RevisionStoreDbTestBase.php | 10 ------ tests/phpunit/includes/RevisionDbTestBase.php | 2 -- tests/phpunit/includes/RevisionTest.php | 2 -- .../phpunit/includes/TitlePermissionTest.php | 33 ++++++------------ tests/phpunit/includes/TitleTest.php | 3 -- tests/phpunit/includes/api/ApiBlockTest.php | 5 --- tests/phpunit/includes/api/ApiDeleteTest.php | 1 - .../phpunit/includes/api/ApiEditPageTest.php | 11 ------ tests/phpunit/includes/api/ApiMainTest.php | 1 - tests/phpunit/includes/api/ApiMoveTest.php | 1 - tests/phpunit/includes/api/ApiParseTest.php | 1 - .../includes/api/ApiUserrightsTest.php | 3 -- .../api/query/ApiQueryUserContribsTest.php | 10 ++---- .../phpunit/includes/auth/AuthManagerTest.php | 4 --- .../includes/block/BlockManagerTest.php | 1 - .../includes/cache/MessageCacheTest.php | 2 -- .../includes/filerepo/RepoGroupTest.php | 3 -- .../includes/interwiki/InterwikiTest.php | 1 - .../includes/objectcache/ObjectCacheTest.php | 1 - .../includes/page/PageArchiveTestBase.php | 12 +++---- .../includes/page/WikiPageDbTestBase.php | 2 -- .../resourceloader/ResourceLoaderTest.php | 2 -- .../search/SearchEnginePrefixTest.php | 2 -- .../ChangesListSpecialPageTest.php | 14 -------- .../specialpage/SpecialPageFactoryTest.php | 8 ----- .../includes/title/NamespaceInfoTest.php | 1 - .../includes/user/UserGroupMembershipTest.php | 2 -- tests/phpunit/includes/user/UserTest.php | 4 --- tests/phpunit/tests/MediaWikiTestCaseTest.php | 1 - 39 files changed, 28 insertions(+), 173 deletions(-) diff --git a/tests/phpunit/includes/ActorMigrationTest.php b/tests/phpunit/includes/ActorMigrationTest.php index 40c45dc683..46c0c42a48 100644 --- a/tests/phpunit/includes/ActorMigrationTest.php +++ b/tests/phpunit/includes/ActorMigrationTest.php @@ -658,7 +658,6 @@ class ActorMigrationTest extends MediaWikiLangTestCase { // for User::getActorId() 'wgActorTableSchemaMigrationStage' => $stage ] ); - $this->overrideMwServices(); $user = $this->getMutableTestUser()->getUser(); $userIdentity = $this->getMock( UserIdentity::class ); diff --git a/tests/phpunit/includes/ContentSecurityPolicyTest.php b/tests/phpunit/includes/ContentSecurityPolicyTest.php index 5d6c0677bd..beddfe8a1b 100644 --- a/tests/phpunit/includes/ContentSecurityPolicyTest.php +++ b/tests/phpunit/includes/ContentSecurityPolicyTest.php @@ -41,7 +41,6 @@ class ContentSecurityPolicyTest extends MediaWikiTestCase { // Note, there are some obscure globals which // could affect the results which aren't included above. - $this->overrideMwServices(); $context = RequestContext::getMain(); $resp = $context->getRequest()->response(); $conf = $context->getConfig(); diff --git a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php index 8f8f54aa01..6b650cde58 100644 --- a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php +++ b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php @@ -120,9 +120,6 @@ class GlobalTest extends MediaWikiTestCase { fwrite( $f, 'Message' ); fclose( $f ); - // Reset the service to avoid cached results - $this->overrideMwServices(); - $this->assertTrue( wfReadOnly() ); $this->assertTrue( wfReadOnly() ); # Check cached } @@ -137,7 +134,6 @@ class GlobalTest extends MediaWikiTestCase { $this->setMwGlobals( [ 'wgReadOnly' => 'reason' ] ); - $this->overrideMwServices(); $this->assertSame( 'reason', wfReadOnlyReason() ); } diff --git a/tests/phpunit/includes/GlobalFunctions/GlobalWithDBTest.php b/tests/phpunit/includes/GlobalFunctions/GlobalWithDBTest.php index 95571f23da..d8d5495707 100644 --- a/tests/phpunit/includes/GlobalFunctions/GlobalWithDBTest.php +++ b/tests/phpunit/includes/GlobalFunctions/GlobalWithDBTest.php @@ -18,9 +18,6 @@ class GlobalWithDBTest extends MediaWikiTestCase { // Don't try to fetch the files from Commons or anything, please $this->setMwGlobals( 'wgForeignFileRepos', [] ); - // We need to reset services immediately so that editPage() doesn't use the old RepoGroup - // and hit the network - $this->resetServices(); // XXX How do we get file redirects to work? $this->editPage( 'File:Redirect to bad.jpg', '#REDIRECT [[Bad.jpg]]' ); diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php index fb32ef7fda..37d4e0c240 100644 --- a/tests/phpunit/includes/MessageTest.php +++ b/tests/phpunit/includes/MessageTest.php @@ -404,9 +404,6 @@ class MessageTest extends MediaWikiLangTestCase { */ public function testRawHtmlInMsg() { $this->setMwGlobals( 'wgRawHtml', true ); - // We have to reset the core hook registration. - // to register the html hook - $this->overrideMwServices(); $msg = new RawMessage( '' ); $txt = '<html> tags cannot be' . diff --git a/tests/phpunit/includes/MovePageTest.php b/tests/phpunit/includes/MovePageTest.php index 2895fa286c..8596035249 100644 --- a/tests/phpunit/includes/MovePageTest.php +++ b/tests/phpunit/includes/MovePageTest.php @@ -197,7 +197,6 @@ class MovePageTest extends MediaWikiTestCase { foreach ( $extraOptions as $key => $val ) { $this->setMwGlobals( "wg$key", $val ); } - $this->overrideMwServices(); $this->setService( 'RepoGroup', $this->getMockRepoGroup() ); // This returns true instead of an array if there are no errors $this->hideDeprecated( 'Title::isValidMoveOperation' ); diff --git a/tests/phpunit/includes/Permissions/PermissionManagerTest.php b/tests/phpunit/includes/Permissions/PermissionManagerTest.php index 44b7f67a31..8398ea42c1 100644 --- a/tests/phpunit/includes/Permissions/PermissionManagerTest.php +++ b/tests/phpunit/includes/Permissions/PermissionManagerTest.php @@ -122,8 +122,6 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $this->user = $this->userUser; } - - $this->resetServices(); } public function tearDown() { @@ -143,7 +141,6 @@ class PermissionManagerTest extends MediaWikiLangTestCase { } else { $this->user = $this->altUser; } - $this->resetServices(); } /** @@ -421,8 +418,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { global $wgGroupPermissions; $old = $wgGroupPermissions; - $wgGroupPermissions = []; - $this->resetServices(); + $this->setMwGlobals( 'wgGroupPermissions', [] ); $this->assertEquals( $check[$action][1], MediaWikiServices::getInstance()->getPermissionManager() @@ -433,8 +429,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $this->assertEquals( $check[$action][1], MediaWikiServices::getInstance()->getPermissionManager() ->getPermissionErrors( $action, $this->user, $this->title, 'secure' ) ); - $wgGroupPermissions = $old; - $this->resetServices(); + $this->setMwGlobals( 'wgGroupPermissions', $old ); $this->overrideUserPermissions( $this->user, $action ); $this->assertEquals( $check[$action][2], @@ -460,39 +455,33 @@ class PermissionManagerTest extends MediaWikiLangTestCase { } protected function runGroupPermissions( $perm, $action, $result, $result2 = null ) { - global $wgGroupPermissions; - if ( $result2 === null ) { $result2 = $result; } - $wgGroupPermissions['autoconfirmed']['move'] = false; - $wgGroupPermissions['user']['move'] = false; - $this->resetServices(); + $this->setGroupPermissions( 'autoconfirmed', 'move', false ); + $this->setGroupPermissions( 'user', 'move', false ); $this->overrideUserPermissions( $this->user, $perm ); $res = MediaWikiServices::getInstance()->getPermissionManager() ->getPermissionErrors( $action, $this->user, $this->title ); $this->assertEquals( $result, $res ); - $wgGroupPermissions['autoconfirmed']['move'] = true; - $wgGroupPermissions['user']['move'] = false; - $this->resetServices(); + $this->setGroupPermissions( 'autoconfirmed', 'move', true ); + $this->setGroupPermissions( 'user', 'move', false ); $this->overrideUserPermissions( $this->user, $perm ); $res = MediaWikiServices::getInstance()->getPermissionManager() ->getPermissionErrors( $action, $this->user, $this->title ); $this->assertEquals( $result2, $res ); - $wgGroupPermissions['autoconfirmed']['move'] = true; - $wgGroupPermissions['user']['move'] = true; - $this->resetServices(); + $this->setGroupPermissions( 'autoconfirmed', 'move', true ); + $this->setGroupPermissions( 'user', 'move', true ); $this->overrideUserPermissions( $this->user, $perm ); $res = MediaWikiServices::getInstance()->getPermissionManager() ->getPermissionErrors( $action, $this->user, $this->title ); $this->assertEquals( $result2, $res ); - $wgGroupPermissions['autoconfirmed']['move'] = false; - $wgGroupPermissions['user']['move'] = true; - $this->resetServices(); + $this->setGroupPermissions( 'autoconfirmed', 'move', false ); + $this->setGroupPermissions( 'user', 'move', true ); $this->overrideUserPermissions( $this->user, $perm ); $res = MediaWikiServices::getInstance()->getPermissionManager() ->getPermissionErrors( $action, $this->user, $this->title ); @@ -1144,7 +1133,6 @@ class PermissionManagerTest extends MediaWikiLangTestCase { ->getPermissionErrors( 'edit', $this->user, $this->title ) ); $this->setMwGlobals( 'wgEmailConfirmToEdit', false ); - $this->resetServices(); $this->overrideUserPermissions( $this->user, [ 'createpage', 'edit', @@ -1577,7 +1565,6 @@ class PermissionManagerTest extends MediaWikiLangTestCase { $rights = array_diff( $rights, [ 'writetest' ] ); } ); - $this->resetServices(); $rights = MediaWikiServices::getInstance() ->getPermissionManager() ->getUserPermissions( $user ); @@ -1859,7 +1846,6 @@ class PermissionManagerTest extends MediaWikiLangTestCase { 'wgRestrictionLevels' => [ '', 'autoconfirmed', 'sysop' ], 'wgAutopromote' => [] ] ); - $this->resetServices(); $user = is_null( $userGroups ) ? null : $this->getTestUser( $userGroups )->getUser(); $this->assertSame( $expected, MediaWikiServices::getInstance() ->getPermissionManager() diff --git a/tests/phpunit/includes/PrefixSearchTest.php b/tests/phpunit/includes/PrefixSearchTest.php index 685cb4024e..4d9f8e171f 100644 --- a/tests/phpunit/includes/PrefixSearchTest.php +++ b/tests/phpunit/includes/PrefixSearchTest.php @@ -60,8 +60,6 @@ class PrefixSearchTest extends MediaWikiLangTestCase { $this->originalHandlers = TestingAccessWrapper::newFromClass( Hooks::class )->handlers; TestingAccessWrapper::newFromClass( Hooks::class )->handlers = []; - - $this->overrideMwServices(); } public function tearDown() { diff --git a/tests/phpunit/includes/Rest/BasicAccess/MWBasicRequestAuthorizerTest.php b/tests/phpunit/includes/Rest/BasicAccess/MWBasicRequestAuthorizerTest.php index 49dcf07798..3c6573ac1f 100644 --- a/tests/phpunit/includes/Rest/BasicAccess/MWBasicRequestAuthorizerTest.php +++ b/tests/phpunit/includes/Rest/BasicAccess/MWBasicRequestAuthorizerTest.php @@ -25,7 +25,6 @@ class MWBasicRequestAuthorizerTest extends MediaWikiTestCase { $user = User::newFromName( 'Test user' ); // Don't allow the rights to everybody so that user rights kick in. $this->mergeMwGlobalArrayValue( 'wgGroupPermissions', [ '*' => $userRights ] ); - $this->resetServices(); $this->overrideUserPermissions( $user, array_keys( array_filter( $userRights ), function ( $value ) { diff --git a/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php b/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php index 57619c55b6..5cc3646ca8 100644 --- a/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php +++ b/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php @@ -960,7 +960,6 @@ class RevisionQueryInfoTest extends MediaWikiTestCase { */ public function testRevisionSelectFields( $migrationStageSettings, $expected ) { $this->setMwGlobals( $migrationStageSettings ); - $this->overrideMwServices(); $this->hideDeprecated( 'Revision::selectFields' ); $this->assertArrayEqualsIgnoringIntKeyOrder( $expected, Revision::selectFields() ); @@ -972,7 +971,6 @@ class RevisionQueryInfoTest extends MediaWikiTestCase { */ public function testRevisionSelectArchiveFields( $migrationStageSettings, $expected ) { $this->setMwGlobals( $migrationStageSettings ); - $this->overrideMwServices(); $this->hideDeprecated( 'Revision::selectArchiveFields' ); $this->assertArrayEqualsIgnoringIntKeyOrder( $expected, Revision::selectArchiveFields() ); @@ -984,7 +982,6 @@ class RevisionQueryInfoTest extends MediaWikiTestCase { public function testRevisionUserJoinCond() { $this->hideDeprecated( 'Revision::userJoinCond' ); $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_OLD ); - $this->overrideMwServices(); $this->assertEquals( [ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ], Revision::userJoinCond() @@ -1041,7 +1038,6 @@ class RevisionQueryInfoTest extends MediaWikiTestCase { */ public function testRevisionGetArchiveQueryInfo( $migrationStageSettings, $expected ) { $this->setMwGlobals( $migrationStageSettings ); - $this->overrideMwServices(); $queryInfo = Revision::getArchiveQueryInfo(); $this->assertQueryInfoEquals( $expected, $queryInfo ); @@ -1053,7 +1049,6 @@ class RevisionQueryInfoTest extends MediaWikiTestCase { */ public function testRevisionGetQueryInfo( $migrationStageSettings, $options, $expected ) { $this->setMwGlobals( $migrationStageSettings ); - $this->overrideMwServices(); $queryInfo = Revision::getQueryInfo( $options ); $this->assertQueryInfoEquals( $expected, $queryInfo ); @@ -1065,7 +1060,6 @@ class RevisionQueryInfoTest extends MediaWikiTestCase { */ public function testRevisionStoreGetQueryInfo( $migrationStageSettings, $options, $expected ) { $this->setMwGlobals( $migrationStageSettings ); - $this->overrideMwServices(); $store = MediaWikiServices::getInstance()->getRevisionStore(); @@ -1083,7 +1077,6 @@ class RevisionQueryInfoTest extends MediaWikiTestCase { $expected ) { $this->setMwGlobals( $migrationStageSettings ); - $this->overrideMwServices(); $store = MediaWikiServices::getInstance()->getRevisionStore(); @@ -1097,7 +1090,6 @@ class RevisionQueryInfoTest extends MediaWikiTestCase { */ public function testRevisionStoreGetArchiveQueryInfo( $migrationStageSettings, $expected ) { $this->setMwGlobals( $migrationStageSettings ); - $this->overrideMwServices(); $store = MediaWikiServices::getInstance()->getRevisionStore(); diff --git a/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php b/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php index d4393dd3f6..55bfab7d81 100644 --- a/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php +++ b/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php @@ -83,8 +83,6 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { 'wgContentHandlerUseDB' => $this->getContentHandlerUseDB(), 'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_NEW, ] ); - - $this->overrideMwServices(); } protected function addCoreDBData() { @@ -403,7 +401,6 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { $title = $this->getTestPageTitle(); $rev = $this->getRevisionRecordFromDetailsArray( $revDetails ); - $this->overrideMwServices(); $store = MediaWikiServices::getInstance()->getRevisionStore(); $return = $store->insertRevisionOn( $rev, wfGetDB( DB_MASTER ) ); @@ -480,7 +477,6 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { 'user' => true, ]; - $this->overrideMwServices(); $store = MediaWikiServices::getInstance()->getRevisionStore(); // Insert the first revision @@ -594,8 +590,6 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { * @covers \MediaWiki\Revision\RevisionStore::findSlotContentId */ public function testNewNullRevision( Title $title, $revDetails, $comment, $minor = false ) { - $this->overrideMwServices(); - $user = TestUserRegistry::getMutableTestUser( __METHOD__ )->getUser(); $page = WikiPage::factory( $title ); @@ -1021,7 +1015,6 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { */ public function testNewRevisionFromRow_anonEdit_legacyEncoding() { $this->setMwGlobals( 'wgLegacyEncoding', 'windows-1252' ); - $this->overrideMwServices(); $page = $this->getTestPage(); $text = __METHOD__ . 'a-ä'; /** @var Revision $rev */ @@ -1101,7 +1094,6 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { */ public function testNewRevisionFromArchiveRow_legacyEncoding() { $this->setMwGlobals( 'wgLegacyEncoding', 'windows-1252' ); - $this->overrideMwServices(); $store = MediaWikiServices::getInstance()->getRevisionStore(); $title = Title::newFromText( __METHOD__ ); $text = __METHOD__ . '-bä'; @@ -1797,7 +1789,6 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { public function testGetKnownCurrentRevision_userNameChange() { global $wgActorTableSchemaMigrationStage; - $this->overrideMwServices(); $cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] ); $this->setService( 'MainWANObjectCache', $cache ); @@ -1838,7 +1829,6 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { * @covers \MediaWiki\Revision\RevisionStore::getKnownCurrentRevision */ public function testGetKnownCurrentRevision_revDelete() { - $this->overrideMwServices(); $cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] ); $this->setService( 'MainWANObjectCache', $cache ); diff --git a/tests/phpunit/includes/RevisionDbTestBase.php b/tests/phpunit/includes/RevisionDbTestBase.php index 83e8d8506f..7b334ee409 100644 --- a/tests/phpunit/includes/RevisionDbTestBase.php +++ b/tests/phpunit/includes/RevisionDbTestBase.php @@ -95,8 +95,6 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase { 'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_NEW, ] ); - $this->overrideMwServices(); - if ( !$this->testPage ) { /** * We have to create a new page for each subclass as the page creation may result diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php index d62e4c7402..865bd31bb1 100644 --- a/tests/phpunit/includes/RevisionTest.php +++ b/tests/phpunit/includes/RevisionTest.php @@ -281,7 +281,6 @@ class RevisionTest extends MediaWikiTestCase { * @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray */ public function testConstructFromRowWithBadPageId() { - $this->overrideMwServices(); Wikimedia\suppressWarnings(); $rev = new Revision( (object)[ 'rev_page' => 77777777, @@ -603,7 +602,6 @@ class RevisionTest extends MediaWikiTestCase { */ public function testLoadFromTitle() { $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_NEW ); - $this->overrideMwServices(); $title = $this->getMockTitle(); $conditions = [ diff --git a/tests/phpunit/includes/TitlePermissionTest.php b/tests/phpunit/includes/TitlePermissionTest.php index 91c4a13873..6c17bf5bce 100644 --- a/tests/phpunit/includes/TitlePermissionTest.php +++ b/tests/phpunit/includes/TitlePermissionTest.php @@ -72,7 +72,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase { $this->user = $this->userUser; } - $this->resetServices(); } protected function setTitle( $ns, $title = "Main_Page" ) { @@ -329,9 +328,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase { global $wgGroupPermissions; $old = $wgGroupPermissions; - $wgGroupPermissions = []; - - $this->resetServices(); + $this->setMwGlobals( 'wgGroupPermissions', [] ); $this->assertEquals( $check[$action][1], $this->title->getUserPermissionsErrors( $action, $this->user, true ) ); @@ -340,8 +337,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase { $this->assertEquals( $check[$action][1], $this->title->getUserPermissionsErrors( $action, $this->user, 'secure' ) ); - $wgGroupPermissions = $old; - $this->resetServices(); + $this->setMwGlobals( 'wgGroupPermissions', $old ); $this->overrideUserPermissions( $this->user, $action ); $this->assertEquals( $check[$action][2], @@ -361,8 +357,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase { } protected function runGroupPermissions( $action, $result, $result2 = null ) { - global $wgGroupPermissions; - if ( $result2 === null ) { $result2 = $result; } @@ -375,30 +369,26 @@ class TitlePermissionTest extends MediaWikiLangTestCase { $userPermsOverrides = MediaWikiServices::getInstance()->getPermissionManager() ->getUserPermissions( $this->user ); - $wgGroupPermissions['autoconfirmed']['move'] = false; - $wgGroupPermissions['user']['move'] = false; - $this->resetServices(); + $this->setGroupPermissions( 'autoconfirmed', 'move', false ); + $this->setGroupPermissions( 'user', 'move', false ); $this->overrideUserPermissions( $this->user, $userPermsOverrides ); $res = $this->title->getUserPermissionsErrors( $action, $this->user ); $this->assertEquals( $result, $res ); - $wgGroupPermissions['autoconfirmed']['move'] = true; - $wgGroupPermissions['user']['move'] = false; - $this->resetServices(); + $this->setGroupPermissions( 'autoconfirmed', 'move', true ); + $this->setGroupPermissions( 'user', 'move', false ); $this->overrideUserPermissions( $this->user, $userPermsOverrides ); $res = $this->title->getUserPermissionsErrors( $action, $this->user ); $this->assertEquals( $result2, $res ); - $wgGroupPermissions['autoconfirmed']['move'] = true; - $wgGroupPermissions['user']['move'] = true; - $this->resetServices(); + $this->setGroupPermissions( 'autoconfirmed', 'move', true ); + $this->setGroupPermissions( 'user', 'move', true ); $this->overrideUserPermissions( $this->user, $userPermsOverrides ); $res = $this->title->getUserPermissionsErrors( $action, $this->user ); $this->assertEquals( $result2, $res ); - $wgGroupPermissions['autoconfirmed']['move'] = false; - $wgGroupPermissions['user']['move'] = true; - $this->resetServices(); + $this->setGroupPermissions( 'autoconfirmed', 'move', false ); + $this->setGroupPermissions( 'user', 'move', true ); $this->overrideUserPermissions( $this->user, $userPermsOverrides ); $res = $this->title->getUserPermissionsErrors( $action, $this->user ); $this->assertEquals( $result2, $res ); @@ -906,7 +896,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase { 'wgEmailAuthentication' => true, 'wgBlockDisablesLogin' => false, ] ); - $this->resetServices(); $this->overrideUserPermissions( $this->user, @@ -921,7 +910,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase { $this->title->getUserPermissionsErrors( 'edit', $this->user ) ); $this->setMwGlobals( 'wgEmailConfirmToEdit', false ); - $this->resetServices(); $this->overrideUserPermissions( $this->user, [ 'createpage', 'edit', 'move', 'rollback', 'patrol', 'upload', 'purge' ] @@ -1088,7 +1076,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase { ], ], ] ); - $this->resetServices(); $now = time(); $this->user->mBlockedby = $this->user->getName(); diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php index 6cfc3779fb..18faeea3fc 100644 --- a/tests/phpunit/includes/TitleTest.php +++ b/tests/phpunit/includes/TitleTest.php @@ -150,9 +150,6 @@ class TitleTest extends MediaWikiTestCase { ] ] ] ); - - // Reset services since we modified $wgLocalInterwikis - $this->overrideMwServices(); } /** diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php index c2917b66b9..2d19d3817b 100644 --- a/tests/phpunit/includes/api/ApiBlockTest.php +++ b/tests/phpunit/includes/api/ApiBlockTest.php @@ -150,8 +150,6 @@ class ApiBlockTest extends ApiTestCase { $this->setMwGlobals( 'wgRevokePermissions', [ 'user' => [ 'applychangetags' => true ] ] ); - $this->resetServices(); - $this->doBlock( [ 'tags' => 'custom tag' ] ); } @@ -162,7 +160,6 @@ class ApiBlockTest extends ApiTestCase { $this->mergeMwGlobalArrayValue( 'wgGroupPermissions', [ 'sysop' => $newPermissions ] ); - $this->resetServices(); $res = $this->doBlock( [ 'hidename' => '' ] ); $dbw = wfGetDB( DB_MASTER ); @@ -212,8 +209,6 @@ class ApiBlockTest extends ApiTestCase { $this->setMwGlobals( 'wgRevokePermissions', [ 'sysop' => [ 'blockemail' => true ] ] ); - $this->resetServices(); - $this->doBlock( [ 'noemail' => '' ] ); } diff --git a/tests/phpunit/includes/api/ApiDeleteTest.php b/tests/phpunit/includes/api/ApiDeleteTest.php index cc5dadaa93..c68954c077 100644 --- a/tests/phpunit/includes/api/ApiDeleteTest.php +++ b/tests/phpunit/includes/api/ApiDeleteTest.php @@ -143,7 +143,6 @@ class ApiDeleteTest extends ApiTestCase { ChangeTags::defineTag( 'custom tag' ); $this->setMwGlobals( 'wgRevokePermissions', [ 'user' => [ 'applychangetags' => true ] ] ); - $this->resetServices(); $this->editPage( $name, 'Some text' ); diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php index 5e5fea321f..aafb3a2d3a 100644 --- a/tests/phpunit/includes/api/ApiEditPageTest.php +++ b/tests/phpunit/includes/api/ApiEditPageTest.php @@ -39,7 +39,6 @@ class ApiEditPageTest extends ApiTestCase { $this->tablesUsed, [ 'change_tag', 'change_tag_def', 'logging' ] ); - $this->resetServices(); } public function testEdit() { @@ -1368,8 +1367,6 @@ class ApiEditPageTest extends ApiTestCase { ChangeTags::defineTag( 'custom tag' ); $this->setMwGlobals( 'wgRevokePermissions', [ 'user' => [ 'applychangetags' => true ] ] ); - // Supply services with updated globals - $this->resetServices(); try { $this->doApiRequestWithToken( [ @@ -1498,8 +1495,6 @@ class ApiEditPageTest extends ApiTestCase { $this->setMwGlobals( 'wgRevokePermissions', [ 'user' => [ 'upload' => true ] ] ); - // Supply services with updated globals - $this->resetServices(); $this->doApiRequestWithToken( [ 'action' => 'edit', @@ -1515,8 +1510,6 @@ class ApiEditPageTest extends ApiTestCase { 'The content you supplied exceeds the article size limit of 1 kilobyte.' ); $this->setMwGlobals( 'wgMaxArticleSize', 1 ); - // Supply services with updated globals - $this->resetServices(); $text = str_repeat( '!', 1025 ); @@ -1534,8 +1527,6 @@ class ApiEditPageTest extends ApiTestCase { 'The action you have requested is limited to users in the group: ' ); $this->setMwGlobals( 'wgRevokePermissions', [ '*' => [ 'edit' => true ] ] ); - // Supply services with updated globals - $this->resetServices(); $this->doApiRequestWithToken( [ 'action' => 'edit', @@ -1552,8 +1543,6 @@ class ApiEditPageTest extends ApiTestCase { $this->setMwGlobals( 'wgRevokePermissions', [ 'user' => [ 'editcontentmodel' => true ] ] ); - // Supply services with updated globals - $this->resetServices(); $this->doApiRequestWithToken( [ 'action' => 'edit', diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php index 580efcd933..1e2135b836 100644 --- a/tests/phpunit/includes/api/ApiMainTest.php +++ b/tests/phpunit/includes/api/ApiMainTest.php @@ -141,7 +141,6 @@ class ApiMainTest extends ApiTestCase { public function testSetCacheModeUnrecognized() { $api = new ApiMain(); $api->setCacheMode( 'unrecognized' ); - $this->resetServices(); $this->assertSame( 'private', TestingAccessWrapper::newFromObject( $api )->mCacheMode, diff --git a/tests/phpunit/includes/api/ApiMoveTest.php b/tests/phpunit/includes/api/ApiMoveTest.php index c98308cc88..e09e6ad7bb 100644 --- a/tests/phpunit/includes/api/ApiMoveTest.php +++ b/tests/phpunit/includes/api/ApiMoveTest.php @@ -294,7 +294,6 @@ class ApiMoveTest extends ApiTestCase { $name = ucfirst( __FUNCTION__ ); $this->mergeMwGlobalArrayValue( 'wgNamespacesWithSubpages', [ NS_MAIN => true ] ); - $this->resetServices(); $pages = [ $name, "$name/1", "$name/2", "Talk:$name", "Talk:$name/1", "Talk:$name/3" ]; $ids = []; diff --git a/tests/phpunit/includes/api/ApiParseTest.php b/tests/phpunit/includes/api/ApiParseTest.php index a87160a1d8..06b4cf257a 100644 --- a/tests/phpunit/includes/api/ApiParseTest.php +++ b/tests/phpunit/includes/api/ApiParseTest.php @@ -121,7 +121,6 @@ class ApiParseTest extends ApiTestCase { $this->setMwGlobals( 'wgExtraInterlanguageLinkPrefixes', [ 'madeuplanguage' ] ); $this->tablesUsed[] = 'interwiki'; - $this->resetServices(); } /** diff --git a/tests/phpunit/includes/api/ApiUserrightsTest.php b/tests/phpunit/includes/api/ApiUserrightsTest.php index 0d7ad0c502..92804fdfaf 100644 --- a/tests/phpunit/includes/api/ApiUserrightsTest.php +++ b/tests/phpunit/includes/api/ApiUserrightsTest.php @@ -37,8 +37,6 @@ class ApiUserrightsTest extends ApiTestCase { if ( $remove ) { $this->mergeMwGlobalArrayValue( 'wgRemoveGroups', [ 'bureaucrat' => $remove ] ); } - - $this->resetServices(); } /** @@ -221,7 +219,6 @@ class ApiUserrightsTest extends ApiTestCase { ChangeTags::defineTag( 'custom tag' ); $this->setGroupPermissions( 'user', 'applychangetags', false ); - $this->resetServices(); $this->doFailedRightsChange( 'You do not have permission to apply change tags along with your changes.', diff --git a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php index 92c71bd59d..301ed100b5 100644 --- a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php @@ -11,13 +11,11 @@ class ApiQueryUserContribsTest extends ApiTestCase { global $wgActorTableSchemaMigrationStage; $reset = new \Wikimedia\ScopedCallback( function ( $v ) { - global $wgActorTableSchemaMigrationStage; - $wgActorTableSchemaMigrationStage = $v; - $this->overrideMwServices(); + $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', $v ); }, [ $wgActorTableSchemaMigrationStage ] ); // Needs to WRITE_BOTH so READ_OLD tests below work. READ mode here doesn't really matter. - $wgActorTableSchemaMigrationStage = SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW; - $this->overrideMwServices(); + $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', + SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW ); $users = [ User::newFromName( '192.168.2.2', false ), @@ -55,7 +53,6 @@ class ApiQueryUserContribsTest extends ApiTestCase { $this->markTestSkippedIfDbType( 'sqlite' ); $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', $stage ); - $this->overrideMwServices(); if ( isset( $params['ucuserids'] ) ) { $params['ucuserids'] = implode( '|', array_map( 'User::idFromName', $params['ucuserids'] ) ); @@ -150,7 +147,6 @@ class ApiQueryUserContribsTest extends ApiTestCase { */ public function testInterwikiUser( $stage ) { $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', $stage ); - $this->overrideMwServices(); $params = [ 'action' => 'query', diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php index 16d9d530e0..f8be1d437f 100644 --- a/tests/phpunit/includes/auth/AuthManagerTest.php +++ b/tests/phpunit/includes/auth/AuthManagerTest.php @@ -1473,12 +1473,10 @@ class AuthManagerTest extends \MediaWikiTestCase { ], 'wgProxyWhitelist' => [], ] ); - $this->resetServices(); $status = $this->manager->checkAccountCreatePermissions( new \User ); $this->assertFalse( $status->isOK() ); $this->assertTrue( $status->hasMessage( 'sorbs_create_account_reason' ) ); $this->setMwGlobals( 'wgProxyWhitelist', [ '127.0.0.1' ] ); - $this->resetServices(); $status = $this->manager->checkAccountCreatePermissions( new \User ); $this->assertTrue( $status->isGood() ); } @@ -2366,8 +2364,6 @@ class AuthManagerTest extends \MediaWikiTestCase { $this->mergeMwGlobalArrayValue( 'wgObjectCaches', [ __METHOD__ => [ 'class' => 'HashBagOStuff' ] ] ); $this->setMwGlobals( [ 'wgMainCacheType' => __METHOD__ ] ); - // Supply services with updated globals - $this->resetServices(); // Set up lots of mocks... $mocks = []; diff --git a/tests/phpunit/includes/block/BlockManagerTest.php b/tests/phpunit/includes/block/BlockManagerTest.php index e085d88fa2..d4133b7f93 100644 --- a/tests/phpunit/includes/block/BlockManagerTest.php +++ b/tests/phpunit/includes/block/BlockManagerTest.php @@ -48,7 +48,6 @@ class BlockManagerTest extends MediaWikiTestCase { private function getBlockManagerConstructorArgs( $overrideConfig ) { $blockManagerConfig = array_merge( $this->blockManagerConfig, $overrideConfig ); $this->setMwGlobals( $blockManagerConfig ); - $this->overrideMwServices(); return [ new LoggedServiceOptions( self::$serviceOptionsAccessLog, diff --git a/tests/phpunit/includes/cache/MessageCacheTest.php b/tests/phpunit/includes/cache/MessageCacheTest.php index 74ad84ade6..7abddd44ad 100644 --- a/tests/phpunit/includes/cache/MessageCacheTest.php +++ b/tests/phpunit/includes/cache/MessageCacheTest.php @@ -24,7 +24,6 @@ class MessageCacheTest extends MediaWikiLangTestCase { // let's choose e.g. German (de) $this->setUserLang( 'de' ); $this->setContentLang( 'de' ); - $this->resetServices(); } function addDBDataOnce() { @@ -150,7 +149,6 @@ class MessageCacheTest extends MediaWikiLangTestCase { ] ] ] ); - $this->overrideMwServices(); $messageCache = MessageCache::singleton(); $messageCache->enable(); diff --git a/tests/phpunit/includes/filerepo/RepoGroupTest.php b/tests/phpunit/includes/filerepo/RepoGroupTest.php index 67de6982e6..04452f2259 100644 --- a/tests/phpunit/includes/filerepo/RepoGroupTest.php +++ b/tests/phpunit/includes/filerepo/RepoGroupTest.php @@ -7,7 +7,6 @@ class RepoGroupTest extends MediaWikiTestCase { function testHasForeignRepoNegative() { $this->setMwGlobals( 'wgForeignFileRepos', [] ); - $this->overrideMwServices(); FileBackendGroup::destroySingleton(); $this->assertFalse( RepoGroup::singleton()->hasForeignRepos() ); } @@ -27,7 +26,6 @@ class RepoGroupTest extends MediaWikiTestCase { function testForEachForeignRepoNone() { $this->setMwGlobals( 'wgForeignFileRepos', [] ); - $this->overrideMwServices(); FileBackendGroup::destroySingleton(); $fakeCallback = $this->createMock( RepoGroupTestHelper::class ); $fakeCallback->expects( $this->never() )->method( 'callback' ); @@ -48,7 +46,6 @@ class RepoGroupTest extends MediaWikiTestCase { 'apiThumbCacheExpiry' => 86400, 'directory' => $wgUploadDirectory ] ] ); - $this->overrideMwServices(); FileBackendGroup::destroySingleton(); } } diff --git a/tests/phpunit/includes/interwiki/InterwikiTest.php b/tests/phpunit/includes/interwiki/InterwikiTest.php index d2c9a327e0..88ac923796 100644 --- a/tests/phpunit/includes/interwiki/InterwikiTest.php +++ b/tests/phpunit/includes/interwiki/InterwikiTest.php @@ -51,7 +51,6 @@ class InterwikiTest extends MediaWikiTestCase { } private function setWgInterwikiCache( $interwikiCache ) { - $this->overrideMwServices(); MediaWikiServices::getInstance()->resetServiceForTesting( 'InterwikiLookup' ); $this->setMwGlobals( 'wgInterwikiCache', $interwikiCache ); } diff --git a/tests/phpunit/includes/objectcache/ObjectCacheTest.php b/tests/phpunit/includes/objectcache/ObjectCacheTest.php index 9aa0712dd6..7f52ca6039 100644 --- a/tests/phpunit/includes/objectcache/ObjectCacheTest.php +++ b/tests/phpunit/includes/objectcache/ObjectCacheTest.php @@ -102,7 +102,6 @@ class ObjectCacheTest extends MediaWikiTestCase { /** @covers ObjectCache::newAnything */ public function testNewAnythingNothingNoDb() { - $this->overrideMwServices(); MediaWiki\MediaWikiServices::disableStorageBackend(); $this->assertInstanceOf( diff --git a/tests/phpunit/includes/page/PageArchiveTestBase.php b/tests/phpunit/includes/page/PageArchiveTestBase.php index 42edf3803b..bcbc1eda19 100644 --- a/tests/phpunit/includes/page/PageArchiveTestBase.php +++ b/tests/phpunit/includes/page/PageArchiveTestBase.php @@ -83,13 +83,11 @@ abstract class PageArchiveTestBase extends MediaWikiTestCase { $this->tablesUsed += $this->getMcrTablesToReset(); - $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_NEW ); - $this->setMwGlobals( 'wgContentHandlerUseDB', $this->getContentHandlerUseDB() ); - $this->setMwGlobals( - 'wgMultiContentRevisionSchemaMigrationStage', - $this->getMcrMigrationStage() - ); - $this->overrideMwServices(); + $this->setMwGlobals( [ + 'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_NEW, + 'wgContentHandlerUseDB' => $this->getContentHandlerUseDB(), + 'wgMultiContentRevisionSchemaMigrationStage' => $this->getMcrMigrationStage(), + ] ); // First create our dummy page $page = Title::newFromText( 'PageArchiveTest_thePage' ); diff --git a/tests/phpunit/includes/page/WikiPageDbTestBase.php b/tests/phpunit/includes/page/WikiPageDbTestBase.php index 30973c8f67..f071e4b198 100644 --- a/tests/phpunit/includes/page/WikiPageDbTestBase.php +++ b/tests/phpunit/includes/page/WikiPageDbTestBase.php @@ -65,8 +65,6 @@ abstract class WikiPageDbTestBase extends MediaWikiLangTestCase { $this->getMcrMigrationStage() ); $this->pagesToDelete = []; - - $this->overrideMwServices(); } protected function tearDown() { diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php index ac4a1ca1bb..428778eebc 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php @@ -18,8 +18,6 @@ class ResourceLoaderTest extends ResourceLoaderTestCase { * @coversNothing */ public function testServiceWiring() { - $this->overrideMwServices(); - $ranHook = 0; $this->setMwGlobals( 'wgHooks', [ 'ResourceLoaderRegisterModules' => [ diff --git a/tests/phpunit/includes/search/SearchEnginePrefixTest.php b/tests/phpunit/includes/search/SearchEnginePrefixTest.php index 372cb33cbb..ed750766d4 100644 --- a/tests/phpunit/includes/search/SearchEnginePrefixTest.php +++ b/tests/phpunit/includes/search/SearchEnginePrefixTest.php @@ -68,8 +68,6 @@ class SearchEnginePrefixTest extends MediaWikiLangTestCase { $this->originalHandlers = TestingAccessWrapper::newFromClass( Hooks::class )->handlers; TestingAccessWrapper::newFromClass( Hooks::class )->handlers = []; - - $this->overrideMwServices(); } public function tearDown() { diff --git a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php index 9d58cef71e..68433c61ed 100644 --- a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php +++ b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php @@ -225,7 +225,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase public function testRcHidemyselfFilter() { $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_NEW ); - $this->overrideMwServices(); $user = $this->getTestUser()->getUser(); $user->getActorId( wfGetDB( DB_MASTER ) ); @@ -258,7 +257,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD ); - $this->overrideMwServices(); $user = $this->getTestUser()->getUser(); $user->getActorId( wfGetDB( DB_MASTER ) ); @@ -289,7 +287,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase public function testRcHidebyothersFilter() { $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_NEW ); - $this->overrideMwServices(); $user = $this->getTestUser()->getUser(); $user->getActorId( wfGetDB( DB_MASTER ) ); @@ -322,7 +319,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD ); - $this->overrideMwServices(); $user = $this->getTestUser()->getUser(); $user->getActorId( wfGetDB( DB_MASTER ) ); @@ -555,7 +551,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase public function testFilterUserExpLevelAllExperienceLevels() { $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_NEW ); - $this->overrideMwServices(); $this->assertConditions( [ @@ -573,7 +568,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD ); - $this->overrideMwServices(); $this->assertConditions( [ @@ -589,7 +583,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase public function testFilterUserExpLevelRegistrered() { $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_NEW ); - $this->overrideMwServices(); $this->assertConditions( [ @@ -607,7 +600,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD ); - $this->overrideMwServices(); $this->assertConditions( [ @@ -623,7 +615,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase public function testFilterUserExpLevelUnregistrered() { $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_NEW ); - $this->overrideMwServices(); $this->assertConditions( [ @@ -641,7 +632,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD ); - $this->overrideMwServices(); $this->assertConditions( [ @@ -657,7 +647,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase public function testFilterUserExpLevelRegistreredOrLearner() { $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_NEW ); - $this->overrideMwServices(); $this->assertConditions( [ @@ -675,7 +664,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD ); - $this->overrideMwServices(); $this->assertConditions( [ @@ -691,7 +679,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase public function testFilterUserExpLevelUnregistreredOrExperienced() { $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_NEW ); - $this->overrideMwServices(); $conds = $this->buildQuery( [ 'userExpLevel' => 'unregistered;experienced' ] ); @@ -707,7 +694,6 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD ); - $this->overrideMwServices(); $conds = $this->buildQuery( [ 'userExpLevel' => 'unregistered;experienced' ] ); diff --git a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php index 04a89d2f15..c0376ad05e 100644 --- a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php +++ b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php @@ -33,7 +33,6 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { $count++; } ] ] ); - $this->overrideMwServices(); $spf = MediaWikiServices::getInstance()->getSpecialPageFactory(); $spf->getNames(); $spf->getNames(); @@ -71,7 +70,6 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { */ public function testGetPage( $spec, $shouldReuseInstance ) { $this->mergeMwGlobalArrayValue( 'wgSpecialPages', [ 'testdummy' => $spec ] ); - $this->overrideMwServices(); $page = SpecialPageFactory::getPage( 'testdummy' ); $this->assertInstanceOf( SpecialPage::class, $page ); @@ -85,7 +83,6 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { */ public function testGetNames() { $this->mergeMwGlobalArrayValue( 'wgSpecialPages', [ 'testdummy' => SpecialAllPages::class ] ); - $this->overrideMwServices(); $names = SpecialPageFactory::getNames(); $this->assertInternalType( 'array', $names ); @@ -97,7 +94,6 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { */ public function testResolveAlias() { $this->setContentLang( 'de' ); - $this->overrideMwServices(); list( $name, $param ) = SpecialPageFactory::resolveAlias( 'Spezialseiten/Foo' ); $this->assertEquals( 'Specialpages', $name ); @@ -109,7 +105,6 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { */ public function testGetLocalNameFor() { $this->setContentLang( 'de' ); - $this->overrideMwServices(); $name = SpecialPageFactory::getLocalNameFor( 'Specialpages', 'Foo' ); $this->assertEquals( 'Spezialseiten/Foo', $name ); @@ -120,7 +115,6 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { */ public function testGetTitleForAlias() { $this->setContentLang( 'de' ); - $this->overrideMwServices(); $title = SpecialPageFactory::getTitleForAlias( 'Specialpages/Foo' ); $this->assertEquals( 'Spezialseiten/Foo', $title->getText() ); @@ -138,7 +132,6 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { $this->setMwGlobals( 'wgSpecialPages', array_combine( array_keys( $aliasesList ), array_keys( $aliasesList ) ) ); - $this->overrideMwServices(); $this->setContentLang( $lang ); // Catch the warnings we expect to be raised @@ -267,7 +260,6 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { } ], ] ); - $this->overrideMwServices(); SpecialPageFactory::getLocalNameFor( 'Specialpages' ); $this->assertTrue( $called, 'Recursive call succeeded' ); } diff --git a/tests/phpunit/includes/title/NamespaceInfoTest.php b/tests/phpunit/includes/title/NamespaceInfoTest.php index 7f97a16dfa..03ba960cbe 100644 --- a/tests/phpunit/includes/title/NamespaceInfoTest.php +++ b/tests/phpunit/includes/title/NamespaceInfoTest.php @@ -1275,7 +1275,6 @@ class NamespaceInfoTest extends MediaWikiTestCase { 'wgRestrictionLevels' => [ '', 'autoconfirmed', 'sysop' ], 'wgAutopromote' => [] ] ); - $this->resetServices(); $obj = $this->newObj(); $user = is_null( $groups ) ? null : $this->getTestUser( $groups )->getUser(); $this->assertSame( $expected, $obj->getRestrictionLevels( $ns, $user ) ); diff --git a/tests/phpunit/includes/user/UserGroupMembershipTest.php b/tests/phpunit/includes/user/UserGroupMembershipTest.php index 340a4c3106..4862747b4f 100644 --- a/tests/phpunit/includes/user/UserGroupMembershipTest.php +++ b/tests/phpunit/includes/user/UserGroupMembershipTest.php @@ -46,8 +46,6 @@ class UserGroupMembershipTest extends MediaWikiTestCase { $this->userTester->addGroup( 'unittesters' ); $this->expiryTime = wfTimestamp( TS_MW, time() + 100500 ); $this->userTester->addGroup( 'testwriters', $this->expiryTime ); - - $this->resetServices(); } /** diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php index 9ff052142f..2d87c78cdc 100644 --- a/tests/phpunit/includes/user/UserTest.php +++ b/tests/phpunit/includes/user/UserTest.php @@ -33,7 +33,6 @@ class UserTest extends MediaWikiTestCase { 'wgRevokePermissions' => [], 'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_NEW, ] ); - $this->overrideMwServices(); $this->setUpPermissionGlobals(); @@ -73,7 +72,6 @@ class UserTest extends MediaWikiTestCase { RequestContext::getMain()->setRequest( $request ); TestingAccessWrapper::newFromObject( $user )->mRequest = $request; $request->getSession()->setUser( $user ); - $this->overrideMwServices(); } /** @@ -136,7 +134,6 @@ class UserTest extends MediaWikiTestCase { $rights = array_diff( $rights, [ 'writetest' ] ); } ); - $this->resetServices(); $rights = $user->getRights(); $this->assertContains( 'test', $rights ); $this->assertContains( 'runtest', $rights ); @@ -1091,7 +1088,6 @@ class UserTest extends MediaWikiTestCase { $this->setMwGlobals( [ 'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD, ] ); - $this->overrideMwServices(); $domain = MediaWikiServices::getInstance()->getDBLoadBalancer()->getLocalDomainID(); $this->hideDeprecated( 'User::selectFields' ); diff --git a/tests/phpunit/tests/MediaWikiTestCaseTest.php b/tests/phpunit/tests/MediaWikiTestCaseTest.php index 37fa03092d..a46f25d512 100644 --- a/tests/phpunit/tests/MediaWikiTestCaseTest.php +++ b/tests/phpunit/tests/MediaWikiTestCaseTest.php @@ -212,7 +212,6 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase { // the actual test: change config, reset services. $this->setMwGlobals( 'wgLanguageCode', 'qqx' ); - $this->resetServices(); // the overridden service instance should still be there $this->assertSame( $myReadOnlyMode, $services->getService( 'ReadOnlyMode' ) ); -- 2.20.1