Fix RequestPayloadValueResolver handling error with no ExpectedTypes

Jeroeny · Jeroeny · commit b668cd6af593 · 2023-10-18T10:56:22.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -108,7 +108,7 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event): vo
                 } catch (PartialDenormalizationException $e) {
                     $trans = $this->translator ? $this->translator->trans(...) : fn ($m, $p) => strtr($m, $p);
                     foreach ($e->getErrors() as $error) {
-                        $parameters = ['{{ type }}' => implode('|', $error->getExpectedTypes())];
+                        $parameters = ['{{ type }}' => implode('|', $error->getExpectedTypes() ?? [])];
                         if ($error->canUseMessageForUser()) {
                             $parameters['hint'] = $error->getMessage();
                         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
@@ -23,9 +23,12 @@
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Serializer;
+use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
@@ -307,6 +310,25 @@ public function testRequestContentValidationPassed()
         $this->assertEquals([$payload], $event->getArguments());
     }
 
+    public function testRequestContentWithUntypedErrors()
+    {
+        $this->expectException(HttpException::class);
+        $serializer = $this->createMock(SerializerDenormalizer::class);
+        $serializer->method('deserialize')->willThrowException(new PartialDenormalizationException([], [new NotNormalizableValueException('Error with no types')]));
+
+        $resolver = new RequestPayloadValueResolver($serializer, $this->createMock(ValidatorInterface::class));
+        $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(),
+        ]);
+        $request = Request::create('/', 'POST', server: ['CONTENT_TYPE' => 'application/json'], content: '{"price": 50}');
+
+        $kernel = $this->createMock(HttpKernelInterface::class);
+        $arguments = $resolver->resolve($request, $argument);
+        $event = new ControllerArgumentsEvent($kernel, function () {}, $arguments, $request, HttpKernelInterface::MAIN_REQUEST);
+
+        $resolver->onKernelControllerArguments($event);
+    }
+
     public function testQueryStringValidationPassed()
     {
         $payload = new RequestPayload(50);
@@ -612,3 +634,6 @@ public function __construct(public readonly float $price)
     {
     }
 }
+
+interface SerializerDenormalizer extends SerializerInterface, DenormalizerInterface
+{}

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event): vo`
`108`	`108`	`} catch (PartialDenormalizationException $e) {`
`109`	`109`	`$trans = $this->translator ? $this->translator->trans(...) : fn ($m, $p) => strtr($m, $p);`
`110`	`110`	`foreach ($e->getErrors() as $error) {`
`111`		`- $parameters = ['{{ type }}' => implode('\|', $error->getExpectedTypes())];`
	`111`	`+ $parameters = ['{{ type }}' => implode('\|', $error->getExpectedTypes() ?? [])];`
`112`	`112`	`if ($error->canUseMessageForUser()) {`
`113`	`113`	`$parameters['hint'] = $error->getMessage();`
`114`	`114`	`}`