Show diff lines if line endings differ.

Author: SpacePossum

src/Differ.php

@@ -110,7 +110,7 @@ public function diffToArray($from, $to, LongestCommonSubsequenceCalculator $lcs
 
         if ($this->detectUnmatchedLineEndings($fromMatches, $toMatches)) {
             $diff[] = [
-                '#Warning: Strings contain different line endings!',
+                "#Warning: Strings contain different line endings!\n",
                 3
             ];
         }
@@ -175,7 +175,7 @@ private function getNewLineMatches(string $string): array
      */
     private function splitStringByLines(string $input): array
     {
-        return \preg_split('(\r\n|\r|\n)', $input);
+        return \preg_split('/(.*\R)/', $input, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
     }
 
     /**

src/Output/DiffOnlyOutputBuilder.php

@@ -38,12 +38,21 @@ public function getDiff(array $diff): string
 
         foreach ($diff as $diffEntry) {
             if ($diffEntry[1] === 1 /* ADDED */) {
-                \fwrite($buffer, '+' . $diffEntry[0] . "\n");
+                \fwrite($buffer, '+' . $diffEntry[0]);
             } elseif ($diffEntry[1] === 2 /* REMOVED */) {
-                \fwrite($buffer, '-' . $diffEntry[0] . "\n");
+                \fwrite($buffer, '-' . $diffEntry[0]);
             } elseif ($diffEntry[1] === 3 /* WARNING */) {
-                \fwrite($buffer, ' ' . $diffEntry[0] . "\n");
-            } // else { /* Not changed (old) 0 */
+                \fwrite($buffer, ' ' . $diffEntry[0]);
+
+                continue; // Warnings should not be tested for line break, it will always be there
+            } else { /* Not changed (old) 0 */
+                continue; // we didn't write the non changs line, so do not add a line break either
+            }
+
+            $lc = \substr($diffEntry[0], -1);
+            if ($lc !== "\n" && $lc !== "\r") {
+                \fwrite($buffer, "\n"); // \No newline at end of file
+            }
         }
 
         $diff = \stream_get_contents($buffer, -1, 0);

src/Output/UnifiedDiffOutputBuilder.php

@@ -100,11 +100,20 @@ private function writeDiffBufferElementNew(array $diff, $buffer, int $diffIndex)
     private function writeDiffBufferElement(array $diff, $buffer, int $diffIndex)
     {
         if ($diff[$diffIndex][1] === 1 /* ADDED */) {
-            \fwrite($buffer, '+' . $diff[$diffIndex][0] . "\n");
+            \fwrite($buffer, '+' . $diff[$diffIndex][0]);
         } elseif ($diff[$diffIndex][1] === 2 /* REMOVED */) {
-            \fwrite($buffer, '-' . $diff[$diffIndex][0] . "\n");
-        } else { /* Not changed (OLD) 0 or Warning 3 */
-            \fwrite($buffer, ' ' . $diff[$diffIndex][0] . "\n");
+            \fwrite($buffer, '-' . $diff[$diffIndex][0]);
+        } elseif ($diff[$diffIndex][1] === 3 /* WARNING */) {
+            \fwrite($buffer, ' ' . $diff[$diffIndex][0]);
+
+            return; // Warnings should not be tested for line break, it will always be there
+        } else { /* OLD Not changed (0) */
+            \fwrite($buffer, ' ' . $diff[$diffIndex][0]);
+        }
+
+        $lc = \substr($diff[$diffIndex][0], -1);
+        if ($lc !== "\n" && $lc !== "\r") {
+            \fwrite($buffer, "\n"); // \No newline at end of file
         }
     }
 }

tests/DifferTest.php

@@ -282,20 +282,20 @@ public function arrayProvider(): array
             'test line diff detection' => [
                 [
                     [
-                        '#Warning: Strings contain different line endings!',
+                        "#Warning: Strings contain different line endings!\n",
                         self::WARNING,
                     ],
                     [
-                        '<?php',
-                        self::OLD,
+                        "<?php\r\n",
+                        self::REMOVED,
                     ],
                     [
-                        '',
-                        self::OLD,
+                        "<?php\n",
+                        self::ADDED,
                     ],
                 ],
                 "<?php\r\n",
-                "<?php\n"
+                "<?php\n",
             ]
         ];
     }
@@ -380,6 +380,11 @@ public function textProvider(): array
                 "A\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1",
                 "B\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1",
             ],
+            [
+                "--- Original\n+++ New\n@@ @@\n #Warning: Strings contain different line endings!\n-<?php\r\n+<?php\n A\n",
+                "<?php\r\nA\n",
+                "<?php\nA\n",
+            ],
         ];
     }
 
@@ -415,13 +420,15 @@ public function textForNoNonDiffLinesProvider(): array
     {
         return [
             [
-                ' #Warning: Strings contain different line endings!
--A
-+B
-',
+                " #Warning: Strings contain different line endings!\n-A\r\n+B\n",
                 "A\r\n",
                 "B\n",
             ],
+            [
+                "-A\n+B\n",
+                "\nA",
+                "\nB"
+            ],
             [
                 '',
                 'a',
@@ -545,12 +552,12 @@ public function provideGetCommonChunks(): array
                 "B\n\n\n\n\n\n\nX\nA\nZ\n\n",
             ],
             'same trailing' => [
-                [2 => 15],
+                [2 => 14],
                 "A\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
                 "B\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
             ],
             'same part in between, same trailing' => [
-                [2 => 7, 10 => 16],
+                [2 => 7, 10 => 15],
                 "A\n\n\n\n\n\n\nA\n\n\n\n\n\n\n",
                 "B\n\n\n\n\n\n\nB\n\n\n\n\n\n\n",
             ],
@@ -589,4 +596,84 @@ public function provideGetCommonChunks(): array
             ],
         ];
     }
+
+    /**
+     * @param array  $expected
+     * @param string $input
+     * @dataProvider provideSplitStringByLinesCases
+     */
+    public function testSplitStringByLines(array $expected, string $input)
+    {
+        $reflection = new \ReflectionObject($this->differ);
+        $method     = $reflection->getMethod('splitStringByLines');
+        $method->setAccessible(true);
+
+        $this->assertSame($expected, $method->invoke($this->differ, $input));
+    }
+
+    public function provideSplitStringByLinesCases()
+    {
+        return [
+            [
+                [],
+                ''
+            ],
+            [
+                ['a'],
+                'a'
+            ],
+            [
+                ["a\n"],
+                "a\n"
+            ],
+            [
+                ["a\r"],
+                "a\r"
+            ],
+            [
+                ["a\r\n"],
+                "a\r\n"
+            ],
+            [
+                ["\n"],
+                "\n"
+            ],
+            [
+                ["\r"],
+                "\r"
+            ],
+            [
+                ["\r\n"],
+                "\r\n"
+            ],
+            [
+                [
+                    "A\n",
+                    "B\n",
+                    "\n",
+                    "C\n"
+                ],
+                "A\nB\n\nC\n",
+            ],
+            [
+                [
+                    "A\r\n",
+                    "B\n",
+                    "\n",
+                    "C\r"
+                ],
+                "A\r\nB\n\nC\r",
+            ],
+            [
+                [
+                    "\n",
+                    "A\r\n",
+                    "B\n",
+                    "\n",
+                    'C'
+                ],
+                "\nA\r\nB\n\nC",
+            ],
+        ];
+    }
 }