Allow installing the jean85/pretty-package-versions package at versio…

…n 2.x (backport of #1170) (#1171)
getsentry · Feb 1, 2021 · df65ac7 · df65ac7
1 parent ef958b7
commit df65ac7
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Allow jean85/pretty-package-versions 2.0 (#1171, backport of #1170 from 3.x)
+
 ### 2.5.1 (2020-12-11)
 
 - Fix regression introduced in #1129 (#1143)

diff --git a/Makefile b/Makefile
@@ -20,7 +20,10 @@ cs-fix:
 phpstan:
 	vendor/bin/phpstan analyse
 
-test: cs-fix phpstan
+psalm:
+	vendor/bin/psalm
+
+test: cs-fix phpstan psalm
 	vendor/bin/phpunit --verbose
 
 setup-git:

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "ext-mbstring": "*",
         "guzzlehttp/promises": "^1.3",
         "guzzlehttp/psr7": "^1.7",
-        "jean85/pretty-package-versions": "^1.2",
+        "jean85/pretty-package-versions": "^1.5|^2.0.1",
         "php-http/async-client-implementation": "^1.0",
         "php-http/client-common": "^1.5|^2.0",
         "php-http/discovery": "^1.6.1",

diff --git a/src/Integration/ModulesIntegration.php b/src/Integration/ModulesIntegration.php
@@ -4,6 +4,7 @@
 
 namespace Sentry\Integration;
 
+use Composer\InstalledVersions;
 use Jean85\PrettyVersions;
 use PackageVersions\Versions;
 use Sentry\Event;
@@ -63,11 +64,33 @@ public static function applyToEvent(self $self, Event $event): void
     private function processEvent(Event $event): void
     {
         if (empty(self::$loadedModules)) {
-            foreach (Versions::VERSIONS as $package => $rawVersion) {
-                self::$loadedModules[$package] = PrettyVersions::getVersion($package)->getPrettyVersion();
+            foreach (self::getInstalledPackages() as $package) {
+                try {
+                    self::$loadedModules[$package] = PrettyVersions::getVersion($package)->getPrettyVersion();
+                } catch (\Throwable $exception) {
+                    continue;
+                }
             }
         }
 
         $event->setModules(self::$loadedModules);
     }
+
+    /**
+     * @return string[]
+     */
+    private static function getInstalledPackages(): array
+    {
+        if (class_exists(InstalledVersions::class)) {
+            return InstalledVersions::getInstalledPackages();
+        }
+
+        if (class_exists(Versions::class)) {
+            // BC layer for Composer 1, using a transient dependency
+            return array_keys(Versions::VERSIONS);
+        }
+
+        // this should not happen
+        return ['sentry/sentry'];
+    }
 }