Fix CS/WS issues

Author: sebastianbergmann

src/Differ.php

@@ -272,6 +272,7 @@ private function getLinebreak($line): string
         }
 
         $lc = \substr($line, -1);
+
         if ("\r" === $lc) {
             return "\r";
         }

src/Output/DiffOnlyOutputBuilder.php

@@ -34,6 +34,7 @@ public function getDiff(array $diff): string
 
         if ('' !== $this->header) {
             \fwrite($buffer, $this->header);
+
             if ("\n" !== \substr($this->header, -1, 1)) {
                 \fwrite($buffer, "\n");
             }
@@ -53,6 +54,7 @@ public function getDiff(array $diff): string
             }
 
             $lc = \substr($diffEntry[0], -1);
+
             if ($lc !== "\n" && $lc !== "\r") {
                 \fwrite($buffer, "\n"); // \No newline at end of file
             }

src/Output/StrictUnifiedDiffOutputBuilder.php

@@ -20,6 +20,15 @@
  */
 final class StrictUnifiedDiffOutputBuilder implements DiffOutputBuilderInterface
 {
+    private static $default = [
+        'collapseRanges'      => true, // ranges of length one are rendered with the trailing `,1`
+        'commonLineThreshold' => 6,    // number of same lines before ending a new hunk and creating a new one (if needed)
+        'contextLines'        => 3,    // like `diff:  -u, -U NUM, --unified[=NUM]`, for patch/git apply compatibility best to keep at least @ 3
+        'fromFile'            => null,
+        'fromFileDate'        => null,
+        'toFile'              => null,
+        'toFileDate'          => null,
+    ];
     /**
      * @var bool
      */
@@ -45,16 +54,6 @@ final class StrictUnifiedDiffOutputBuilder implements DiffOutputBuilderInterface
      */
     private $contextLines;
 
-    private static $default = [
-        'collapseRanges'      => true, // ranges of length one are rendered with the trailing `,1`
-        'commonLineThreshold' => 6,    // number of same lines before ending a new hunk and creating a new one (if needed)
-        'contextLines'        => 3,    // like `diff:  -u, -U NUM, --unified[=NUM]`, for patch/git apply compatibility best to keep at least @ 3
-        'fromFile'            => null,
-        'fromFileDate'        => null,
-        'toFile'              => null,
-        'toFileDate'          => null,
-    ];
-
     public function __construct(array $options = [])
     {
         $options = \array_merge(self::$default, $options);
@@ -137,17 +136,20 @@ private function writeDiffHunks($output, array $diff): void
 
         if (0 === $diff[$upperLimit - 1][1]) {
             $lc = \substr($diff[$upperLimit - 1][0], -1);
+
             if ("\n" !== $lc) {
                 \array_splice($diff, $upperLimit, 0, [["\n\\ No newline at end of file\n", Differ::NO_LINE_END_EOF_WARNING]]);
             }
         } else {
             // search back for the last `+` and `-` line,
             // check if has trailing linebreak, else add under it warning under it
             $toFind = [1 => true, 2 => true];
+
             for ($i = $upperLimit - 1; $i >= 0; --$i) {
                 if (isset($toFind[$diff[$i][1]])) {
                     unset($toFind[$diff[$i][1]]);
                     $lc = \substr($diff[$i][0], -1);
+
                     if ("\n" !== $lc) {
                         \array_splice($diff, $i + 1, 0, [["\n\\ No newline at end of file\n", Differ::NO_LINE_END_EOF_WARNING]]);
                     }
@@ -286,6 +288,7 @@ private function writeHunk(
         }
 
         \fwrite($output, ' +' . $toStart);
+
         if (!$this->collapseRanges || 1 !== $toRange) {
             \fwrite($output, ',' . $toRange);
         }

src/Output/UnifiedDiffOutputBuilder.php

@@ -54,6 +54,7 @@ public function getDiff(array $diff): string
 
         if ('' !== $this->header) {
             \fwrite($buffer, $this->header);
+
             if ("\n" !== \substr($this->header, -1, 1)) {
                 \fwrite($buffer, "\n");
             }
@@ -85,17 +86,20 @@ private function writeDiffHunks($output, array $diff): void
 
         if (0 === $diff[$upperLimit - 1][1]) {
             $lc = \substr($diff[$upperLimit - 1][0], -1);
+
             if ("\n" !== $lc) {
                 \array_splice($diff, $upperLimit, 0, [["\n\\ No newline at end of file\n", Differ::NO_LINE_END_EOF_WARNING]]);
             }
         } else {
             // search back for the last `+` and `-` line,
             // check if has trailing linebreak, else add under it warning under it
             $toFind = [1 => true, 2 => true];
+
             for ($i = $upperLimit - 1; $i >= 0; --$i) {
                 if (isset($toFind[$diff[$i][1]])) {
                     unset($toFind[$diff[$i][1]]);
                     $lc = \substr($diff[$i][0], -1);
+
                     if ("\n" !== $lc) {
                         \array_splice($diff, $i + 1, 0, [["\n\\ No newline at end of file\n", Differ::NO_LINE_END_EOF_WARNING]]);
                     }
@@ -233,6 +237,7 @@ private function writeHunk(
             }
 
             \fwrite($output, ' +' . $toStart);
+
             if (!$this->collapseRanges || 1 !== $toRange) {
                 \fwrite($output, ',' . $toRange);
             }

tests/Utils/FileUtils.php

@@ -15,6 +15,7 @@ final class FileUtils
     public static function getFileContent(string $file): string
     {
         $content = @\file_get_contents($file);
+
         if (false === $content) {
             $error = \error_get_last();
 

tests/Utils/UnifiedDiffAssertTrait.php

@@ -27,6 +27,7 @@ public function assertValidUnifiedDiffFormat(string $diff): void
 
         // test diff ends with a line break
         $last = \substr($diff, -1);
+
         if ("\n" !== $last && "\r" !== $last) {
             throw new \UnexpectedValueException(\sprintf('Expected diff to end with a line break, got "%s".', $last));
         }
@@ -130,6 +131,7 @@ public function assertValidUnifiedDiffFormat(string $diff): void
                 }
 
                 $previousType = $this->unifiedDiffAssertLinePrefix($lines[$lineNumber - 2], \sprintf('Preceding line of "\\ No newline at end of file" of unexpected format. Line %d.', $lineNumber));
+
                 if (isset($endOfLineTypes[$previousType])) {
                     throw new \UnexpectedValueException(\sprintf('Unexpected "\\ No newline at end of file", "%s" was already closed. Line %d.', $type, $lineNumber));
                 }
@@ -190,6 +192,7 @@ private function unifiedDiffAssertLinePrefix(string $line, string $message): str
     private function unifiedDiffAssertStrLength(string $line, int $min, string $message): void
     {
         $length = \strlen($line);
+
         if ($length < $min) {
             throw new \UnexpectedValueException(\sprintf('Expected string length of minimal %d, got %d. %s', $min, $length, $message));
         }