refactor: Refactor the extract command to leverage the PharFactory se…

…rvice (#974)
box-project · Apr 1, 2023 · 3d0b441 · 3d0b441
1 parent 72e5cef
commit 3d0b441
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 55 deletions.
diff --git a/fixtures/extract/corrupted.phar b/fixtures/extract/corrupted.phar
diff --git a/fixtures/extract/incorrect-key-openssl.phar b/fixtures/extract/incorrect-key-openssl.phar
diff --git a/fixtures/extract/incorrect-key-openssl.phar.pubkey b/fixtures/extract/incorrect-key-openssl.phar.pubkey
diff --git a/fixtures/extract/invalid b/fixtures/extract/invalid
diff --git a/fixtures/extract/invalid.phar b/fixtures/extract/invalid.phar
diff --git a/fixtures/extract/openssl-no-pubkey.phar b/fixtures/extract/openssl-no-pubkey.phar
diff --git a/src/Console/Command/Extract.php b/src/Console/Command/Extract.php
@@ -18,15 +18,13 @@
 use Fidry\Console\Command\Configuration;
 use Fidry\Console\ExitCode;
 use Fidry\Console\Input\IO;
-use KevinGH\Box\Pharaoh\InvalidPhar;
+use KevinGH\Box\Phar\PharFactory;
 use KevinGH\Box\Pharaoh\Pharaoh;
 use ParagonIE\ConstantTime\Hex;
 use Phar;
-use PharData;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Throwable;
-use UnexpectedValueException;
 use function file_exists;
 use function KevinGH\Box\check_php_settings;
 use function KevinGH\Box\FileSystem\copy;
@@ -145,7 +143,7 @@ private static function dumpPhar(string $file, string $tmpDir): string
                 copy($pubkey, $tmpPubkey, true);
             }
 
-            $phar = self::createPhar($file, $tmpFile);
+            $phar = PharFactory::create($tmpFile);
 
             $phar->extractTo($tmpDir);
         } catch (Throwable $throwable) {
@@ -186,13 +184,4 @@ private static function getExtension(string $file): string
 
         return '' === $extension ? '.phar' : $extension;
     }
-
-    private static function createPhar(string $file, string $tmpFile): Phar|PharData
-    {
-        try {
-            return new Phar($tmpFile);
-        } catch (UnexpectedValueException $cannotCreatePhar) {
-            throw InvalidPhar::forPhar($file, $cannotCreatePhar);
-        }
-    }
 }
diff --git a/tests/Console/Command/ExtractTest.php b/tests/Console/Command/ExtractTest.php
@@ -208,11 +208,8 @@ public static function confirmationQuestionProvider(): iterable
     /**
      * @dataProvider invalidPharPath
      */
-    public function test_it_cannot_extract_an_invalid_phar(
-        string $pharPath,
-        string $exceptionClassName,
-        string $expectedExceptionMessage,
-    ): void {
+    public function test_it_cannot_extract_an_invalid_phar(string $pharPath): void
+    {
         try {
             $this->commandTester->execute(
                 [
@@ -228,48 +225,13 @@ public function test_it_cannot_extract_an_invalid_phar(
             // Continue
         }
 
-        self::assertSame(
-            $exceptionClassName,
-            $exception::class,
-        );
-        self::assertMatchesRegularExpression(
-            $expectedExceptionMessage,
-            $exception->getMessage(),
-        );
-
         self::assertSame([], $this->collectExtractedFiles());
     }
 
     public static function invalidPharPath(): iterable
     {
-        yield 'not a valid PHAR with the PHAR extension' => [
-            self::FIXTURES.'/invalid.phar',
-            InvalidPhar::class,
-            '/^Could not create a Phar instance for the file/',
-        ];
-
-        yield 'not a valid PHAR without the PHAR extension' => [
-            self::FIXTURES.'/invalid',
-            InvalidPhar::class,
-            '/^Could not create a Phar instance for the file/',
-        ];
-
-        yield 'corrupted PHAR (was valid; got tempered with)' => [
-            self::FIXTURES.'/corrupted.phar',
-            InvalidPhar::class,
-            '/^Could not create a Phar instance for the file/',
-        ];
-
-        yield 'OpenSSL signed PHAR without a pubkey' => [
-            self::FIXTURES.'/openssl-no-pubkey.phar',
-            InvalidPhar::class,
-            '/^Could not create a Phar instance for the file/',
-        ];
-
-        yield 'OpenSSL signed PHAR with incorrect pubkey' => [
-            self::FIXTURES.'/incorrect-key-openssl.phar',
-            InvalidPhar::class,
-            '/^Could not create a Phar instance for the file/',
+        yield 'not a valid PHAR' => [
+            self::FIXTURES.'/../phar/empty-pdf.pdf',
         ];
     }