Merge pull request #6012 from tm1000/bugfix/6011

Fixes #6011, move placement of version call
vimeo · Jun 29, 2021 · 6328671 · 6328671
2 parents 9e9413d + 4d91c6e
commit 6328671
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Cli/LanguageServer.php b/src/Psalm/Internal/Cli/LanguageServer.php
@@ -182,11 +182,6 @@ function ($arg) use ($valid_long_options): void {
             exit;
         }
 
-        if (array_key_exists('v', $options)) {
-            echo 'Psalm ' . PSALM_VERSION . PHP_EOL;
-            exit;
-        }
-
         if (getcwd() === false) {
             fwrite(STDERR, 'Cannot get current working directory' . PHP_EOL);
             exit(1);
@@ -222,6 +217,11 @@ function () use ($current_dir, $options, $vendor_dir): ?\Composer\Autoload\Class
             }
         );
 
+        if (array_key_exists('v', $options)) {
+            echo 'Psalm ' . PSALM_VERSION . PHP_EOL;
+            exit;
+        }
+
         $ini_handler = new \Psalm\Internal\Fork\PsalmRestarter('PSALM');
 
         $ini_handler->disableExtension('grpc');