Revert "1"

This reverts commit 6227cf8.

Author: sebastianbergmann

src/Differ.php

@@ -119,67 +119,41 @@ private function checkIfDiffInOld(array $diff)
      *
      * @return string
      */
-    private function getBuffer(array $diff, array $old, $start, $end)
+    private function getBuffer($diff, $old, $start, $end)
     {
-        $buffer = $this->header;
-
-        if (!isset($old[$start])) {
-            $buffer = $this->getDiffBufferElementNew($diff, $buffer, $start);
-            ++$start;
-        }
-
+        $newChunk = true;
+        $buffer   = $this->header;
         for ($i = $start; $i < $end; $i++) {
             if (isset($old[$i])) {
-                $i      = $old[$i];
-                $buffer = $this->getDiffBufferElementNew($diff, $buffer, $i);
-            } else {
-                $buffer = $this->getDiffBufferElement($diff, $buffer, $i);
+                $buffer .= "\n";
+                $newChunk = true;
+                $i        = $old[$i];
             }
+            $buffer   = $this->getDiffBufferElement($diff, $i, $newChunk, $buffer);
+            $newChunk = false;
         }
 
         return $buffer;
     }
 
-    /**
-     * Gets individual buffer element.
-     *
-     * @param array  $diff
-     * @param string $buffer
-     * @param int    $diffIndex
-     *
-     * @return string
-     */
-    private function getDiffBufferElement(array $diff, $buffer, $diffIndex)
+    private function getDiffBufferElement($diff, $i, $newChunk, $buffer)
     {
-        if ($diff[$diffIndex][1] === 1 /* ADDED */) {
-            $buffer .= '+' . $diff[$diffIndex][0] . "\n";
-        } elseif ($diff[$diffIndex][1] === 2 /* REMOVED */) {
-            $buffer .= '-' . $diff[$diffIndex][0] . "\n";
+        if ($newChunk) {
+            if ($this->showNonDiffLines === true) {
+                $buffer .= "@@ @@\n";
+            }
+        }
+        if ($diff[$i][1] === 1 /* ADDED */) {
+            $buffer .= '+' . $diff[$i][0] . "\n";
+        } elseif ($diff[$i][1] === 2 /* REMOVED */) {
+            $buffer .= '-' . $diff[$i][0] . "\n";
         } elseif ($this->showNonDiffLines === true) {
-            $buffer .= ' ' . $diff[$diffIndex][0] . "\n";
+            $buffer .= ' ' . $diff[$i][0] . "\n";
         }
 
         return $buffer;
     }
 
-    /**
-     * Gets individual buffer element with opening.
-     *
-     * @param array  $diff
-     * @param string $buffer
-     * @param int    $diffIndex
-     *
-     * @return string
-     */
-    private function getDiffBufferElementNew(array $diff, $buffer, $diffIndex)
-    {
-        if ($this->showNonDiffLines === true) {
-            $buffer .= "@@ @@\n";
-        }
-
-        return $this->getDiffBufferElement($diff, $buffer, $diffIndex);
-    }
-
     /**
      * Returns the diff between two arrays or strings as array.
      *

tests/DifferTest.php

@@ -312,6 +312,7 @@ public function textProvider()
  a
 -b
 +p
+
 @@ @@
  i
 -j
@@ -331,6 +332,7 @@ public function textProvider()
  a
 -b
 +p
+
 @@ @@
  i
 -j