fix: Cleanup filename diff mode

box-project · Oct 11, 2023 · 7c2b127 · 7c2b127
1 parent e5ec207
commit 7c2b127
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 275 deletions.
diff --git a/src/Phar/Differ/FilenameDiffer.php b/src/Phar/Differ/FilenameDiffer.php
@@ -17,13 +17,13 @@
 use Fidry\Console\Input\IO;
 use KevinGH\Box\Console\PharInfoRenderer;
 use KevinGH\Box\Phar\PharInfo;
-use KevinGH\Box\Pharaoh\PharDiff as ParagoniePharDiff;
 use SplFileInfo;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Finder\Finder;
 use function array_diff;
 use function array_map;
 use function array_sum;
+use function count;
 use function explode;
 use function iterator_to_array;
 use function sprintf;
@@ -36,18 +36,16 @@ public function diff(
         PharInfo $pharInfoB,
         IO $io,
     ): void {
-        $paragonieDiff = new ParagoniePharDiff($pharInfoA, $pharInfoB);
-        $paragonieDiff->setVerbose(true);
-
         $pharAFiles = self::collectFiles($pharInfoA);
         $pharBFiles = self::collectFiles($pharInfoB);
 
         $diffResult = [
             array_diff($pharAFiles, $pharBFiles),
             array_diff($pharBFiles, $pharAFiles),
         ];
+        $diffCount = array_sum(array_map('count', $diffResult));
 
-        if (0 === array_sum(array_map('count', $diffResult))) {
+        if (0 === $diffCount) {
             $io->writeln(Differ::NO_DIFF_MESSAGE);
 
             return;
@@ -56,15 +54,21 @@ public function diff(
         self::printDiff(
             $pharInfoA,
             $pharInfoB,
-            $diffResult,
+            $diffResult[0],
+            $diffResult[1],
             $io,
         );
     }
 
+    /**
+     * @param list<non-empty-string> $filesInANotInB
+     * @param list<non-empty-string> $filesInBNotInA
+     */
     private static function printDiff(
         PharInfo $pharInfoA,
         PharInfo $pharInfoB,
-        array $diffResult,
+        array $filesInANotInB,
+        array $filesInBNotInA,
         IO $io,
     ): void {
         $io->writeln(sprintf(
@@ -80,15 +84,14 @@ private static function printDiff(
 
         $io->newLine();
 
-        self::renderPaths('-', $pharInfoA, $diffResult[0], $io);
-        self::renderPaths('+', $pharInfoB, $diffResult[1], $io);
-
-        $diffCount = array_sum(array_map('count', $diffResult));
+        self::renderPaths('-', $pharInfoA, $filesInANotInB, $io);
+        $io->newLine();
+        self::renderPaths('+', $pharInfoB, $filesInBNotInA, $io);
 
         $io->error(
             sprintf(
                 '%d file(s) difference',
-                $diffCount,
+                count($filesInANotInB) + count($filesInBNotInA),
             ),
         );
     }
@@ -119,7 +122,7 @@ private static function renderPaths(string $symbol, PharInfo $pharInfo, array $p
             ),
         );
 
-        $io->writeln($lines);
+        $io->write($lines);
     }
 
     /**

diff --git a/src/Pharaoh/PharDiff.php b/src/Pharaoh/PharDiff.php
diff --git a/tests/Console/Command/DiffTest.php b/tests/Console/Command/DiffTest.php
@@ -458,7 +458,6 @@ private static function fileNameDiffPharsProvider(): iterable
                 +++ Files present in "simple-phar-bar.phar" but not in "simple-phar-foo.phar"
 
                 - foo.php [NONE] - 29.00B
-
                 + bar.php [NONE] - 29.00B
 
                  [ERROR] 2 file(s) difference