Merge pull request #7337 from orklah/broken-phar

replace class name by full FQN for scoper
vimeo · Jan 7, 2022 · abd499c · abd499c
2 parents daeb9ce + 90ada37
commit abd499c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Cli/Plugin.php b/src/Psalm/Internal/Cli/Plugin.php
@@ -2,7 +2,6 @@
 
 namespace Psalm\Internal\Cli;
 
-use Composer\InstalledVersions;
 use OutOfBoundsException;
 use Psalm\Internal\CliUtils;
 use Psalm\Internal\PluginManager\Command\DisableCommand;
@@ -32,7 +31,9 @@ public static function run(): void
 
         $version = null;
         try {
-            $version = InstalledVersions::getVersion('vimeo/psalm') ;
+            // we ignore the FQN because of a hack in scoper.inc that needs full path
+            // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
+            $version = \Composer\InstalledVersions::getVersion('vimeo/psalm') ;
         } catch (OutOfBoundsException $e) {
         }
 

diff --git a/src/Psalm/Internal/CliUtils.php b/src/Psalm/Internal/CliUtils.php
@@ -3,7 +3,6 @@
 namespace Psalm\Internal;
 
 use Composer\Autoload\ClassLoader;
-use Composer\InstalledVersions;
 use OutOfBoundsException;
 use Phar;
 use Psalm\Config;
@@ -149,12 +148,16 @@ public static function requireAutoloaders(
 
         $version = null;
         try {
-            $version = InstalledVersions::getVersion('vimeo/psalm') ;
+            // we ignore the FQN because of a hack in scoper.inc that needs full path
+            // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
+            $version = \Composer\InstalledVersions::getVersion('vimeo/psalm') ;
         } catch (OutOfBoundsException $e) {
         }
 
         define('PSALM_VERSION', $version ?? 'UNKNOWN');
-        define('PHP_PARSER_VERSION', InstalledVersions::getVersion('nikic/php-parser'));
+        // we ignore the FQN because of a hack in scoper.inc that needs full path
+        // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
+        define('PHP_PARSER_VERSION', \Composer\InstalledVersions::getVersion('nikic/php-parser'));
 
         return $first_autoloader;
     }