Allow specifying a relative file via phar

maglnet · Mar 8, 2024 · a8363bc · a8363bc
1 parent 1a61e0d
commit a8363bc
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 17 deletions.
diff --git a/src/ComposerRequireChecker/Cli/CheckCommand.php b/src/ComposerRequireChecker/Cli/CheckCommand.php
@@ -39,7 +39,6 @@
 use function assert;
 use function count;
 use function dirname;
-use function file_exists;
 use function gettype;
 use function in_array;
 use function is_string;
@@ -62,7 +61,6 @@ protected function configure(): void
                 null,
                 InputOption::VALUE_REQUIRED,
                 'the config file to configure the checking options',
-                self::DEFAULT_CONFIG_PATH,
             )
             ->addArgument(
                 'composer-json',
@@ -234,23 +232,23 @@ static function (string $unknownSymbol) use ($guesser): array {
      */
     private function getCheckOptions(InputInterface $input): Options
     {
-        $fileName = $input->getOption('config-file');
-
-        if (is_string($fileName) === false) {
-            return new Options();
-        }
-
-        if (file_exists($fileName) === false) {
-            if ($fileName === self::DEFAULT_CONFIG_PATH) {
+        $configFileArgument = $input->getOption('config-file');
+
+        if (is_string($configFileArgument)) {
+            $fileName = realpath($configFileArgument);
+            if ($fileName === false) {
+                throw new InvalidArgumentException(
+                    sprintf(
+                        'Configuration file [%s] does not exist.',
+                        $configFileArgument,
+                    ),
+                );
+            }
+        } else {
+            $fileName = realpath(self::DEFAULT_CONFIG_PATH);
+            if ($fileName === false) {
                 return new Options();
             }
-
-            throw new InvalidArgumentException(
-                sprintf(
-                    'Configuration file [%s] does not exist.',
-                    $fileName,
-                ),
-            );
         }
 
         $config = JsonLoader::getData($fileName);

diff --git a/test/ComposerRequireCheckerTest/Cli/CheckCommandTest.php b/test/ComposerRequireCheckerTest/Cli/CheckCommandTest.php
@@ -279,6 +279,7 @@ public function testNoUnknownComposerSymbolFound(): void
         );
     }
 
+    /** This is the same as the next test, but with the default configuration file assumed */
     public function testDefaultConfigPath(): void
     {
         $baseDirectory = dirname(__DIR__, 2) . '/fixtures/defaultConfigPath/';
@@ -302,6 +303,33 @@ public function testDefaultConfigPath(): void
         );
     }
 
+    /** This is the same as the previous test, but with the configuration file specified */
+    public function testDefaultConfigPathSpecified(): void
+    {
+        $baseDirectory = dirname(__DIR__, 2) . '/fixtures/defaultConfigPath/';
+
+        chdir($baseDirectory);
+        $exitCode = $this->commandTester->execute([
+            'composer-json' => 'composer.json',
+            '--config-file' => 'composer-require-checker.json',
+        ]);
+        $output   = $this->commandTester->getDisplay();
+
+        $this->assertNotEquals(0, $exitCode);
+        $this->assertMatchesRegularExpression(
+            '/The following 2 unknown symbols were found/s',
+            $output,
+        );
+        $this->assertMatchesRegularExpression(
+            '/Composer\\\\InstalledVersions/s',
+            $output,
+        );
+        $this->assertMatchesRegularExpression(
+            '/json_decode/s',
+            $output,
+        );
+    }
+
     public function testOverrideDefaultConfigPath(): void
     {
         $baseDirectory = dirname(__DIR__, 2) . '/fixtures/defaultConfigPath/';
@@ -349,6 +377,20 @@ public function testNotExistentConfigPath(): void
         ]);
     }
 
+    public function testNotExistentDefaultConfigPath(): void
+    {
+        $baseDirectory = dirname(__DIR__, 2) . '/fixtures/noUnknownSymbols/';
+
+        chdir($baseDirectory);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Configuration file [composer-require-checker.json] does not exist.');
+        $this->commandTester->execute([
+            'composer-json' => 'composer.json',
+            '--config-file' => 'composer-require-checker.json',
+        ]);
+    }
+
     /** @requires PHP >= 8.1.0 */
     public function testNoUnknownEnumSymbolsFound(): void
     {

diff --git a/test/ComposerRequireCheckerTest/PharTest.php b/test/ComposerRequireCheckerTest/PharTest.php
@@ -93,4 +93,13 @@ public function testMissingCustomConfiguration(): void
         $this->assertStringContainsString('Configuration file [no-such-file] does not exist.', implode("\n", $output));
         $this->assertNotEquals(0, $return);
     }
+
+    public function testMissingDefaultConfiguration(): void
+    {
+        chdir(__DIR__ . '/../fixtures/noUnknownComposerSymbol');
+        exec(sprintf('%s check --config-file=%s 2>&1', $this->bin, 'composer-require-checker.json'), $output, $return);
+
+        $this->assertStringContainsString('Configuration file [composer-require-checker.json] does not exist.', implode("\n", $output));
+        $this->assertNotEquals(0, $return);
+    }
 }