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 "DumpUploads: output local path instead of mwstore path"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
specials
/
SpecialRecentchangesTest.php
diff --git
a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
index
384b000
..
cc16e5f
100644
(file)
--- a/
tests/phpunit/includes/specials/SpecialRecentchangesTest.php
+++ b/
tests/phpunit/includes/specials/SpecialRecentchangesTest.php
@@
-53,29
+53,29
@@
class SpecialRecentchangesTest extends MediaWikiTestCase {
public function testRcNsFilter() {
$this->assertConditions(
public function testRcNsFilter() {
$this->assertConditions(
-
array(
# expected
+
[
# expected
'rc_bot' => 0,
0 => "rc_type != '6'",
1 => "rc_namespace = '0'",
'rc_bot' => 0,
0 => "rc_type != '6'",
1 => "rc_namespace = '0'",
-
)
,
- array(
+
]
,
+ [
'namespace' => NS_MAIN,
'namespace' => NS_MAIN,
-
)
,
+
]
,
"rc conditions with no options (aka default setting)"
);
}
public function testRcNsFilterInversion() {
$this->assertConditions(
"rc conditions with no options (aka default setting)"
);
}
public function testRcNsFilterInversion() {
$this->assertConditions(
-
array(
# expected
+
[
# expected
'rc_bot' => 0,
0 => "rc_type != '6'",
1 => sprintf( "rc_namespace != '%s'", NS_MAIN ),
'rc_bot' => 0,
0 => "rc_type != '6'",
1 => sprintf( "rc_namespace != '%s'", NS_MAIN ),
-
)
,
- array(
+
]
,
+ [
'namespace' => NS_MAIN,
'invert' => 1,
'namespace' => NS_MAIN,
'invert' => 1,
-
)
,
+
]
,
"rc conditions with namespace inverted"
);
}
"rc conditions with namespace inverted"
);
}
@@
-86,15
+86,15
@@
class SpecialRecentchangesTest extends MediaWikiTestCase {
*/
public function testRcNsFilterAssociation( $ns1, $ns2 ) {
$this->assertConditions(
*/
public function testRcNsFilterAssociation( $ns1, $ns2 ) {
$this->assertConditions(
-
array(
# expected
+
[
# expected
'rc_bot' => 0,
0 => "rc_type != '6'",
1 => sprintf( "(rc_namespace = '%s' OR rc_namespace = '%s')", $ns1, $ns2 ),
'rc_bot' => 0,
0 => "rc_type != '6'",
1 => sprintf( "(rc_namespace = '%s' OR rc_namespace = '%s')", $ns1, $ns2 ),
-
)
,
- array(
+
]
,
+ [
'namespace' => $ns1,
'associated' => 1,
'namespace' => $ns1,
'associated' => 1,
-
)
,
+
]
,
"rc conditions with namespace inverted"
);
}
"rc conditions with namespace inverted"
);
}
@@
-105,16
+105,16
@@
class SpecialRecentchangesTest extends MediaWikiTestCase {
*/
public function testRcNsFilterAssociationWithInversion( $ns1, $ns2 ) {
$this->assertConditions(
*/
public function testRcNsFilterAssociationWithInversion( $ns1, $ns2 ) {
$this->assertConditions(
-
array(
# expected
+
[
# expected
'rc_bot' => 0,
0 => "rc_type != '6'",
1 => sprintf( "(rc_namespace != '%s' AND rc_namespace != '%s')", $ns1, $ns2 ),
'rc_bot' => 0,
0 => "rc_type != '6'",
1 => sprintf( "(rc_namespace != '%s' AND rc_namespace != '%s')", $ns1, $ns2 ),
-
)
,
- array(
+
]
,
+ [
'namespace' => $ns1,
'associated' => 1,
'invert' => 1,
'namespace' => $ns1,
'associated' => 1,
'invert' => 1,
-
)
,
+
]
,
"rc conditions with namespace inverted"
);
}
"rc conditions with namespace inverted"
);
}
@@
-124,9
+124,9
@@
class SpecialRecentchangesTest extends MediaWikiTestCase {
* namespaces association filtering.
*/
public static function provideNamespacesAssociations() {
* namespaces association filtering.
*/
public static function provideNamespacesAssociations() {
- return
array(
# (NS => Associated_NS)
-
array( NS_MAIN, NS_TALK )
,
-
array( NS_TALK, NS_MAIN )
,
-
)
;
+ return
[
# (NS => Associated_NS)
+
[ NS_MAIN, NS_TALK ]
,
+
[ NS_TALK, NS_MAIN ]
,
+
]
;
}
}
}
}