[DoctrineBridge] Make EntityValueResolver return null if a composite ID value is null

MatTheCat · MatTheCat · commit a687f83c337e · 2024-07-15T16:51:45.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php b/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
@@ -104,6 +104,9 @@ private function find(ObjectManager $manager, Request $request, MapEntity $optio
         if (false === $id || null === $id) {
             return $id;
         }
+        if (\is_array($id) && \in_array(null, $id, true)) {
+            return null;
+        }
 
         if ($options->evictCache && $manager instanceof EntityManagerInterface) {
             $cacheProvider = $manager->getCache();
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php b/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php
@@ -144,6 +144,20 @@ public function testResolveWithNullId()
         $this->assertSame([null], $resolver->resolve($request, $argument));
     }
 
+    public function testResolveWithArrayIdNullValue()
+    {
+        $manager = $this->createMock(ObjectManager::class);
+        $registry = $this->createRegistry($manager);
+        $resolver = new EntityValueResolver($registry);
+
+        $request = new Request();
+        $request->attributes->set('nullValue', null);
+
+        $argument = $this->createArgument(entity: new MapEntity(id: ['nullValue']), isNullable: true,);
+
+        $this->assertSame([null], $resolver->resolve($request, $argument));
+    }
+
     public function testResolveWithConversionFailedException()
     {
         $manager = $this->getMockBuilder(ObjectManager::class)->getMock();

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,9 @@ private function find(ObjectManager $manager, Request $request, MapEntity $optio`
`104`	`104`	`if (false === $id \|\| null === $id) {`
`105`	`105`	`return $id;`
`106`	`106`	`}`
	`107`	`+ if (\is_array($id) && \in_array(null, $id, true)) {`
	`108`	`+ return null;`
	`109`	`+ }`
`107`	`110`
`108`	`111`	`if ($options->evictCache && $manager instanceof EntityManagerInterface) {`
`109`	`112`	`$cacheProvider = $manager->getCache();`