From a8ba0470086f0a80e22a52e8dad23ab4ce66a355 Mon Sep 17 00:00:00 2001 From: DannyS712 Date: Sat, 23 May 2020 03:36:06 +0000 Subject: [PATCH] ParserOptionsTest: Rename non-global variable `$wgLang` Bug: T160814 Change-Id: I281e71e22f335427829e07b9fce25a753e7f5246 --- tests/phpunit/includes/parser/ParserOptionsTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/includes/parser/ParserOptionsTest.php b/tests/phpunit/includes/parser/ParserOptionsTest.php index 6402e71d8a1..4672364a34f 100644 --- a/tests/phpunit/includes/parser/ParserOptionsTest.php +++ b/tests/phpunit/includes/parser/ParserOptionsTest.php @@ -46,13 +46,13 @@ class ParserOptionsTest extends MediaWikiTestCase { public function testNewCanonical() { $user = $this->getMutableTestUser()->getUser(); - $wgLang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'fr' ); + $userLang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'fr' ); $contLang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'qqx' ); $this->setContentLang( $contLang ); $this->setMwGlobals( [ 'wgUser' => $user, - 'wgLang' => $wgLang, + 'wgLang' => $userLang, ] ); $lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'de' ); @@ -64,12 +64,12 @@ class ParserOptionsTest extends MediaWikiTestCase { // No parameters picks up $wgUser and $wgLang $popt = ParserOptions::newCanonical(); $this->assertSame( $user, $popt->getUser() ); - $this->assertSame( $wgLang, $popt->getUserLangObj() ); + $this->assertSame( $userLang, $popt->getUserLangObj() ); // Just a user uses $wgLang $popt = ParserOptions::newCanonical( $user ); $this->assertSame( $user, $popt->getUser() ); - $this->assertSame( $wgLang, $popt->getUserLangObj() ); + $this->assertSame( $userLang, $popt->getUserLangObj() ); // Just a language uses $wgUser $popt = ParserOptions::newCanonical( null, $lang );