fix

box-project · Oct 11, 2023 · 4ca78ca · 4ca78ca
1 parent 0ceb49a
commit 4ca78ca
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 45 deletions.
diff --git a/src/Console/Command/Diff.php b/src/Console/Command/Diff.php
@@ -19,9 +19,9 @@
 use Fidry\Console\ExitCode;
 use Fidry\Console\Input\IO;
 use KevinGH\Box\Console\PharInfoRenderer;
+use KevinGH\Box\Phar\DiffMode;
 use KevinGH\Box\Phar\PharDiff;
 use KevinGH\Box\Phar\PharInfo;
-use KevinGH\Box\Phar\DiffMode;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\BufferedOutput;

diff --git a/src/Phar/PharDiff.php b/src/Phar/PharDiff.php
@@ -16,7 +16,6 @@
 
 use KevinGH\Box\Console\Command\Extract;
 use KevinGH\Box\Pharaoh\PharDiff as ParagoniePharDiff;
-use KevinGH\Box\Phar\DiffMode;
 use SplFileInfo;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Process\Process;
@@ -82,7 +81,7 @@ private static function getModeCommand(DiffMode $mode): string
     {
         return match ($mode) {
             DiffMode::GIT => 'git diff --no-index',
-            DiffMode::GNU => 'diff',
+            DiffMode::GNU => 'diff --exclude='.Extract::PHAR_META_PATH,
         };
     }
 

diff --git a/tests/Console/Command/DiffTest.php b/tests/Console/Command/DiffTest.php
@@ -63,7 +63,7 @@ public function test_it_can_display_the_diff_of_two_phar_files(
         int $expectedStatusCode,
     ): void {
         if (DiffMode::GIT === $diffMode) {
-            $this->markTestSkipped('TODO');
+            self::markTestSkipped('TODO');
         }
 
         $this->commandTester->execute(
@@ -102,19 +102,19 @@ public function test_it_can_display_the_list_diff_of_two_phar_files(): void
         );
 
         $expectedOutput = <<<'OUTPUT'
-        
-         // Comparing the two archives... (do not check the signatures)
-        
-         [OK] The two archives are identical
-        
-         // Comparing the two archives contents...
-        
-        ⚠️  <warning>Using the option "list-diff" is deprecated. Use "--diff=list" instead.</warning>
-        
-         [OK] The contents are identical
-        
-        
-        OUTPUT;
+
+             // Comparing the two archives... (do not check the signatures)
+
+             [OK] The two archives are identical
+
+             // Comparing the two archives contents...
+
+            ⚠️  <warning>Using the option "list-diff" is deprecated. Use "--diff=list" instead.</warning>
+
+             [OK] The contents are identical
+
+
+            OUTPUT;
 
         $this->assertSameOutput(
             $expectedOutput,
@@ -127,7 +127,7 @@ public function test_it_can_display_the_list_diff_of_two_phar_files(): void
      */
     public function test_it_can_display_the_git_diff_of_two_phar_files(): void
     {
-        $this->markTestSkipped('TODO');
+        self::markTestSkipped('TODO');
         $pharPath = realpath(self::FIXTURES_DIR.'/simple-phar-foo.phar');
 
         $this->commandTester->execute(
@@ -140,27 +140,28 @@ public function test_it_can_display_the_git_diff_of_two_phar_files(): void
         );
 
         $expectedOutput = <<<'OUTPUT'
-        
-         // Comparing the two archives... (do not check the signatures)
-        
-         [OK] The two archives are identical
-        
-         // Comparing the two archives contents...
-        
-        ⚠️  <warning>Using the option "list-diff" is deprecated. Use "--diff=list" instead.</warning>
-        
-         [OK] The contents are identical
-        
-        
-        OUTPUT;
+
+             // Comparing the two archives... (do not check the signatures)
+
+             [OK] The two archives are identical
+
+             // Comparing the two archives contents...
+
+            ⚠️  <warning>Using the option "list-diff" is deprecated. Use "--diff=list" instead.</warning>
+
+             [OK] The contents are identical
+
+
+            OUTPUT;
 
         $this->assertSameOutput(
             $expectedOutput,
             ExitCode::SUCCESS,
         );
     }
 
-    public function test_it_can_display_the_gnu_diff_of_two_phar_files(): void {
+    public function test_it_can_display_the_gnu_diff_of_two_phar_files(): void
+    {
         $pharPath = realpath(self::FIXTURES_DIR.'/simple-phar-foo.phar');
 
         $this->commandTester->execute(
@@ -173,19 +174,19 @@ public function test_it_can_display_the_gnu_diff_of_two_phar_files(): void {
         );
 
         $expectedOutput = <<<'OUTPUT'
-        
-         // Comparing the two archives... (do not check the signatures)
-        
-         [OK] The two archives are identical
-        
-         // Comparing the two archives contents...
-        
-        ⚠️  <warning>Using the option "gnu-diff" is deprecated. Use "--diff=gnu" instead.</warning>
-        
-         [OK] The contents are identical
-        
-        
-        OUTPUT;
+
+             // Comparing the two archives... (do not check the signatures)
+
+             [OK] The two archives are identical
+
+             // Comparing the two archives contents...
+
+            ⚠️  <warning>Using the option "gnu-diff" is deprecated. Use "--diff=gnu" instead.</warning>
+
+             [OK] The contents are identical
+
+
+            OUTPUT;
 
         $this->assertSameOutput(
             $expectedOutput,