ref: use composer to get installed modules

Author: Litarnus

composer.json

@@ -27,7 +27,6 @@
         "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"
     },

src/Integration/ModulesIntegration.php

@@ -5,8 +5,6 @@
 namespace Sentry\Integration;
 
 use Composer\InstalledVersions;
-use Jean85\PrettyVersions;
-use PackageVersions\Versions;
 use Sentry\Event;
 use Sentry\SentrySdk;
 use Sentry\State\Scope;
@@ -46,33 +44,14 @@ public function setupOnce(): void
     private static function getComposerPackages(): array
     {
         if (empty(self::$packages)) {
-            foreach (self::getInstalledPackages() as $package) {
-                try {
-                    self::$packages[$package] = PrettyVersions::getVersion($package)->getPrettyVersion();
-                } catch (\Throwable $exception) {
-                    continue;
+            foreach (InstalledVersions::getInstalledPackages() as $package) {
+                $version = InstalledVersions::getPrettyVersion($package);
+                if ($version !== null) {
+                    self::$packages[$package] = $version;
                 }
             }
         }
 
         return self::$packages;
     }
-
-    /**
-     * @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'];
-    }
 }

tests/Integration/ModulesIntegrationTest.php

@@ -11,6 +11,10 @@
 use Sentry\Integration\ModulesIntegration;
 use Sentry\SentrySdk;
 use Sentry\State\Scope;
+use Sentry\ClientBuilder;
+use Sentry\Transport\Result;
+use Sentry\Transport\ResultStatus;
+use Sentry\Transport\TransportInterface;
 
 use function Sentry\withScope;
 
@@ -57,4 +61,33 @@ public static function invokeDataProvider(): \Generator
             false,
         ];
     }
+
+    public function testModuleIntegration(): void
+    {
+        /** @var TransportInterface&MockObject $transport */
+        $transport = $this->createMock(TransportInterface::class);
+        $transport->expects($this->once())
+            ->method('send')
+            ->with($this->callback(function (Event $event): bool {
+                $modules = $event->getModules();
+
+                $this->assertIsArray($modules);
+                $this->assertNotEmpty($modules);
+                $this->assertArrayHasKey('psr/log', $modules);
+                $this->assertMatchesRegularExpression("/^\d+\.\d+\.\d+$/", $modules['psr/log']);
+
+                return true;
+            }))
+            ->willReturnCallback(static function (Event $event): Result {
+                return new Result(ResultStatus::success(), $event);
+            });
+
+        $client = ClientBuilder::create()
+                               ->setTransport($transport)
+                               ->getClient();
+
+        SentrySdk::getCurrentHub()->bindClient($client);
+
+        $client->captureEvent(Event::createEvent(), null, new Scope());
+    }
 }