Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
22 changes: 5 additions & 17 deletions src/Integration/ModulesIntegration.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
namespace Sentry\Integration;

use Composer\InstalledVersions;
use Jean85\PrettyVersions;
use Sentry\Event;
use Sentry\SentrySdk;
use Sentry\State\Scope;
Expand Down Expand Up @@ -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;

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dev versions lose commit identity

Medium Severity

PrettyVersions::getVersion()->getPrettyVersion() is not equivalent to InstalledVersions::getPrettyVersion(). For non-tagged installs, the former appended a short commit reference, while Composer’s API returns only the branch/pretty string. Module data on Sentry events can no longer identify the exact revision for branch or VCS packages.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 184acee. Configure here.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is really an issue, would something like this be acceptable?

$prettyVersion = InstalledVersions::getPrettyVersion($package);
if ($prettyVersion !== null) {
    $reference = InstalledVersions::getReference($package);
    if ($reference !== null && str_starts_with($prettyVersion, 'dev-')) {
        $prettyVersion .= '@' . substr($reference, 0, 7);
    }
    self::$packages[$package] = $prettyVersion;
}

}
} catch (\Throwable $exception) {
continue;
}
Expand All @@ -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'];
}
Expand Down