Add support for doctrine/persistence 4

greg0ire · greg0ire · commit 53877b83ac26 · 2025-01-21T22:41:56.000+01:00
v4 provides a guarantee that ManagerRegistry::getManager() returns an entity
manager (as opposed to null).
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "ext-xml": "*",
         "friendsofphp/proxy-manager-lts": "^1.0.2",
         "doctrine/event-manager": "^1.2|^2",
-        "doctrine/persistence": "^2.5|^3.1",
+        "doctrine/persistence": "^2.5|^3.1|^4",
         "twig/twig": "^2.13|^3.0.4",
         "psr/cache": "^2.0|^3.0",
         "psr/clock": "^1.0",
diff --git a/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php b/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
@@ -50,6 +50,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
         if (!$options->class || $options->disabled) {
             return [];
         }
+        // doctrine/persistence < 4 compat
         if (!$manager = $this->getManager($options->objectManager, $options->class)) {
             return [];
         }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php b/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php
@@ -54,6 +54,10 @@ public function testResolveWithoutAttribute()
 
     public function testResolveWithoutManager()
     {
+        if (method_exists(ObjectManager::class, 'isUninitializedObject')) {
+            $this->markTestSkipped('This test is not applicable to doctrine/persistence 4');
+        }
+
         $registry = $this->createRegistry(null);
         $resolver = new EntityValueResolver($registry);
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -614,6 +614,10 @@ public function testValidateUniquenessWithArrayValue()
 
     public function testDedicatedEntityManagerNullObject()
     {
+        if (method_exists(ObjectManager::class, 'isUninitializedObject')) {
+            $this->markTestSkipped('This test is not applicable to persistence 4');
+        }
+
         $constraint = new UniqueEntity([
             'message' => 'myMessage',
             'fields' => ['name'],
@@ -635,6 +639,10 @@ public function testDedicatedEntityManagerNullObject()
 
     public function testEntityManagerNullObject()
     {
+        if (method_exists(ObjectManager::class, 'isUninitializedObject')) {
+            $this->markTestSkipped('This test is not applicable to doctrine/persistence 4');
+        }
+
         $constraint = new UniqueEntity([
             'message' => 'myMessage',
             'fields' => ['name'],
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -71,6 +71,7 @@ public function validate(mixed $entity, Constraint $constraint)
         if ($constraint->em) {
             $em = $this->registry->getManager($constraint->em);
 
+            // doctrine/persistence < 4 compat
             if (!$em) {
                 throw new ConstraintDefinitionException(sprintf('Object manager "%s" does not exist.', $constraint->em));
             }
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "doctrine/event-manager": "^1.2|^2",
-        "doctrine/persistence": "^2.5|^3.1",
+        "doctrine/persistence": "^2.5|^3.1|^4",
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array`
`50`	`50`	`if (!$options->class \|\| $options->disabled) {`
`51`	`51`	`return [];`
`52`	`52`	`}`
	`53`	`+ // doctrine/persistence < 4 compat`
`53`	`54`	`if (!$manager = $this->getManager($options->objectManager, $options->class)) {`
`54`	`55`	`return [];`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ public function testResolveWithoutAttribute()`
`54`	`54`
`55`	`55`	`public function testResolveWithoutManager()`
`56`	`56`	`{`
	`57`	`+ if (method_exists(ObjectManager::class, 'isUninitializedObject')) {`
	`58`	`+ $this->markTestSkipped('This test is not applicable to doctrine/persistence 4');`
	`59`	`+ }`
	`60`	`+`
`57`	`61`	`$registry = $this->createRegistry(null);`
`58`	`62`	`$resolver = new EntityValueResolver($registry);`
`59`	`63`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ public function validate(mixed $entity, Constraint $constraint)`
`71`	`71`	`if ($constraint->em) {`
`72`	`72`	`$em = $this->registry->getManager($constraint->em);`
`73`	`73`
	`74`	`+ // doctrine/persistence < 4 compat`
`74`	`75`	`if (!$em) {`
`75`	`76`	`throw new ConstraintDefinitionException(sprintf('Object manager "%s" does not exist.', $constraint->em));`
`76`	`77`	`}`