Avoid @backupGlobals in ExtensionRegistryTest

Change-Id: Ia2c764b1c1ee8cff64e1ccdb863e5ef7534a286a

diff --git a/tests/phpunit/includes/registration/ExtensionRegistryTest.php b/tests/phpunit/includes/registration/ExtensionRegistryTest.php
index f73e5ea..1b24628 100644 (file)
--- a/tests/phpunit/includes/registration/ExtensionRegistryTest.php
+++ b/tests/phpunit/includes/registration/ExtensionRegistryTest.php
@@ -5,14 +5,20 @@ class ExtensionRegistryTest extends MediaWikiTestCase {
        /**
         * @covers ExtensionRegistry::exportExtractedData
         * @dataProvider provideExportExtractedDataGlobals
-        * @backupGlobals enabled
         */
        public function testExportExtractedDataGlobals( $desc, $before, $globals, $expected ) {
+               // Set globals for test
                if ( $before ) {
                        foreach ( $before as $key => $value ) {
-                               $GLOBALS[$key] = $value;
+                               // mw prefixed globals does not exist normally
+                               if ( substr( $key, 0, 2 ) == 'mw' ) {
+                                       $GLOBALS[$key] = $value;
+                               } else {
+                                       $this->setMwGlobals( $key, $value );
+                               }
                        }
                }
+
                $info = array(
                        'globals' => $globals,
                        'callbacks' => array(),
@@ -29,6 +35,15 @@ class ExtensionRegistryTest extends MediaWikiTestCase {
                        $this->assertArrayHasKey( $name, $GLOBALS, $desc );
                        $this->assertEquals( $value, $GLOBALS[$name], $desc );
                }
+
+               // Remove mw prefixed globals
+               if ( $before ) {
+                       foreach ( $before as $key => $value ) {
+                               if ( substr( $key, 0, 2 ) == 'mw' ) {
+                                       unset( $GLOBALS[$key] );
+                               }
+                       }
+               }
        }
 
        public static function provideExportExtractedDataGlobals() {