Skip to content

Commit aa5df38

Browse files
committed
Merge branch '3.0.x' into 2.14.x-merge-up-into-3.0.x_ZzfE4Yq6
2 parents 2f1298c + 99dc686 commit aa5df38

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

UPGRADE-3.0.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# UPGRADE FROM 2.x to 3.0
22

3+
## Composer
4+
5+
Composer version 1 is no longer supported. Please upgrade to Composer 2.
6+
37
## Aggregation
48

59
The new `Doctrine\ODM\MongoDB\Aggregation\Builder::getAggregation()` method

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
"require": {
2727
"php": "^8.1",
2828
"ext-mongodb": "^1.21 || ^2.0",
29+
"composer-runtime-api": "^2.0",
2930
"doctrine/cache": "^1.11 || ^2.0",
3031
"doctrine/collections": "^1.5 || ^2.0",
3132
"doctrine/event-manager": "^1.0 || ^2.0",
3233
"doctrine/instantiator": "^1.1 || ^2",
3334
"doctrine/persistence": "^3.2 || ^4",
3435
"friendsofphp/proxy-manager-lts": "^1.0",
35-
"jean85/pretty-package-versions": "^1.3.0 || ^2.0.1",
3636
"mongodb/mongodb": "^1.21.2 || ^2.1.1",
3737
"psr/cache": "^1.0 || ^2.0 || ^3.0",
3838
"symfony/console": "^5.4 || ^6.0 || ^7.0",

src/Configuration.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Doctrine\ODM\MongoDB;
66

7+
use Composer\InstalledVersions;
78
use Doctrine\Common\Annotations\AnnotationReader;
89
use Doctrine\Common\Cache\Cache;
910
use Doctrine\Common\Cache\Psr6\CacheAdapter;
@@ -24,7 +25,6 @@
2425
use Doctrine\Persistence\Mapping\Driver\MappingDriver;
2526
use Doctrine\Persistence\ObjectRepository;
2627
use InvalidArgumentException;
27-
use Jean85\PrettyVersions;
2828
use LogicException;
2929
use MongoDB\Client;
3030
use MongoDB\Driver\Manager;
@@ -803,7 +803,7 @@ private static function getVersion(): string
803803
{
804804
if (! isset(self::$version)) {
805805
try {
806-
self::$version = PrettyVersions::getVersion('doctrine/mongodb-odm')->getPrettyVersion();
806+
return self::$version ??= InstalledVersions::getPrettyVersion('doctrine/mongodb-odm') ?? 'unknown';
807807
} catch (Throwable) {
808808
return self::$version = 'unknown';
809809
}

0 commit comments

Comments
 (0)