From 019d8889216ff626ab4aad816fa6454c5b17e51e Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Tue, 19 Mar 2024 15:56:16 -0400 Subject: [PATCH] PHPLIB-1302: Use Composer\InstalledVersions There is no impact on Composer requirements since jean85/pretty-package-versions 2.0+ previously required composer-runtime-api 2.0+. --- composer.json | 2 +- src/Client.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 0a6a6503d..e11990c9a 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-hash": "*", "ext-json": "*", "ext-mongodb": "^1.18.0", - "jean85/pretty-package-versions": "^2.0.1", + "composer-runtime-api": "^2.0", "psr/log": "^1.1.4|^2|^3", "symfony/polyfill-php80": "^1.27", "symfony/polyfill-php81": "^1.27" diff --git a/src/Client.php b/src/Client.php index 429b75099..b5fc18246 100644 --- a/src/Client.php +++ b/src/Client.php @@ -17,8 +17,8 @@ namespace MongoDB; +use Composer\InstalledVersions; use Iterator; -use Jean85\PrettyVersions; use MongoDB\Driver\ClientEncryption; use MongoDB\Driver\Exception\InvalidArgumentException as DriverInvalidArgumentException; use MongoDB\Driver\Exception\RuntimeException as DriverRuntimeException; @@ -396,9 +396,9 @@ private static function getVersion(): string { if (self::$version === null) { try { - self::$version = PrettyVersions::getVersion('mongodb/mongodb')->getPrettyVersion(); + self::$version = InstalledVersions::getPrettyVersion('mongodb/mongodb') ?? 'unknown'; } catch (Throwable $t) { - return 'unknown'; + self::$version = 'error'; } }