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 8f0826b..036b618 100644 (file)
--- a/tests/phpunit/includes/EditPageTest.php
+++ b/tests/phpunit/includes/EditPageTest.php
@@ -16,11 +16,12 @@ class EditPageTest extends MediaWikiLangTestCase {
 
                parent::setUp();
 
 
                parent::setUp();
 

+               $this->setContentLang( $wgContLang );
+

                $this->setMwGlobals( [
                        'wgExtraNamespaces' => $wgExtraNamespaces,
                        'wgNamespaceContentModels' => $wgNamespaceContentModels,
                        'wgContentHandlers' => $wgContentHandlers,
                $this->setMwGlobals( [
                        'wgExtraNamespaces' => $wgExtraNamespaces,
                        'wgNamespaceContentModels' => $wgNamespaceContentModels,
                        'wgContentHandlers' => $wgContentHandlers,

-                       'wgContLang' => $wgContLang,

                ] );
 
                $wgExtraNamespaces[12312] = 'Dummy';
                ] );
 
                $wgExtraNamespaces[12312] = 'Dummy';

diff --git a/tests/phpunit/includes/SampleTest.php b/tests/phpunit/includes/SampleTest.php
index 4747466..22495d0 100644 (file)
--- 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 sets the globals and will restore them automatically
                // after each test.

+               $this->setContentLang( 'en' );

                $this->setMwGlobals( [
                $this->setMwGlobals( [

-                       'wgContLang' => Language::factory( 'en' ),
-                       'wgLanguageCode' => 'en',

                        'wgCapitalLinks' => true,
                ] );
        }
                        'wgCapitalLinks' => true,
                ] );
        }

diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index 3909b30..4febb46 100644 (file)
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -18,11 +18,12 @@ class ApiEditPageTest extends ApiTestCase {
 
                parent::setUp();
 
 
                parent::setUp();
 

+               $this->setContentLang( $wgContLang );
+

                $this->setMwGlobals( [
                        'wgExtraNamespaces' => $wgExtraNamespaces,
                        'wgNamespaceContentModels' => $wgNamespaceContentModels,
                        'wgContentHandlers' => $wgContentHandlers,
                $this->setMwGlobals( [
                        'wgExtraNamespaces' => $wgExtraNamespaces,
                        'wgNamespaceContentModels' => $wgNamespaceContentModels,
                        'wgContentHandlers' => $wgContentHandlers,

-                       'wgContLang' => $wgContLang,

                ] );
 
                $wgExtraNamespaces[12312] = 'Dummy';
                ] );
 
                $wgExtraNamespaces[12312] = 'Dummy';

diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php
index d481eb4..d14ad59 100644 (file)
--- 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' );
                $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();
 
                $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->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();
 
                $user = \User::newFromName( self::usernameForCreation() );
                $user->addToDatabase();

diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php
index 9a1c90f..7c63105 100644 (file)
--- 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() {
         * page.
         */
        public function testGetAutosummary() {

-               $this->setMwGlobals( 'wgContLang', Language::factory( 'en' ) );
+               $this->setContentLang( 'en' );

 
                $content = new DummyContentHandlerForTesting( CONTENT_MODEL_WIKITEXT );
                $title = Title::newFromText( 'Help:Test' );
 
                $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 86b496e..02a4a25 100644 (file)
--- 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' );
                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 ) );
 
                $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 48205f4..29f1c8c 100644 (file)
--- 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' );
 
                $wgLang = Language::factory( 'fr' );
                $wgContLang = Language::factory( 'qqx' );
 

+               $this->setContentLang( $wgContLang );

                $this->setMwGlobals( [
                        'wgUser' => $wgUser,
                        'wgLang' => $wgLang,
                $this->setMwGlobals( [
                        'wgUser' => $wgUser,
                        'wgLang' => $wgLang,

-                       'wgContLang' => $wgContLang,

                ] );
 
                $user = $this->getMutableTestUser()->getUser();
                ] );
 
                $user = $this->getMutableTestUser()->getUser();

diff --git a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php
index 9ac546d..784fed0 100644 (file)
--- 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() {
         * @covers SpecialPageFactory::resolveAlias
         */
        public function testResolveAlias() {

-               $this->setMwGlobals( 'wgContLang', Language::factory( 'de' ) );
+               $this->setContentLang( 'de' );

                SpecialPageFactory::resetList();
 
                list( $name, $param ) = SpecialPageFactory::resolveAlias( 'Spezialseiten/Foo' );
                SpecialPageFactory::resetList();
 
                list( $name, $param ) = SpecialPageFactory::resolveAlias( 'Spezialseiten/Foo' );


@@ -117,7 +117,7 @@ class SpecialPageFactoryTest extends MediaWikiTestCase {
         * @covers SpecialPageFactory::getLocalNameFor
         */
        public function testGetLocalNameFor() {
         * @covers SpecialPageFactory::getLocalNameFor
         */
        public function testGetLocalNameFor() {

-               $this->setMwGlobals( 'wgContLang', Language::factory( 'de' ) );
+               $this->setContentLang( 'de' );

                SpecialPageFactory::resetList();
 
                $name = SpecialPageFactory::getLocalNameFor( 'Specialpages', 'Foo' );
                SpecialPageFactory::resetList();
 
                $name = SpecialPageFactory::getLocalNameFor( 'Specialpages', 'Foo' );


@@ -128,7 +128,7 @@ class SpecialPageFactoryTest extends MediaWikiTestCase {
         * @covers SpecialPageFactory::getTitleForAlias
         */
        public function testGetTitleForAlias() {
         * @covers SpecialPageFactory::getTitleForAlias
         */
        public function testGetTitleForAlias() {

-               $this->setMwGlobals( 'wgContLang', Language::factory( 'de' ) );
+               $this->setContentLang( 'de' );

                SpecialPageFactory::resetList();
 
                $title = SpecialPageFactory::getTitleForAlias( 'Specialpages/Foo' );
                SpecialPageFactory::resetList();
 
                $title = SpecialPageFactory::getTitleForAlias( 'Specialpages/Foo' );


@@ -145,7 +145,7 @@ class SpecialPageFactoryTest extends MediaWikiTestCase {
                global $wgContLang;
                $lang = clone $wgContLang;
                $lang->mExtendedSpecialPageAliases = $aliasesList;
                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 ) )
                );
                $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 2ad3972..2eddb01 100644 (file)
--- 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();
 
        protected function setUp() {
                parent::setUp();
 

+               $this->setContentLang( 'en' );

                $this->setMwGlobals( [
                        'wgScript' => '/index.php',
                $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 d711bac..71e52e8 100644 (file)
--- 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();
 
        protected function setUp() {
                parent::setUp();
 

+               $this->setContentLang( 'en' );

                $this->setMwGlobals( [
                $this->setMwGlobals( [

-                       'wgLanguageCode' => 'en',
-                       'wgContLang' => Language::factory( 'en' ),

                        'wgExtraNamespaces' => [ 100 => 'Portal' ],
                ] );
        }
                        'wgExtraNamespaces' => [ 100 => 'Portal' ],
                ] );
        }

diff --git a/tests/phpunit/includes/title/NamespaceImportTitleFactoryTest.php b/tests/phpunit/includes/title/NamespaceImportTitleFactoryTest.php
index 9b6ac93..ae87276 100644 (file)
--- 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();
 
        protected function setUp() {
                parent::setUp();
 

-               $this->setMwGlobals( [
-                       'wgLanguageCode' => 'en',
-                       'wgContLang' => Language::factory( 'en' ),
-               ] );
+               $this->setContentLang( 'en' );

        }
 
        public function basicProvider() {
        }
 
        public function basicProvider() {

diff --git a/tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php b/tests/phpunit/includes/title/SubpageImportTitleFactoryTest.php
index 008cf5d..7422bdb 100644 (file)
--- 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();
 
        protected function setUp() {
                parent::setUp();
 

+               $this->setContentLang( 'en' );

                $this->setMwGlobals( [
                $this->setMwGlobals( [

-                       'wgLanguageCode' => 'en',
-                       'wgContLang' => Language::factory( 'en' ),

                        'wgNamespacesWithSubpages' => [ 0 => false, 2 => true ],
                ] );
        }
                        'wgNamespacesWithSubpages' => [ 0 => false, 2 => true ],
                ] );
        }

diff --git a/tests/phpunit/languages/LanguageConverterTest.php b/tests/phpunit/languages/LanguageConverterTest.php
index 82ab7de..c97bdaf 100644 (file)
--- 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();
 
        protected function setUp() {
                parent::setUp();
 

+               $this->setContentLang( 'tg' );
+

                $this->setMwGlobals( [
                $this->setMwGlobals( [

-                       'wgContLang' => Language::factory( 'tg' ),
-                       'wgLanguageCode' => 'tg',

                        'wgDefaultLanguageVariant' => false,
                        'wgRequest' => new FauxRequest( [] ),
                        'wgUser' => new User,
                        '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 51a1ed6..000b50f 100644 (file)
--- a/tests/phpunit/maintenance/backup_PageTest.php
+++ b/tests/phpunit/maintenance/backup_PageTest.php
@@ -3,7 +3,6 @@
 namespace MediaWiki\Tests\Maintenance;
 
 use DumpBackup;
 namespace MediaWiki\Tests\Maintenance;
 
 use DumpBackup;

-use Language;

 use Title;
 use WikiExporter;
 use WikiPage;
 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
 
        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';
 
                $this->tablesUsed[] = 'page';
                $this->tablesUsed[] = 'revision';