From b8ef45f10e76d0e39f18c794bf9cbee37381d0f4 Mon Sep 17 00:00:00 2001 From: Peter Potrowl Date: Tue, 28 Jul 2026 23:00:28 +0200 Subject: [PATCH] Replace pretty-package-versions with Composer --- composer.json | 3 +-- src/DependencyInjection/SentryExtension.php | 4 ++-- tests/DependencyInjection/SentryExtensionTest.php | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 52eb9c88..090edd14 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,8 @@ ], "require": { "php": "^7.2||^8.0", + "composer-runtime-api": "^2.0", "guzzlehttp/psr7": "^2.1.1", - "jean85/pretty-package-versions": "^1.5||^2.0", "sentry/sentry": "^4.23.0", "symfony/cache-contracts": "^1.1||^2.4||^3.0", "symfony/config": "^4.4.20||^5.0.11||^6.0||^7.0||^8.0", @@ -85,7 +85,6 @@ "config": { "sort-packages": true, "allow-plugins": { - "composer/package-versions-deprecated": true, "phpstan/extension-installer": true } } diff --git a/src/DependencyInjection/SentryExtension.php b/src/DependencyInjection/SentryExtension.php index 90b40ce2..d8c84ccd 100644 --- a/src/DependencyInjection/SentryExtension.php +++ b/src/DependencyInjection/SentryExtension.php @@ -4,8 +4,8 @@ namespace Sentry\SentryBundle\DependencyInjection; +use Composer\InstalledVersions; use Doctrine\Bundle\DoctrineBundle\DoctrineBundle; -use Jean85\PrettyVersions; use Psr\Log\NullLogger; use Sentry\Client; use Sentry\ClientBuilder; @@ -66,7 +66,7 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container $loader->load('services.yaml'); if (!$container->hasParameter('env(SENTRY_RELEASE)')) { - $container->setParameter('env(SENTRY_RELEASE)', PrettyVersions::getRootPackageVersion()->getPrettyVersion()); + $container->setParameter('env(SENTRY_RELEASE)', InstalledVersions::getRootPackage()['pretty_version']); } // Remove Twig extension service if Twig is not installed to avoid autoloading failures on Symfony 8 diff --git a/tests/DependencyInjection/SentryExtensionTest.php b/tests/DependencyInjection/SentryExtensionTest.php index 401529dd..af9f99d5 100644 --- a/tests/DependencyInjection/SentryExtensionTest.php +++ b/tests/DependencyInjection/SentryExtensionTest.php @@ -4,8 +4,8 @@ namespace Sentry\SentryBundle\Tests\DependencyInjection; +use Composer\InstalledVersions; use Doctrine\Bundle\DoctrineBundle\DoctrineBundle; -use Jean85\PrettyVersions; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; use Sentry\ClientInterface; @@ -565,7 +565,7 @@ public function releaseOptionDataProvider(): \Generator yield 'If both the release option and the SENTRY_RELEASE environment variable are unset, then the root package version is used as fallback' => [ 'release_option_fallback_to_composer_version', - PrettyVersions::getRootPackageVersion()->getPrettyVersion(), + InstalledVersions::getRootPackage()['pretty_version'], ]; }