[DoctrineBridge] Map entities by single-key when disabling auto-mapping

nicolas-grekas · nicolas-grekas · commit 61f5dad9941f · 2024-04-10T09:47:58.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php b/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
@@ -123,15 +123,21 @@ private function getIdentifier(Request $request, MapEntity $options, string $nam
     {
         if (\is_array($options->id)) {
             $id = [];
+            $usedAttributes = [];
             foreach ($options->id as $field) {
                 // Convert "%s_uuid" to "foobar_uuid"
                 if (str_contains($field, '%s')) {
                     $field = sprintf($field, $name);
                 }
 
+                $usedAttributes[] = $field;
                 $id[$field] = $request->attributes->get($field);
             }
 
+            if ($usedAttributes) {
+                $request->attributes->set('_entity_used_attributes', array_merge($request->attributes->get('_entity_used_attributes') ?? [], $usedAttributes));
+            }
+
             return $id;
         }
 
@@ -140,10 +146,14 @@ private function getIdentifier(Request $request, MapEntity $options, string $nam
         }
 
         if ($request->attributes->has($name)) {
+            $request->attributes->set('_entity_used_attributes', array_merge($request->attributes->get('_entity_used_attributes') ?? [], [$name]));
+
             return $request->attributes->get($name) ?? ($options->stripNull ? false : null);
         }
 
         if (!$options->id && $request->attributes->has('id')) {
+            $request->attributes->set('_entity_used_attributes', array_merge($request->attributes->get('_entity_used_attributes') ?? [], ['id']));
+
             return $request->attributes->get('id') ?? ($options->stripNull ? false : null);
         }
 
@@ -152,11 +162,15 @@ private function getIdentifier(Request $request, MapEntity $options, string $nam
 
     private function getCriteria(Request $request, MapEntity $options, ObjectManager $manager): array
     {
-        if (null === $mapping = $options->mapping) {
-            $mapping = $request->attributes->keys();
+        $singleKey = [] === $options->mapping;
+
+        if (!$mapping = $options->mapping) {
+            $mapping = $request->attributes->all();
+            unset($mapping['_entity_used_attributes']);
+            $mapping = array_keys($mapping);
         }
 
-        if ($mapping && \is_array($mapping) && array_is_list($mapping)) {
+        if ($mapping && array_is_list($mapping)) {
             $mapping = array_combine($mapping, $mapping);
         }
 
@@ -176,13 +190,29 @@ private function getCriteria(Request $request, MapEntity $options, ObjectManager
 
         $criteria = [];
         $metadata = $manager->getClassMetadata($options->class);
+        $usedAttributes = [];
+
+        if ($singleKey) {
+            foreach ($request->attributes->get('_entity_used_attributes') ?? [] as $attribute) {
+                unset($mapping[$attribute]);
+            }
+        }
 
         foreach ($mapping as $attribute => $field) {
             if (!$metadata->hasField($field) && (!$metadata->hasAssociation($field) || !$metadata->isSingleValuedAssociation($field))) {
                 continue;
             }
 
+            $usedAttributes[] = $attribute;
             $criteria[$field] = $request->attributes->get($attribute);
+
+            if ($singleKey) {
+                break;
+            }
+        }
+
+        if ($usedAttributes) {
+            $request->attributes->set('_entity_used_attributes', array_merge($request->attributes->get('_entity_used_attributes') ?? [], $usedAttributes));
         }
 
         if ($options->stripNull) {
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 7.1
 ---
 
+ * Map entities by single-key when disabling auto-mapping
  * Deprecate the `DoctrineExtractor::getTypes()` method, use `DoctrineExtractor::getType()` instead
 
 7.0
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php b/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php
@@ -257,6 +257,60 @@ public function testResolveWithMappingAndExclude()
         $this->assertSame([$object], $resolver->resolve($request, $argument));
     }
 
+    public function testResolveWithMultipleEntitiesAndNoAutoMapping()
+    {
+        $manager = $this->getMockBuilder(ObjectManager::class)->getMock();
+        $registry = $this->createRegistry($manager);
+        $resolver = new EntityValueResolver($registry);
+
+        $request = new Request();
+        $request->attributes->set('foo', 1);
+        $request->attributes->set('bar', 2);
+
+        $argument1 = $this->createArgument('Foo', new MapEntity('Foo', mapping: []));
+        $argument2 = $this->createArgument('Bar', new MapEntity('Bar', mapping: []));
+
+        $metadata1 = $this->getMockBuilder(ClassMetadata::class)->getMock();
+        $metadata1->expects($this->once())
+            ->method('hasField')
+            ->with('foo')
+            ->willReturn(true);
+
+        $metadata2 = $this->getMockBuilder(ClassMetadata::class)->getMock();
+        $metadata2->expects($this->once())
+            ->method('hasField')
+            ->with('bar')
+            ->willReturn(true);
+
+        $manager->expects($this->any())
+            ->method('getClassMetadata')
+            ->willReturnCallback(static fn ($v) => match ($v) {
+                'Foo' => $metadata1,
+                'Bar' => $metadata2,
+            });
+
+        $object1 = new \stdClass();
+        $object2 = new \stdClass();
+
+        $repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
+        $repository->expects($this->any())
+            ->method('findOneBy')
+            ->willReturnCallback(static fn ($v) => match ($v) {
+                ['foo' => 1] => $object1,
+                ['bar' => 2] => $object2,
+            });
+
+        $manager->expects($this->any())
+            ->method('getRepository')
+            ->willReturn($repository);
+
+        $this->assertSame([$object1], $resolver->resolve($request, $argument1));
+        $this->assertSame(['foo'], $request->attributes->get('_entity_used_attributes'));
+
+        $this->assertSame([$object2], $resolver->resolve($request, $argument2));
+        $this->assertSame(['foo', 'bar'], $request->attributes->get('_entity_used_attributes'));
+    }
+
     public function testExceptionWithExpressionIfNoLanguageAvailable()
     {
         $manager = $this->getMockBuilder(ObjectManager::class)->getMock();
