Merge "Deprecating: Consolidating `progressive` & `constructive` buttons"

[lhc/web/wiklou.git] / tests / phpunit / MediaWikiLangTestCase.php

diff --git a/tests/phpunit/MediaWikiLangTestCase.php b/tests/phpunit/MediaWikiLangTestCase.php
index 0cf6e38..214bcc1 100644 (file)
--- a/tests/phpunit/MediaWikiLangTestCase.php
+++ b/tests/phpunit/MediaWikiLangTestCase.php
@@ -4,7 +4,6 @@
  * Base class that store and restore the Language objects
  */
 abstract class MediaWikiLangTestCase extends MediaWikiTestCase {
-
        protected function setUp() {
                global $wgLanguageCode, $wgContLang;
                parent::setUp();
@@ -15,14 +14,18 @@ abstract class MediaWikiLangTestCase extends MediaWikiTestCase {
                                "\$wgContLang->getCode() (" . $wgContLang->getCode() . ")" );
                }
 
+               // HACK: Call getLanguage() so the real $wgContLang is cached as the user language
+               // rather than our fake one. This is to avoid breaking other, unrelated tests.
+               RequestContext::getMain()->getLanguage();
+
                $langCode = 'en'; # For mainpage to be 'Main Page'
                $langObj = Language::factory( $langCode );
 
-               $this->setMwGlobals( array(
+               $this->setMwGlobals( [
                        'wgLanguageCode' => $langCode,
                        'wgLang' => $langObj,
                        'wgContLang' => $langObj,
-               ) );
+               ] );
 
                MessageCache::singleton()->disable();
        }