From: Aryeh Gregor Date: Wed, 25 Jul 2018 14:57:23 +0000 (+0300) Subject: Use setContentLang() instead of setMwGlobals() X-Git-Tag: 1.34.0-rc.0~4657 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=355e21590ae1c4360fc4ca77d0e9fdc4fe978c88 Use setContentLang() instead of setMwGlobals() This changes behavior in some tests by making them set $wgLanguageCode as well as $wgContLang, but that seems like a good thing. Bug: T200246 Change-Id: I936888f46ff9fefe2707efba837e2ce3a7ca5e3f --- diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php index 8f0826b5e6..036b61826e 100644 --- a/tests/phpunit/includes/EditPageTest.php +++ b/tests/phpunit/includes/EditPageTest.php @@ -16,11 +16,12 @@ class EditPageTest extends MediaWikiLangTestCase { parent::setUp(); + $this->setContentLang( $wgContLang ); + $this->setMwGlobals( [ 'wgExtraNamespaces' => $wgExtraNamespaces, 'wgNamespaceContentModels' => $wgNamespaceContentModels, 'wgContentHandlers' => $wgContentHandlers, - 'wgContLang' => $wgContLang, ] ); $wgExtraNamespaces[12312] = 'Dummy'; diff --git a/tests/phpunit/includes/SampleTest.php b/tests/phpunit/includes/SampleTest.php index 474746626d..22495d0c48 100644 --- a/tests/phpunit/includes/SampleTest.php +++ b/tests/phpunit/includes/SampleTest.php @@ -16,9 +16,8 @@ class SampleTest extends MediaWikiLangTestCase { // This sets the globals and will restore them automatically // after each test. + $this->setContentLang( 'en' ); $this->setMwGlobals( [ - 'wgContLang' => Language::factory( 'en' ), - 'wgLanguageCode' => 'en', 'wgCapitalLinks' => true, ] ); } diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php index 3909b305e5..4febb46f1c 100644 --- a/tests/phpunit/includes/api/ApiEditPageTest.php +++ b/tests/phpunit/includes/api/ApiEditPageTest.php @@ -18,11 +18,12 @@ class ApiEditPageTest extends ApiTestCase { parent::setUp(); + $this->setContentLang( $wgContLang ); + $this->setMwGlobals( [ 'wgExtraNamespaces' => $wgExtraNamespaces, 'wgNamespaceContentModels' => $wgNamespaceContentModels, 'wgContentHandlers' => $wgContentHandlers, - 'wgContLang' => $wgContLang, ] ); $wgExtraNamespaces[12312] = 'Dummy'; diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php index d481eb4064..d14ad59e92 100644 --- a/tests/phpunit/includes/auth/AuthManagerTest.php +++ b/tests/phpunit/includes/auth/AuthManagerTest.php @@ -594,7 +594,7 @@ class AuthManagerTest extends \MediaWikiTestCase { $context = \RequestContext::getMain(); $reset = new ScopedCallback( [ $context, 'setLanguage' ], [ $context->getLanguage() ] ); $context->setLanguage( 'de' ); - $this->setMwGlobals( 'wgContLang', \Language::factory( 'zh' ) ); + $this->setContentLang( 'zh' ); $user = \User::newFromName( self::usernameForCreation() ); $user->addToDatabase(); @@ -614,7 +614,7 @@ class AuthManagerTest extends \MediaWikiTestCase { $this->assertSame( 'de', $user->getOption( 'language' ) ); $this->assertSame( 'zh', $user->getOption( 'variant' ) ); - $this->setMwGlobals( 'wgContLang', \Language::factory( 'fr' ) ); + $this->setContentLang( 'fr' ); $user = \User::newFromName( self::usernameForCreation() ); $user->addToDatabase(); diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php index 9a1c90fc29..7c63105b97 100644 --- a/tests/phpunit/includes/content/ContentHandlerTest.php +++ b/tests/phpunit/includes/content/ContentHandlerTest.php @@ -335,7 +335,7 @@ class ContentHandlerTest extends MediaWikiTestCase { * page. */ public function testGetAutosummary() { - $this->setMwGlobals( 'wgContLang', Language::factory( 'en' ) ); + $this->setContentLang( 'en' ); $content = new DummyContentHandlerForTesting( CONTENT_MODEL_WIKITEXT ); $title = Title::newFromText( 'Help:Test' ); diff --git a/tests/phpunit/includes/parser/MagicVariableTest.php b/tests/phpunit/includes/parser/MagicVariableTest.php index 86b496e2d1..02a4a2583a 100644 --- a/tests/phpunit/includes/parser/MagicVariableTest.php +++ b/tests/phpunit/includes/parser/MagicVariableTest.php @@ -38,10 +38,7 @@ class MagicVariableTest extends MediaWikiTestCase { parent::setUp(); $contLang = Language::factory( 'en' ); - $this->setMwGlobals( [ - 'wgLanguageCode' => 'en', - 'wgContLang' => $contLang, - ] ); + $this->setContentLang( $contLang ); $this->testParser = new Parser(); $this->testParser->Options( ParserOptions::newFromUserAndLang( new User, $contLang ) ); diff --git a/tests/phpunit/includes/parser/ParserOptionsTest.php b/tests/phpunit/includes/parser/ParserOptionsTest.php index 48205f4456..29f1c8c598 100644 --- a/tests/phpunit/includes/parser/ParserOptionsTest.php +++ b/tests/phpunit/includes/parser/ParserOptionsTest.php @@ -47,10 +47,10 @@ class ParserOptionsTest extends MediaWikiTestCase { $wgLang = Language::factory( 'fr' ); $wgContLang = Language::factory( 'qqx' ); + $this->setContentLang( $wgContLang ); $this->setMwGlobals( [ 'wgUser' => $wgUser, 'wgLang' => $wgLang, - 'wgContLang' => $wgContLang, ] ); $user = $this->getMutableTestUser()->getUser(); diff --git a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php index 9ac546dc51..784fed0c5e 100644 --- a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php +++ b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php @@ -105,7 +105,7 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { * @covers SpecialPageFactory::resolveAlias */ public function testResolveAlias() { - $this->setMwGlobals( 'wgContLang', Language::factory( 'de' ) ); + $this->setContentLang( 'de' ); SpecialPageFactory::resetList(); list( $name, $param ) = SpecialPageFactory::resolveAlias( 'Spezialseiten/Foo' ); @@ -117,7 +117,7 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { * @covers SpecialPageFactory::getLocalNameFor */ public function testGetLocalNameFor() { - $this->setMwGlobals( 'wgContLang', Language::factory( 'de' ) ); + $this->setContentLang( 'de' ); SpecialPageFactory::resetList(); $name = SpecialPageFactory::getLocalNameFor( 'Specialpages', 'Foo' ); @@ -128,7 +128,7 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { * @covers SpecialPageFactory::getTitleForAlias */ public function testGetTitleForAlias() { - $this->setMwGlobals( 'wgContLang', Language::factory( 'de' ) ); + $this->setContentLang( 'de' ); SpecialPageFactory::resetList(); $title = SpecialPageFactory::getTitleForAlias( 'Specialpages/Foo' ); @@ -145,7 +145,7 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { global $wgContLang; $lang = clone $wgContLang; $lang->mExtendedSpecialPageAliases = $aliasesList; - $this->setMwGlobals( 'wgContLang', $lang ); + $this->setContentLang( $lang ); $this->setMwGlobals( 'wgSpecialPages', array_combine( array_keys( $aliasesList ), array_keys( $aliasesList ) ) ); diff --git a/tests/phpunit/includes/specialpage/SpecialPageTest.php b/tests/phpunit/includes/specialpage/SpecialPageTest.php index 2ad397299b..2eddb01e8e 100644 --- a/tests/phpunit/includes/specialpage/SpecialPageTest.php +++ b/tests/phpunit/includes/specialpage/SpecialPageTest.php @@ -12,9 +12,9 @@ class SpecialPageTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); + $this->setContentLang( 'en' ); $this->setMwGlobals( [ 'wgScript' => '/index.php', - 'wgContLang' => Language::factory( 'en' ) ] ); } diff --git a/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php index d711bac5f6..71e52e8fed 100644 --- a/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php +++ b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php @@ -29,9 +29,8 @@ class NaiveImportTitleFactoryTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); + $this->setContentLang( 'en' ); $this->setMwGlobals( [ - 'wgLanguageCode' => 'en', - 'wgContLang' => Language::factory( 'en' ), 'wgExtraNamespaces' => [ 100 => 'Portal' ], ] ); } diff --git a/tests/phpunit/includes/title/NamespaceImportTitleFactoryTest.php b/tests/phpunit/includes/title/NamespaceImportTitleFactoryTest.php index 9b6ac93c37..ae8727668e 100644 --- a/tests/phpunit/includes/title/NamespaceImportTitleFactoryTest.php +++ b/tests/phpunit/includes/title/NamespaceImportTitleFactoryTest.php @@ -29,10 +29,7 @@ class NamespaceImportTitleFactoryTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); - $this->setMwGlobals( [ - 'wgLanguageCode' => 'en', - 'wgContLang' => Language::factory( 'en' ), - ] ); + $this->setContentLang( 'en' ); } public function basicProvider() { diff --git a/tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php b/tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php index 008cf5d939..7422bdb738 100644 --- a/tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php +++ b/tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php @@ -29,9 +29,8 @@ class SubpageImportTitleFactoryTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); + $this->setContentLang( 'en' ); $this->setMwGlobals( [ - 'wgLanguageCode' => 'en', - 'wgContLang' => Language::factory( 'en' ), 'wgNamespacesWithSubpages' => [ 0 => false, 2 => true ], ] ); } diff --git a/tests/phpunit/languages/LanguageConverterTest.php b/tests/phpunit/languages/LanguageConverterTest.php index 82ab7def22..c97bdaf278 100644 --- a/tests/phpunit/languages/LanguageConverterTest.php +++ b/tests/phpunit/languages/LanguageConverterTest.php @@ -9,9 +9,9 @@ class LanguageConverterTest extends MediaWikiLangTestCase { protected function setUp() { parent::setUp(); + $this->setContentLang( 'tg' ); + $this->setMwGlobals( [ - 'wgContLang' => Language::factory( 'tg' ), - 'wgLanguageCode' => 'tg', 'wgDefaultLanguageVariant' => false, 'wgRequest' => new FauxRequest( [] ), 'wgUser' => new User, diff --git a/tests/phpunit/maintenance/backup_PageTest.php b/tests/phpunit/maintenance/backup_PageTest.php index 51a1ed6951..000b50f1d7 100644 --- a/tests/phpunit/maintenance/backup_PageTest.php +++ b/tests/phpunit/maintenance/backup_PageTest.php @@ -3,7 +3,6 @@ namespace MediaWiki\Tests\Maintenance; use DumpBackup; -use Language; use Title; use WikiExporter; use WikiPage; @@ -30,10 +29,7 @@ class BackupDumperPageTest extends DumpTestCase { function addDBData() { // be sure, titles created here using english namespace names - $this->setMwGlobals( [ - 'wgLanguageCode' => 'en', - 'wgContLang' => Language::factory( 'en' ), - ] ); + $this->setContentLang( 'en' ); $this->tablesUsed[] = 'page'; $this->tablesUsed[] = 'revision';