[DoctrineBridge] Skip throwing when entity is not found and no attribute explicitly asks for it

nicolas-grekas · nicolas-grekas · commit 6780b02407ce · 2022-12-05T19:05:59.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php b/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
@@ -40,7 +40,9 @@ public function __construct(
 
     public function resolve(Request $request, ArgumentMetadata $argument): array
     {
-        $options = $this->getMapEntityAttribute($argument);
+        $attribute = $argument->getAttributes(MapEntity::class, ArgumentMetadata::IS_INSTANCEOF);
+        $options = ($attribute[0] ?? $this->defaults)->withDefaults($this->defaults, $argument->getType());
+
         if (!$options->class || $options->disabled) {
             return [];
         }
@@ -66,6 +68,10 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
             }
         }
 
+        if (null === $object && !$attribute) {
+            return [];
+        }
+
         if (null === $object && !$argument->isNullable()) {
             throw new NotFoundHttpException(sprintf('"%s" object not found by "%s".', $options->class, self::class).$message);
         }
@@ -201,12 +207,4 @@ private function findViaExpression(ObjectManager $manager, Request $request, Map
             return null;
         }
     }
-
-    private function getMapEntityAttribute(ArgumentMetadata $argument): MapEntity
-    {
-        /** @var MapEntity $options */
-        $options = $argument->getAttributes(MapEntity::class, ArgumentMetadata::IS_INSTANCEOF)[0] ?? $this->defaults;
-
-        return $options->withDefaults($this->defaults, $argument->getType());
-    }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php b/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php
@@ -139,12 +139,16 @@ public function testResolveWithNullId()
         $request = new Request();
         $request->attributes->set('id', null);
 
-        $argument = $this->createArgument(isNullable: true);
+        $argument = $this->createArgument(isNullable: true, entity: new MapEntity());
 
         $this->assertSame([null], $resolver->resolve($request, $argument));
     }
 
-    public function testResolveWithConversionFailedException()
+    /**
+     * @testWith [true]
+     *           [false]
+     */
+    public function testResolveWithConversionException(bool $withAttribute)
     {
         $manager = $this->getMockBuilder(ObjectManager::class)->getMock();
         $registry = $this->createRegistry($manager);
@@ -153,7 +157,7 @@ public function testResolveWithConversionFailedException()
         $request = new Request();
         $request->attributes->set('id', 'test');
 
-        $argument = $this->createArgument('stdClass', new MapEntity(id: 'id'));
+        $argument = $this->createArgument('stdClass', $withAttribute ? new MapEntity(id: 'id') : null);
 
         $repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
         $repository->expects($this->once())
@@ -166,9 +170,13 @@ public function testResolveWithConversionFailedException()
             ->with('stdClass')
             ->willReturn($repository);
 
-        $this->expectException(NotFoundHttpException::class);
+        if ($withAttribute) {
+            $this->expectException(NotFoundHttpException::class);
 
-        $resolver->resolve($request, $argument);
+            $resolver->resolve($request, $argument);
+        } else {
+            $this->assertSame([], $resolver->resolve($request, $argument));
+        }
     }
 
     public function testUsedProperIdentifier()

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ public function __construct(`
`40`	`40`
`41`	`41`	`public function resolve(Request $request, ArgumentMetadata $argument): array`
`42`	`42`	`{`
`43`		`- $options = $this->getMapEntityAttribute($argument);`
	`43`	`+ $attribute = $argument->getAttributes(MapEntity::class, ArgumentMetadata::IS_INSTANCEOF);`
	`44`	`+ $options = ($attribute[0] ?? $this->defaults)->withDefaults($this->defaults, $argument->getType());`
	`45`	`+`
`44`	`46`	`if (!$options->class \|\| $options->disabled) {`
`45`	`47`	`return [];`
`46`	`48`	`}`
`@@ -66,6 +68,10 @@ public function resolve(Request $request, ArgumentMetadata $argument): array`
`66`	`68`	`}`
`67`	`69`	`}`
`68`	`70`
	`71`	`+ if (null === $object && !$attribute) {`
	`72`	`+ return [];`
	`73`	`+ }`
	`74`	`+`
`69`	`75`	`if (null === $object && !$argument->isNullable()) {`
`70`	`76`	`throw new NotFoundHttpException(sprintf('"%s" object not found by "%s".', $options->class, self::class).$message);`
`71`	`77`	`}`
`@@ -201,12 +207,4 @@ private function findViaExpression(ObjectManager $manager, Request $request, Map`
`201`	`207`	`return null;`
`202`	`208`	`}`
`203`	`209`	`}`
`204`		`-`
`205`		`- private function getMapEntityAttribute(ArgumentMetadata $argument): MapEntity`
`206`		`- {`
`207`		`- /** @var MapEntity $options */`
`208`		`- $options = $argument->getAttributes(MapEntity::class, ArgumentMetadata::IS_INSTANCEOF)[0] ?? $this->defaults;`
`209`		`-`
`210`		`- return $options->withDefaults($this->defaults, $argument->getType());`
`211`		`- }`
`212`	`210`	`}`