Skip to content

[HttpKernel] Fix default value ignored with pinned resolvers #50458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
May 29, 2023
+36 −9
Merged

[HttpKernel] Fix default value ignored with pinned resolvers #50458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ public function getArguments(Request $request, callable $controller, \Reflection
throw new ResolverNotFoundException($resolverName, $this->namedResolvers instanceof ServiceProviderInterface ? array_keys($this->namedResolvers->getProvidedServices()) : []);
}

$argumentValueResolvers = [$this->namedResolvers->get($resolverName)];
$argumentValueResolvers = [
$this->namedResolvers->get($resolverName),
new DefaultValueResolver(),
];
}
}

Expand Down
8 changes: 2 additions & 6 deletions src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,8 @@ public function resolve(Request $request, ArgumentMetadata $argument): array

$name = $attribute->name ?? $argument->getName();
if (!$request->query->has($name)) {
if ($argument->hasDefaultValue()) {
return [$argument->getDefaultValue()];
}

if ($argument->isNullable()) {
return [null];
if ($argument->isNullable() || $argument->hasDefaultValue()) {
return [];
}

throw new NotFoundHttpException(sprintf('Missing query parameter "%s".', $name));
Expand Down
4 changes: 2 additions & 2 deletions ...omponent/HttpKernel/Tests/Controller/ArgumentResolver/QueryParameterValueResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,14 @@ public static function provideTestResolve(): iterable
yield 'parameter not found but nullable' => [
Request::create('/', 'GET'),
new ArgumentMetadata('firstName', 'string', false, false, false, true, [new MapQueryParameter()]),
[null],
[],
null,
];

yield 'parameter not found but optional' => [
Request::create('/', 'GET'),
new ArgumentMetadata('firstName', 'string', false, true, false, attributes: [new MapQueryParameter()]),
[false],
[],
null,
];

Expand Down
28 changes: 28 additions & 0 deletions src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,26 @@ public function testTargetedResolver()
$this->assertSame([1], $resolver->getArguments($request, $controller));
}

public function testTargetedResolverWithDefaultValue()
{
$resolver = self::getResolver([], [RequestAttributeValueResolver::class => new RequestAttributeValueResolver()]);

$request = Request::create('/');
$controller = $this->controllerTargetingResolverWithDefaultValue(...);

$this->assertSame([2], $resolver->getArguments($request, $controller));
}

public function testTargetedResolverWithNullableValue()
{
$resolver = self::getResolver([], [RequestAttributeValueResolver::class => new RequestAttributeValueResolver()]);

$request = Request::create('/');
$controller = $this->controllerTargetingResolverWithNullableValue(...);

$this->assertSame([null], $resolver->getArguments($request, $controller));
}

public function testDisabledResolver()
{
$resolver = self::getResolver(namedResolvers: []);
Expand Down Expand Up @@ -373,6 +393,14 @@ public function controllerTargetingResolver(#[ValueResolver(DefaultValueResolver
{
}

public function controllerTargetingResolverWithDefaultValue(#[ValueResolver(RequestAttributeValueResolver::class)] int $foo = 2)
{
}

public function controllerTargetingResolverWithNullableValue(#[ValueResolver(RequestAttributeValueResolver::class)] ?int $foo)
{
}

public function controllerDisablingResolver(#[ValueResolver(RequestAttributeValueResolver::class, disabled: true)] int $foo = 1)
{
}
Expand Down