Merge "Support non-replicating DB clusters for static datasets"

[lhc/web/wiklou.git] / tests / phpunit / includes / ExportTest.php

diff --git a/tests/phpunit/includes/ExportTest.php b/tests/phpunit/includes/ExportTest.php
index 2026030..a2bb97a 100644 (file)
--- a/tests/phpunit/includes/ExportTest.php
+++ b/tests/phpunit/includes/ExportTest.php
@@ -11,11 +11,9 @@ class ExportTest extends MediaWikiLangTestCase {
 
        protected function setUp() {
                parent::setUp();
-               $this->setMwGlobals( array(
-                       'wgContLang' => Language::factory( 'en' ),
-                       'wgLanguageCode' => 'en',
+               $this->setMwGlobals( [
                        'wgCapitalLinks' => true,
-               ) );
+               ] );
        }
 
        /**
@@ -43,28 +41,26 @@ class ExportTest extends MediaWikiLangTestCase {
 
                /**
                 * Check namespaces match xml
-                * FIXME: PHP 5.3 support. When we don't support PHP 5.3,
-                * add ->namespace to object and remove from array
                 */
-               $xmlNamespaces = (array) $xmlObject->siteinfo->namespaces;
-               $xmlNamespaces = str_replace( ' ', '_', $xmlNamespaces['namespace'] );
-               unset ( $xmlNamespaces[ '@attributes' ] );
+               $xmlNamespaces = (array)$xmlObject->siteinfo->namespaces->namespace;
+               $xmlNamespaces = str_replace( ' ', '_', $xmlNamespaces );
+               unset( $xmlNamespaces[ '@attributes' ] );
                foreach ( $xmlNamespaces as &$namespaceObject ) {
                        if ( is_object( $namespaceObject ) ) {
                                $namespaceObject = '';
                        }
                }
 
-               $actualNamespaces = (array) $wgContLang->getNamespaces();
+               $actualNamespaces = (array)$wgContLang->getNamespaces();
                $actualNamespaces = array_values( $actualNamespaces );
                $this->assertEquals( $actualNamespaces, $xmlNamespaces );
 
                // Check xml page title correct
-               $xmlTitle = (array) $xmlObject->page->title;
+               $xmlTitle = (array)$xmlObject->page->title;
                $this->assertEquals( $pageTitle, $xmlTitle[0] );
 
                // Check xml page text is not empty
-               $text = (array) $xmlObject->page->revision->text;
+               $text = (array)$xmlObject->page->revision->text;
                $this->assertNotEquals( '', $text[0] );
        }