diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
index bbca01a6db15a..370097cda4b08 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -134,8 +134,12 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event): vo
}
}
- if (null === $payload && !$argument->metadata->isNullable()) {
- throw new HttpException($validationFailedCode);
+ if (null === $payload) {
+ $payload = match (true) {
+ $argument->metadata->hasDefaultValue() => $argument->metadata->getDefaultValue(),
+ $argument->metadata->isNullable() => null,
+ default => throw new HttpException($validationFailedCode)
+ };
}
$arguments[$i] = $payload;
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
index 5dcae045b918d..4ca326392be56 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
@@ -57,6 +57,148 @@ public function testNotTypedArgument()
$resolver->onKernelControllerArguments($event);
}
+ public function testDefaultValueArgument()
+ {
+ $payload = new RequestPayload(50);
+
+ $validator = $this->createMock(ValidatorInterface::class);
+ $validator->expects($this->never())
+ ->method('validate');
+
+ $resolver = new RequestPayloadValueResolver(new Serializer(), $validator);
+
+ $argument = new ArgumentMetadata('valid', RequestPayload::class, false, true, $payload, false, [
+ MapRequestPayload::class => new MapRequestPayload(),
+ ]);
+ $request = Request::create('/', 'POST', server: ['CONTENT_TYPE' => 'application/json']);
+
+ $kernel = $this->createMock(HttpKernelInterface::class);
+ $arguments = $resolver->resolve($request, $argument);
+ $event = new ControllerArgumentsEvent($kernel, fn () => null, $arguments, $request, HttpKernelInterface::MAIN_REQUEST);
+
+ $resolver->onKernelControllerArguments($event);
+
+ $this->assertEquals([$payload], $event->getArguments());
+ }
+
+ public function testQueryDefaultValueArgument()
+ {
+ $payload = new RequestPayload(50);
+
+ $validator = $this->createMock(ValidatorInterface::class);
+ $validator->expects($this->never())
+ ->method('validate');
+
+ $resolver = new RequestPayloadValueResolver(new Serializer(), $validator);
+
+ $argument = new ArgumentMetadata('valid', RequestPayload::class, false, true, $payload, false, [
+ MapQueryString::class => new MapQueryString(),
+ ]);
+ $request = Request::create('/', 'GET');
+
+ $kernel = $this->createMock(HttpKernelInterface::class);
+ $arguments = $resolver->resolve($request, $argument);
+ $event = new ControllerArgumentsEvent($kernel, fn () => null, $arguments, $request, HttpKernelInterface::MAIN_REQUEST);
+
+ $resolver->onKernelControllerArguments($event);
+
+ $this->assertEquals([$payload], $event->getArguments());
+ }
+
+ public function testNullableValueArgument()
+ {
+ $validator = $this->createMock(ValidatorInterface::class);
+ $validator->expects($this->never())
+ ->method('validate');
+
+ $resolver = new RequestPayloadValueResolver(new Serializer(), $validator);
+
+ $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, true, [
+ MapRequestPayload::class => new MapRequestPayload(),
+ ]);
+ $request = Request::create('/', 'POST', server: ['CONTENT_TYPE' => 'application/json']);
+
+ $kernel = $this->createMock(HttpKernelInterface::class);
+ $arguments = $resolver->resolve($request, $argument);
+ $event = new ControllerArgumentsEvent($kernel, fn () => null, $arguments, $request, HttpKernelInterface::MAIN_REQUEST);
+
+ $resolver->onKernelControllerArguments($event);
+
+ $this->assertEquals([null], $event->getArguments());
+ }
+
+ public function testQueryNullableValueArgument()
+ {
+ $validator = $this->createMock(ValidatorInterface::class);
+ $validator->expects($this->never())
+ ->method('validate');
+
+ $resolver = new RequestPayloadValueResolver(new Serializer(), $validator);
+
+ $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, true, [
+ MapQueryString::class => new MapQueryString(),
+ ]);
+ $request = Request::create('/', 'GET');
+
+ $kernel = $this->createMock(HttpKernelInterface::class);
+ $arguments = $resolver->resolve($request, $argument);
+ $event = new ControllerArgumentsEvent($kernel, fn () => null, $arguments, $request, HttpKernelInterface::MAIN_REQUEST);
+
+ $resolver->onKernelControllerArguments($event);
+
+ $this->assertSame([null], $event->getArguments());
+ }
+
+ public function testNullPayloadAndNotDefaultOrNullableArgument()
+ {
+ $validator = $this->createMock(ValidatorInterface::class);
+ $validator->expects($this->never())
+ ->method('validate');
+
+ $resolver = new RequestPayloadValueResolver(new Serializer(), $validator);
+
+ $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
+ MapRequestPayload::class => new MapRequestPayload(),
+ ]);
+ $request = Request::create('/', 'POST', server: ['CONTENT_TYPE' => 'application/json']);
+
+ $kernel = $this->createMock(HttpKernelInterface::class);
+ $arguments = $resolver->resolve($request, $argument);
+ $event = new ControllerArgumentsEvent($kernel, fn () => null, $arguments, $request, HttpKernelInterface::MAIN_REQUEST);
+
+ try {
+ $resolver->onKernelControllerArguments($event);
+ $this->fail(sprintf('Expected "%s" to be thrown.', HttpException::class));
+ } catch (HttpException $e) {
+ $this->assertSame(422, $e->getStatusCode());
+ }
+ }
+
+ public function testQueryNullPayloadAndNotDefaultOrNullableArgument()
+ {
+ $validator = $this->createMock(ValidatorInterface::class);
+ $validator->expects($this->never())
+ ->method('validate');
+
+ $resolver = new RequestPayloadValueResolver(new Serializer(), $validator);
+
+ $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
+ MapQueryString::class => new MapQueryString(),
+ ]);
+ $request = Request::create('/', 'GET');
+
+ $kernel = $this->createMock(HttpKernelInterface::class);
+ $arguments = $resolver->resolve($request, $argument);
+ $event = new ControllerArgumentsEvent($kernel, fn () => null, $arguments, $request, HttpKernelInterface::MAIN_REQUEST);
+
+ try {
+ $resolver->onKernelControllerArguments($event);
+ $this->fail(sprintf('Expected "%s" to be thrown.', HttpException::class));
+ } catch (HttpException $e) {
+ $this->assertSame(404, $e->getStatusCode());
+ }
+ }
+
public function testWithoutValidatorAndCouldNotDenormalize()
{
$content = '{"price": 50, "title": ["not a string"]}';
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy