Merge "Corrected grammatical error."

[lhc/web/wiklou.git] / tests / phpunit / structure / ApiStructureTest.php

diff --git a/tests/phpunit/structure/ApiStructureTest.php b/tests/phpunit/structure/ApiStructureTest.php
index 4c64291..0d10a20 100644 (file)
--- a/tests/phpunit/structure/ApiStructureTest.php
+++ b/tests/phpunit/structure/ApiStructureTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -500,10 +501,8 @@ class ApiStructureTest extends MediaWikiTestCase {
                                                if ( $value instanceof $type ) {
                                                        return;
                                                }
-                                       } else {
-                                               if ( gettype( $value ) === $type ) {
-                                                       return;
-                                               }
+                                       } elseif ( gettype( $value ) === $type ) {
+                                               return;
                                        }
                                } else {
                                        // Array whose values have specified types, recurse
@@ -568,7 +567,8 @@ class ApiStructureTest extends MediaWikiTestCase {
                                break;
 
                        case 'namespace':
-                               $validValues = MWNamespace::getValidNamespaces();
+                               $validValues = MediaWikiServices::getInstance()->getNamespaceInfo()->
+                                       getValidNamespaces();
                                if (
                                        isset( $config[ApiBase::PARAM_EXTRA_NAMESPACES] ) &&
                                        is_array( $config[ApiBase::PARAM_EXTRA_NAMESPACES] )