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
/
logging
/
MergeLogFormatterTest.php
diff --git
a/tests/phpunit/includes/logging/MergeLogFormatterTest.php
b/tests/phpunit/includes/logging/MergeLogFormatterTest.php
index
5a0b906
..
8b9abe4
100644
(file)
--- a/
tests/phpunit/includes/logging/MergeLogFormatterTest.php
+++ b/
tests/phpunit/includes/logging/MergeLogFormatterTest.php
@@
-8,54
+8,54
@@
class MergeLogFormatterTest extends LogFormatterTestCase {
* Do not change the existing data, just add a new database row
*/
public static function provideMergeLogDatabaseRows() {
* Do not change the existing data, just add a new database row
*/
public static function provideMergeLogDatabaseRows() {
- return
array(
+ return
[
// Current format
// Current format
- array(
- array(
+ [
+ [
'type' => 'merge',
'action' => 'merge',
'comment' => 'Merge comment',
'namespace' => NS_MAIN,
'title' => 'OldPage',
'type' => 'merge',
'action' => 'merge',
'comment' => 'Merge comment',
'namespace' => NS_MAIN,
'title' => 'OldPage',
- 'params' =>
array(
+ 'params' =>
[
'4::dest' => 'NewPage',
'5::mergepoint' => '20140804160710',
'4::dest' => 'NewPage',
'5::mergepoint' => '20140804160710',
-
)
,
-
)
,
- array(
+
]
,
+
]
,
+ [
'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)',
'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)',
- 'api' => array(
- 'mergepoint' => '2014-08-04T16:07:10Z',
+ 'api' => [
'dest_ns' => 0,
'dest_title' => 'NewPage',
'dest_ns' => 0,
'dest_title' => 'NewPage',
- ),
- ),
- ),
+ 'mergepoint' => '2014-08-04T16:07:10Z',
+ ],
+ ],
+ ],
// Legacy format
// Legacy format
- array(
- array(
+ [
+ [
'type' => 'merge',
'action' => 'merge',
'comment' => 'merge comment',
'namespace' => NS_MAIN,
'title' => 'OldPage',
'type' => 'merge',
'action' => 'merge',
'comment' => 'merge comment',
'namespace' => NS_MAIN,
'title' => 'OldPage',
- 'params' =>
array(
+ 'params' =>
[
'NewPage',
'20140804160710',
'NewPage',
'20140804160710',
-
)
,
-
)
,
- array(
+
]
,
+
]
,
+ [
'legacy' => true,
'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)',
'legacy' => true,
'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)',
- 'api' => array(
- 'mergepoint' => '2014-08-04T16:07:10Z',
+ 'api' => [
'dest_ns' => 0,
'dest_title' => 'NewPage',
'dest_ns' => 0,
'dest_title' => 'NewPage',
- ),
- ),
- ),
- );
+ 'mergepoint' => '2014-08-04T16:07:10Z',
+ ],
+ ],
+ ],
+ ];
}
/**
}
/**