Require doctrine/persistence 3 (#2603)

doctrine · Dec 22, 2023 · e8a5dd1 · e8a5dd1
1 parent bec87ea
commit e8a5dd1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 31 deletions.
diff --git a/UPGRADE-2.7.md b/UPGRADE-2.7.md
@@ -0,0 +1,5 @@
+# UPGRADE FROM 2.6 to 2.7
+
+## doctrine/persistence
+
+* MongoDB ODM 2.7 requires `doctrine/persistence` 3.2 or newer.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "doctrine/collections": "^1.5 || ^2.0",
         "doctrine/event-manager": "^1.0 || ^2.0",
         "doctrine/instantiator": "^1.1 || ^2",
-        "doctrine/persistence": "^2.4 || ^3.0",
+        "doctrine/persistence": "^3.2",
         "friendsofphp/proxy-manager-lts": "^1.0",
         "jean85/pretty-package-versions": "^1.3.0 || ^2.0.1",
         "mongodb/mongodb": "^1.10.0",

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AnnotationDriver.php
@@ -13,6 +13,7 @@
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Mapping\MappingException;
 use Doctrine\Persistence\Mapping\Driver\ColocatedMappingDriver;
+use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use MongoDB\Driver\Exception\UnexpectedValueException;
 use ReflectionClass;
 use ReflectionMethod;
@@ -32,7 +33,7 @@
 /**
  * The AnnotationDriver reads the mapping metadata from docblock annotations.
  */
-class AnnotationDriver extends CompatibilityAnnotationDriver
+class AnnotationDriver implements MappingDriver
 {
     use ColocatedMappingDriver;
 

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/CompatibilityAnnotationDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/CompatibilityAnnotationDriver.php
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/EnumTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/EnumTest.php
@@ -8,13 +8,11 @@
 use Documents\Card;
 use Documents\Suit;
 use Error;
-use Jean85\PrettyVersions;
 use MongoDB\BSON\ObjectId;
 use ValueError;
 
 use function preg_quote;
 use function sprintf;
-use function version_compare;
 
 class EnumTest extends BaseTestCase
 {
@@ -36,11 +34,6 @@ public function testPersistNew(): void
 
     public function testArrayOfEnums(): void
     {
-        $persistenceVersion = PrettyVersions::getVersion('doctrine/persistence')->getPrettyVersion();
-        if (version_compare('3.2.0', $persistenceVersion, '>')) {
-            self::markTestSkipped('Support for array of enums was introduced in doctrine/persistence 3.2.0');
-        }
-
         $doc        = new Card();
         $doc->suits = ['foo' => Suit::Clubs, 'bar' => Suit::Diamonds];