From cfc57ed7a3a22906a6cbb076ffb2ef52951f5eed Mon Sep 17 00:00:00 2001 From: addshore Date: Wed, 11 Oct 2017 15:02:38 +0100 Subject: [PATCH] RevisionStorageTest: use MediaWikiTestCase methods for setting globals Change-Id: I8712517b50c5b552fe2d0e248b5735945a98fba4 --- .../phpunit/includes/RevisionStorageTest.php | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) 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(); -- 2.20.1