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 "Fix sessionfailure i18n message during authentication"
[lhc/web/wiklou.git]
/
includes
/
diff
/
ArrayDiffFormatter.php
diff --git
a/includes/diff/ArrayDiffFormatter.php
b/includes/diff/ArrayDiffFormatter.php
index
331ce7d
..
70a963b
100644
(file)
--- a/
includes/diff/ArrayDiffFormatter.php
+++ b/
includes/diff/ArrayDiffFormatter.php
@@
-29,51
+29,54
@@
* @ingroup DifferenceEngine
*/
class ArrayDiffFormatter extends DiffFormatter {
* @ingroup DifferenceEngine
*/
class ArrayDiffFormatter extends DiffFormatter {
+
/**
/**
- * @param $diff
- * @return array
+ * @param Diff $diff A Diff object.
+ *
+ * @return array[] List of associative arrays, each describing a difference.
*/
public function format( $diff ) {
$oldline = 1;
$newline = 1;
*/
public function format( $diff ) {
$oldline = 1;
$newline = 1;
- $retval =
array()
;
- foreach ( $diff->
edits
as $edit ) {
- switch ( $edit->
type
) {
+ $retval =
[]
;
+ foreach ( $diff->
getEdits()
as $edit ) {
+ switch ( $edit->
getType()
) {
case 'add':
case 'add':
- foreach ( $edit->
closing as $l
) {
- $retval[] =
array(
+ foreach ( $edit->
getClosing() as $line
) {
+ $retval[] =
[
'action' => 'add',
'action' => 'add',
- 'new' => $l,
+ 'new' => $l
ine
,
'newline' => $newline++
'newline' => $newline++
-
)
;
+
]
;
}
break;
case 'delete':
}
break;
case 'delete':
- foreach ( $edit->
orig as $l
) {
- $retval[] =
array(
+ foreach ( $edit->
getOrig() as $line
) {
+ $retval[] =
[
'action' => 'delete',
'action' => 'delete',
- 'old' => $l,
+ 'old' => $l
ine
,
'oldline' => $oldline++,
'oldline' => $oldline++,
-
)
;
+
]
;
}
break;
case 'change':
}
break;
case 'change':
- foreach ( $edit->
orig as $i => $l
) {
- $retval[] =
array(
+ foreach ( $edit->
getOrig() as $key => $line
) {
+ $retval[] =
[
'action' => 'change',
'action' => 'change',
- 'old' => $l,
- 'new' =>
isset( $edit->closing[$i] ) ? $edit->closing[$i] : null
,
+ 'old' => $l
ine
,
+ 'new' =>
$edit->getClosing( $key )
,
'oldline' => $oldline++,
'newline' => $newline++,
'oldline' => $oldline++,
'newline' => $newline++,
-
)
;
+
]
;
}
break;
case 'copy':
}
break;
case 'copy':
- $oldline += count( $edit->
orig
);
- $newline += count( $edit->
orig
);
+ $oldline += count( $edit->
getOrig()
);
+ $newline += count( $edit->
getOrig()
);
}
}
return $retval;
}
}
}
return $retval;
}
+
}
}