Merge pull request #9459 from Jean85/drop-package-versions

vimeo · Mar 6, 2023 · 977c383 · 977c383
2 parents 3a0adab + 91cd660
commit 977c383
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "ext-tokenizer": "*",
         "amphp/amp": "^2.4.2",
         "amphp/byte-stream": "^1.5",
-        "composer/package-versions-deprecated": "^1.10.0",
+        "composer-runtime-api": "^2",
         "composer/semver": "^1.4 || ^2.0 || ^3.0",
         "composer/xdebug-handler": "^2.0 || ^3.0",
         "dnoegel/php-xdg-base-dir": "^0.1.1",

diff --git a/src/Psalm/Internal/VersionUtils.php b/src/Psalm/Internal/VersionUtils.php
@@ -2,8 +2,8 @@
 
 namespace Psalm\Internal;
 
+use Composer\InstalledVersions;
 use OutOfBoundsException;
-use PackageVersions\Versions;
 use Phar;
 
 use function class_exists;
@@ -89,11 +89,17 @@ private static function loadComposerVersions(): ?array
     {
         try {
             return [
-                self::PSALM_PACKAGE => Versions::getVersion(self::PSALM_PACKAGE),
-                self::PHP_PARSER_PACKAGE => Versions::getVersion(self::PHP_PARSER_PACKAGE),
+                self::PSALM_PACKAGE => self::getVersion(self::PSALM_PACKAGE),
+                self::PHP_PARSER_PACKAGE => self::getVersion(self::PHP_PARSER_PACKAGE),
             ];
         } catch (OutOfBoundsException $ex) {
         }
         return null;
     }
+
+    private static function getVersion(string $packageName): string
+    {
+        return InstalledVersions::getPrettyVersion($packageName)
+            . '@' . InstalledVersions::getReference($packageName);
+    }
 }