diff --git a/composer.json b/composer.json index 62feabd48..778ee8074 100644 --- a/composer.json +++ b/composer.json @@ -23,11 +23,11 @@ ], "require": { "php": "^7.2|^8.0", + "composer-runtime-api": "^2.0", "ext-json": "*", "ext-mbstring": "*", "ext-curl": "*", "guzzlehttp/psr7": "^1.8.4|^2.1.1", - "jean85/pretty-package-versions": "^1.5|^2.0.4", "psr/log": "^1.0|^2.0|^3.0", "symfony/options-resolver": "^4.4.30|^5.0.11|^6.0|^7.0|^8.0" }, diff --git a/src/Integration/ModulesIntegration.php b/src/Integration/ModulesIntegration.php index 6dd620d24..b5ad0e7a0 100644 --- a/src/Integration/ModulesIntegration.php +++ b/src/Integration/ModulesIntegration.php @@ -5,7 +5,6 @@ namespace Sentry\Integration; use Composer\InstalledVersions; -use Jean85\PrettyVersions; use Sentry\Event; use Sentry\SentrySdk; use Sentry\State\Scope; @@ -47,7 +46,11 @@ private static function getComposerPackages(): array if (empty(self::$packages)) { foreach (self::getInstalledPackages() as $package) { try { - self::$packages[$package] = PrettyVersions::getVersion($package)->getPrettyVersion(); + $prettyVersion = InstalledVersions::getPrettyVersion($package); + + if ($prettyVersion !== null) { + self::$packages[$package] = $prettyVersion; + } } catch (\Throwable $exception) { continue; } @@ -66,21 +69,6 @@ private static function getInstalledPackages(): array return InstalledVersions::getInstalledPackages(); } - $versionsClass = 'PackageVersions\\Versions'; - - if (class_exists($versionsClass)) { - // BC layer for Composer 1, using a transient dependency - /** @var mixed $versions */ - $versions = \constant($versionsClass . '::VERSIONS'); - - if (\is_array($versions)) { - /** @var string[] $packages */ - $packages = array_keys($versions); - - return $packages; - } - } - // this should not happen return ['sentry/sentry']; }