dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Remove fix for a 5.3 problem"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
api
/
PrefixUniquenessTest.php
diff --git
a/tests/phpunit/includes/api/PrefixUniquenessTest.php
b/tests/phpunit/includes/api/PrefixUniquenessTest.php
index
38beb87
..
d125a7d
100644
(file)
--- 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' );
public function testPrefixes() {
$main = new ApiMain( new FauxRequest() );
$query = new ApiQuery( $main, 'foo', 'bar' );
- $modules = $query->getModuleManager()->getNamesWithClasses();
- $prefixes = array();
+ $moduleManager = $query->getModuleManager();
+
+ $modules = $moduleManager->getNames();
+ $prefixes = [];
+
+ foreach ( $modules as $name ) {
+ $module = $moduleManager->getModule( $name );
+ $class = get_class( $module );
- foreach ( $modules as $name => $class ) {
- /** @var ApiQueryBase $module */
- $module = new $class( $query, $name );
$prefix = $module->getModulePrefix();
$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;
$this->fail( "Module prefix '{$prefix}' is shared between {$class} and {$prefixes[$prefix]}" );
}
$prefixes[$module->getModulePrefix()] = $class;