[MediaWiki-commits] [Gerrit] mediawiki...GeoData[master]: Use setMwGlobals() to preserve global state

2016-08-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use setMwGlobals() to preserve global state
..


Use setMwGlobals() to preserve global state

Change-Id: Ia82ef7fbfe48202af743bad5692fa79016ce9c75
---
M tests/phpunit/TagTest.php
1 file changed, 6 insertions(+), 13 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/TagTest.php b/tests/phpunit/TagTest.php
index 0a53e19..73fdfe1 100644
--- a/tests/phpunit/TagTest.php
+++ b/tests/phpunit/TagTest.php
@@ -4,24 +4,18 @@
  * @group GeoData
  */
 class TagTest extends MediaWikiTestCase {
-   private $contLang;
 
public function setUp() {
-   $GLOBALS['wgDefaultDim'] = 1000; // reset to default
-   $this->contLang = $GLOBALS['wgContLang'];
parent::setUp();
-   }
-
-   public function tearDown() {
-   $GLOBALS['wgContLang'] = $this->contLang;
-   parent::tearDown();
+   $this->setMwGlobals( 'wgDefaultDim', 1000 ); // reset to default
}
 
private function setWarnings( $level ) {
global $wgGeoDataWarningLevel;
-   foreach ( array_keys( $wgGeoDataWarningLevel ) as $key ) {
-   $wgGeoDataWarningLevel[$key] = $level;
-   }
+
+   $this->setMwGlobals( 'wgGeoDataWarningLevel',
+   array_fill_keys( array_keys( $wgGeoDataWarningLevel ), 
$level )
+   );
}
 
private function assertParse( $input, $expected ) {
@@ -48,8 +42,7 @@
 */
public function testLooseTagParsing( $input, $expected, $langCode = 
false ) {
if ( $langCode ) {
-   global $wgContLang;
-   $wgContLang = Language::factory( $langCode );
+   $this->setContentLang( $langCode );
}
$this->setWarnings( 'none' );
$this->assertParse( $input, $expected );

-- 
To view, visit https://gerrit.wikimedia.org/r/305434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia82ef7fbfe48202af743bad5692fa79016ce9c75
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...GeoData[master]: Use setMwGlobals() to preserve global state

2016-08-17 Thread MaxSem (Code Review) 
MaxSem has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/305434

Change subject: Use setMwGlobals() to preserve global state
..

Use setMwGlobals() to preserve global state

Change-Id: Ia82ef7fbfe48202af743bad5692fa79016ce9c75
---
M tests/phpunit/TagTest.php
1 file changed, 6 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData 
refs/changes/34/305434/1

diff --git a/tests/phpunit/TagTest.php b/tests/phpunit/TagTest.php
index 0a53e19..b27fc6f 100644
--- a/tests/phpunit/TagTest.php
+++ b/tests/phpunit/TagTest.php
@@ -4,24 +4,18 @@
  * @group GeoData
  */
 class TagTest extends MediaWikiTestCase {
-   private $contLang;
 
public function setUp() {
-   $GLOBALS['wgDefaultDim'] = 1000; // reset to default
-   $this->contLang = $GLOBALS['wgContLang'];
parent::setUp();
-   }
-
-   public function tearDown() {
-   $GLOBALS['wgContLang'] = $this->contLang;
-   parent::tearDown();
+   $this->setMwGlobals( 'wgDefaultDim', 1000 ); // reset to default
}
 
private function setWarnings( $level ) {
global $wgGeoDataWarningLevel;
-   foreach ( array_keys( $wgGeoDataWarningLevel ) as $key ) {
-   $wgGeoDataWarningLevel[$key] = $level;
-   }
+
+   $this->setMwGlobals( 'wgGeoDataWarningLevel',
+   array_fill_keys( array_keys( $wgGeoDataWarningLevel ), 
$level )
+   );
}
 
private function assertParse( $input, $expected ) {
@@ -48,8 +42,7 @@
 */
public function testLooseTagParsing( $input, $expected, $langCode = 
false ) {
if ( $langCode ) {
-   global $wgContLang;
-   $wgContLang = Language::factory( $langCode );
+   $this->setMwGlobals( 'wgContLang', Language::factory( 
$langCode ) );
}
$this->setWarnings( 'none' );
$this->assertParse( $input, $expected );

-- 
To view, visit https://gerrit.wikimedia.org/r/305434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia82ef7fbfe48202af743bad5692fa79016ce9c75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits