X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FMediaWikiLangTestCase.php;h=214bcc11baf5e36b0a5cc8a59450c5700b8e6eb6;hb=734ca2b4d2a1246fb0ea1e54b861ab423ab5e257;hp=0cf6e383e5c360aa103a194a02fba39b18053885;hpb=8b39246edec852455837131ff6145b82970c55d6;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/MediaWikiLangTestCase.php b/tests/phpunit/MediaWikiLangTestCase.php index 0cf6e383e5..214bcc11ba 100644 --- 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(); }