From: addshore <addshorewiki@gmail.com>
Date: Wed, 11 Oct 2017 14:02:38 +0000 (+0100)
Subject: RevisionStorageTest: use MediaWikiTestCase methods for setting globals
X-Git-Tag: 1.31.0-rc.0~1804^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=cfc57ed7a3a22906a6cbb076ffb2ef52951f5eed;ds=sidebyside

RevisionStorageTest: use MediaWikiTestCase methods for setting globals

Change-Id: I8712517b50c5b552fe2d0e248b5735945a98fba4
---

diff --git a/tests/phpunit/includes/RevisionStorageTest.php b/tests/phpunit/includes/RevisionStorageTest.php
index d09870061c..a15b9b4407 100644
--- a/tests/phpunit/includes/RevisionStorageTest.php
+++ b/tests/phpunit/includes/RevisionStorageTest.php
@@ -39,15 +39,31 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	}
 
 	protected function setUp() {
-		global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers, $wgContLang;
+		global $wgContLang;
 
 		parent::setUp();
 
-		$wgExtraNamespaces[12312] = 'Dummy';
-		$wgExtraNamespaces[12313] = 'Dummy_talk';
+		$this->mergeMwGlobalArrayValue(
+			'wgExtraNamespaces',
+			[
+				12312 => 'Dummy',
+				12313 => 'Dummy_talk',
+			]
+		);
+
+		$this->mergeMwGlobalArrayValue(
+			'wgNamespaceContentModels',
+			[
+				12312 => 'DUMMY',
+			]
+		);
 
-		$wgNamespaceContentModels[12312] = 'DUMMY';
-		$wgContentHandlers['DUMMY'] = 'DummyContentHandlerForTesting';
+		$this->mergeMwGlobalArrayValue(
+			'wgContentHandlers',
+			[
+				'DUMMY' => 'DummyContentHandlerForTesting',
+			]
+		);
 
 		MWNamespace::clearCaches();
 		// Reset namespace cache
@@ -64,16 +80,10 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	}
 
 	protected function tearDown() {
-		global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers, $wgContLang;
+		global $wgContLang;
 
 		parent::tearDown();
 
-		unset( $wgExtraNamespaces[12312] );
-		unset( $wgExtraNamespaces[12313] );
-
-		unset( $wgNamespaceContentModels[12312] );
-		unset( $wgContentHandlers['DUMMY'] );
-
 		MWNamespace::clearCaches();
 		// Reset namespace cache
 		$wgContLang->resetNamespaces();