X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FPrefixUniquenessTest.php;h=d04766be67a7042d6c942ae694b416b9e6d4927e;hb=17258584bdcec953ad563ecb91ab7ef5e18565f6;hp=38beb87208df07c532965833ea24da86e90e7d61;hpb=01da3da43d18b123fe3679a6af21f046a78180d5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/PrefixUniquenessTest.php b/tests/phpunit/includes/api/PrefixUniquenessTest.php
index 38beb87208..d04766be67 100644
--- a/tests/phpunit/includes/api/PrefixUniquenessTest.php
+++ b/tests/phpunit/includes/api/PrefixUniquenessTest.php
@@ -10,14 +10,17 @@ class PrefixUniquenessTest extends MediaWikiTestCase {
 	public function testPrefixes() {
 		$main = new ApiMain( new FauxRequest() );
 		$query = new ApiQuery( $main, 'foo', 'bar' );
-		$modules = $query->getModuleManager()->getNamesWithClasses();
+		$moduleManager = $query->getModuleManager();
+
+		$modules = $moduleManager->getNames();
 		$prefixes = array();
 
-		foreach ( $modules as $name => $class ) {
-			/** @var ApiQueryBase $module */
-			$module = new $class( $query, $name );
+		foreach ( $modules as $name ) {
+			$module = $moduleManager->getModule( $name );
+			$class = get_class( $module );
+
 			$prefix = $module->getModulePrefix();
-			if ( isset( $prefixes[$prefix] ) ) {
+			if ( $prefix !== '' && isset( $prefixes[$prefix] ) ) {
 				$this->fail( "Module prefix '{$prefix}' is shared between {$class} and {$prefixes[$prefix]}" );
 			}
 			$prefixes[$module->getModulePrefix()] = $class;