X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fstructure%2FApiStructureTest.php;h=0d10a20b221ca9f52fc0cd63e0a61c6ef213273e;hb=a88f1d6b58613cbfa5c24c97887197a41ce66908;hp=4c64291b85197cfe3fe5d082ff5135a1cf3bf47c;hpb=314291057be8864871100eaaaa291a9049ca9a65;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/structure/ApiStructureTest.php b/tests/phpunit/structure/ApiStructureTest.php
index 4c64291b85..0d10a20b22 100644
--- 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] )