Revert "Add an empty line before every header afther the first."

This reverts commit af0ab94.

Author: sebastianbergmann

src/Differ.php

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

@@ -304,46 +304,6 @@ public function textProvider()
                 "A\nB",
                 "A1\nB",
             ],
-            [
-                <<<EOF
---- Original
-+++ New
-@@ @@
- a
--b
-+p
-
-@@ @@
- i
--j
-+w
- k
-
-EOF
-            ,
-                "a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk",
-                "a\np\nc\nd\ne\nf\ng\nh\ni\nw\nk",
-            ],
-            [
-                <<<EOF
---- Original
-+++ New
-@@ @@
- a
--b
-+p
-
-@@ @@
- i
--j
-+w
- k
-
-EOF
-                ,
-                "a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk",
-                "a\np\nc\nd\ne\nf\ng\nh\ni\nw\nk",
-            ],
         ];
     }