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
API: Migrate Title::userCan() calls to PermissionManager
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
structure
/
ApiStructureTest.php
diff --git
a/tests/phpunit/structure/ApiStructureTest.php
b/tests/phpunit/structure/ApiStructureTest.php
index
95d3b60
..
0d10a20
100644
(file)
--- a/
tests/phpunit/structure/ApiStructureTest.php
+++ b/
tests/phpunit/structure/ApiStructureTest.php
@@
-1,5
+1,6
@@
<?php
<?php
+use MediaWiki\MediaWikiServices;
use Wikimedia\TestingAccessWrapper;
/**
use Wikimedia\TestingAccessWrapper;
/**
@@
-10,6
+11,7
@@
use Wikimedia\TestingAccessWrapper;
* - do not have inconsistencies in the parameter definitions
*
* @group API
* - do not have inconsistencies in the parameter definitions
*
* @group API
+ * @coversNothing
*/
class ApiStructureTest extends MediaWikiTestCase {
*/
class ApiStructureTest extends MediaWikiTestCase {
@@
-499,10
+501,8
@@
class ApiStructureTest extends MediaWikiTestCase {
if ( $value instanceof $type ) {
return;
}
if ( $value instanceof $type ) {
return;
}
- } else {
- if ( gettype( $value ) === $type ) {
- return;
- }
+ } elseif ( gettype( $value ) === $type ) {
+ return;
}
} else {
// Array whose values have specified types, recurse
}
} else {
// Array whose values have specified types, recurse
@@
-567,7
+567,8
@@
class ApiStructureTest extends MediaWikiTestCase {
break;
case 'namespace':
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] )
if (
isset( $config[ApiBase::PARAM_EXTRA_NAMESPACES] ) &&
is_array( $config[ApiBase::PARAM_EXTRA_NAMESPACES] )