Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / diff / ArrayDiffFormatter.php

diff --git a/includes/diff/ArrayDiffFormatter.php b/includes/diff/ArrayDiffFormatter.php
index 543ee18..70a963b 100644 (file)
--- a/includes/diff/ArrayDiffFormatter.php
+++ b/includes/diff/ArrayDiffFormatter.php
@@ -32,41 +32,42 @@ class ArrayDiffFormatter extends DiffFormatter {
 
        /**
         * @param Diff $diff A Diff object.
-        * @return array
+        *
+        * @return array[] List of associative arrays, each describing a difference.
         */
        public function format( $diff ) {
                $oldline = 1;
                $newline = 1;
-               $retval = array();
+               $retval = [];
                foreach ( $diff->getEdits() as $edit ) {
                        switch ( $edit->getType() ) {
                                case 'add':
                                        foreach ( $edit->getClosing() as $line ) {
-                                               $retval[] = array(
+                                               $retval[] = [
                                                        'action' => 'add',
                                                        'new' => $line,
                                                        'newline' => $newline++
-                                               );
+                                               ];
                                        }
                                        break;
                                case 'delete':
                                        foreach ( $edit->getOrig() as $line ) {
-                                               $retval[] = array(
+                                               $retval[] = [
                                                        'action' => 'delete',
                                                        'old' => $line,
                                                        'oldline' => $oldline++,
-                                               );
+                                               ];
                                        }
                                        break;
                                case 'change':
                                        foreach ( $edit->getOrig() as $key => $line ) {
-                                               $retval[] = array(
+                                               $retval[] = [
                                                        'action' => 'change',
                                                        'old' => $line,
                                                        'new' => $edit->getClosing( $key ),
                                                        'oldline' => $oldline++,
                                                        'newline' => $newline++,
-                                               );
+                                               ];
                                        }
                                        break;
                                case 'copy':
@@ -77,4 +78,5 @@ class ArrayDiffFormatter extends DiffFormatter {
 
                return $retval;
        }
+
 }