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 "Revert "Use display name in category page subheadings if provided""
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
api
/
query
/
ApiQueryContinueTestBase.php
diff --git
a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
index
ce2f70d
..
704c417
100644
(file)
--- a/
tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
+++ b/
tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
@@
-57,14
+57,9
@@
abstract class ApiQueryContinueTestBase extends ApiQueryTestBase {
} else {
$params['action'] = 'query';
}
} else {
$params['action'] = 'query';
}
- if ( $useContinue && !isset( $params['continue'] ) ) {
- $params['continue'] = '';
- } else {
- $params['rawcontinue'] = '1';
- }
$count = 0;
$count = 0;
- $result =
array()
;
- $continue =
array()
;
+ $result =
[]
;
+ $continue =
[]
;
do {
$request = array_merge( $params, $continue );
uksort( $request, function ( $a, $b ) {
do {
$request = array_merge( $params, $continue );
uksort( $request, function ( $a, $b ) {
@@
-75,7
+70,7
@@
abstract class ApiQueryContinueTestBase extends ApiQueryTestBase {
return strcmp( $a, $b );
} );
$reqStr = http_build_query( $request );
return strcmp( $a, $b );
} );
$reqStr = http_build_query( $request );
- //$reqStr = str_replace( '&', ' & ', $reqStr );
+ //
$reqStr = str_replace( '&', ' & ', $reqStr );
$this->assertLessThan( $expectedCount, $count, "$id more data: $reqStr" );
if ( $this->mVerbose ) {
print "$id (#$count): $reqStr\n";
$this->assertLessThan( $expectedCount, $count, "$id more data: $reqStr" );
if ( $this->mVerbose ) {
print "$id (#$count): $reqStr\n";
@@
-95,7
+90,7
@@
abstract class ApiQueryContinueTestBase extends ApiQueryTestBase {
$continue = $data['continue'];
unset( $data['continue'] );
} else {
$continue = $data['continue'];
unset( $data['continue'] );
} else {
- $continue =
array()
;
+ $continue =
[]
;
}
if ( $this->mVerbose ) {
$this->printResult( $data );
}
if ( $this->mVerbose ) {
$this->printResult( $data );
@@
-117,7
+112,7
@@
abstract class ApiQueryContinueTestBase extends ApiQueryTestBase {
*/
private function printResult( $data ) {
$q = $data['query'];
*/
private function printResult( $data ) {
$q = $data['query'];
- $print =
array()
;
+ $print =
[]
;
if ( isset( $q['pages'] ) ) {
foreach ( $q['pages'] as $p ) {
$m = $p['title'];
if ( isset( $q['pages'] ) ) {
foreach ( $q['pages'] as $p ) {
$m = $p['title'];