Refactor

Author: sebastianbergmann

src/Differ.php

@@ -12,6 +12,7 @@
 use const PHP_INT_SIZE;
 use const PREG_SPLIT_DELIM_CAPTURE;
 use const PREG_SPLIT_NO_EMPTY;
+use function array_any;
 use function array_shift;
 use function array_unshift;
 use function array_values;
@@ -167,19 +168,11 @@ private function detectUnmatchedLineEndings(array $diff): bool
         }
 
         // two-way compare
-        foreach ($newLineBreaks as $break => $set) {
-            if (!isset($oldLineBreaks[$break])) {
-                return true;
-            }
-        }
-
-        foreach ($oldLineBreaks as $break => $set) {
-            if (!isset($newLineBreaks[$break])) {
-                return true;
-            }
+        if (array_any($newLineBreaks, static fn (bool $set, string $break) => !isset($oldLineBreaks[$break]))) {
+            return true;
         }
 
-        return false;
+        return array_any($oldLineBreaks, static fn (bool $set, string $break) => !isset($newLineBreaks[$break]));
     }
 
     private function getLinebreak(int|string $line): string

tests/Output/AbstractChunkOutputBuilderTest.php

@@ -156,7 +156,7 @@ public function getChunks(array $diff, int $lineThreshold): array
 
         $this->assertSame(
             $expected,
-            $output->getChunks((new Differ(new UnifiedDiffOutputBuilder))->diffToArray($from, $to), $lineThreshold),
+            $output->getChunks(new Differ(new UnifiedDiffOutputBuilder)->diffToArray($from, $to), $lineThreshold),
         );
     }
 }

tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php

@@ -114,7 +114,7 @@ public function testIntegrationUsingPHPFileInVendorGitApply(string $fileFrom, st
         $from = FileUtils::getFileContent($fileFrom);
         $to   = FileUtils::getFileContent($fileTo);
 
-        $diff = (new Differ(new StrictUnifiedDiffOutputBuilder(['fromFile' => 'Original', 'toFile' => 'New'])))->diff($from, $to);
+        $diff = new Differ(new StrictUnifiedDiffOutputBuilder(['fromFile' => 'Original', 'toFile' => 'New']))->diff($from, $to);
 
         if ('' === $diff && $from === $to) {
             // odd case: test after executing as it is more efficient than to read the files and check the contents every time
@@ -132,7 +132,7 @@ public function testIntegrationUsingPHPFileInVendorPatch(string $fileFrom, strin
         $from = FileUtils::getFileContent($fileFrom);
         $to   = FileUtils::getFileContent($fileTo);
 
-        $diff = (new Differ(new StrictUnifiedDiffOutputBuilder(['fromFile' => 'Original', 'toFile' => 'New'])))->diff($from, $to);
+        $diff = new Differ(new StrictUnifiedDiffOutputBuilder(['fromFile' => 'Original', 'toFile' => 'New']))->diff($from, $to);
 
         if ('' === $diff && $from === $to) {
             // odd case: test after executing as it is more efficient than to read the files and check the contents every time