Merge "Added a separate error message for mkdir failures"

[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 {
+
        /**
-        * @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;
-               $retval = array();
-               foreach ( $diff->edits as $edit ) {
-                       switch ( $edit->type ) {
+               $retval = [];
+               foreach ( $diff->getEdits() as $edit ) {
+                       switch ( $edit->getType() ) {
                                case 'add':
-                                       foreach ( $edit->closing as $l ) {
-                                               $retval[] = array(
+                                       foreach ( $edit->getClosing() as $line ) {
+                                               $retval[] = [
                                                        'action' => 'add',
-                                                       'new' => $l,
+                                                       'new' => $line,
                                                        'newline' => $newline++
-                                               );
+                                               ];
                                        }
                                        break;
                                case 'delete':
-                                       foreach ( $edit->orig as $l ) {
-                                               $retval[] = array(
+                                       foreach ( $edit->getOrig() as $line ) {
+                                               $retval[] = [
                                                        'action' => 'delete',
-                                                       'old' => $l,
+                                                       'old' => $line,
                                                        'oldline' => $oldline++,
-                                               );
+                                               ];
                                        }
                                        break;
                                case 'change':
-                                       foreach ( $edit->orig as $i => $l ) {
-                                               $retval[] = array(
+                                       foreach ( $edit->getOrig() as $key => $line ) {
+                                               $retval[] = [
                                                        'action' => 'change',
-                                                       'old' => $l,
-                                                       'new' => isset( $edit->closing[$i] ) ? $edit->closing[$i] : null,
+                                                       'old' => $line,
+                                                       'new' => $edit->getClosing( $key ),
                                                        'oldline' => $oldline++,
                                                        'newline' => $newline++,
-                                               );
+                                               ];
                                        }
                                        break;
                                case 'copy':
-                                       $oldline += count( $edit->orig );
-                                       $newline += count( $edit->orig );
+                                       $oldline += count( $edit->getOrig() );
+                                       $newline += count( $edit->getOrig() );
                        }
                }
 
                return $retval;
        }
+
 }