Skip to content

[HttpKernel] Fix request attribute value ignored with pinned resolvers #52891

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
merged 1 commit into from
Dec 17, 2023
Merged

[HttpKernel] Fix request attribute value ignored with pinned resolvers #52891

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
1 change: 1 addition & 0 deletions src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public function getArguments(Request $request, callable $controller, \Reflection

$argumentValueResolvers = [
$this->namedResolvers->get($resolverName),
new RequestAttributeValueResolver(),
new DefaultValueResolver(),
];
}
Expand Down
49 changes: 44 additions & 5 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 @@ -22,6 +22,8 @@
use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
use Symfony\Component\HttpKernel\Exception\ResolverNotFoundException;
use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\ExtendingRequest;
Expand Down Expand Up @@ -298,24 +300,39 @@ public function testTargetedResolver()

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

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

$this->assertSame([2], $resolver->getArguments($request, $controller));
/** @var Post[] $arguments */
$arguments = $resolver->getArguments($request, $controller);

$this->assertCount(1, $arguments);
$this->assertSame('Default', $arguments[0]->title);
}

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

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

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

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

$request = Request::create('/');
$request->attributes->set('foo', $object = new Post('Random '.time()));
$controller = $this->controllerTargetingResolverWithTestEntity(...);

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

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

public function controllerTargetingResolverWithDefaultValue(#[ValueResolver(RequestAttributeValueResolver::class)] int $foo = 2)
public function controllerTargetingResolverWithDefaultValue(#[ValueResolver(TestEntityValueResolver::class)] Post $foo = new Post('Default'))
{
}

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

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

Expand All @@ -422,3 +443,21 @@ public function controllerTargetingUnknownResolver(
function controller_function($foo, $foobar)
{
}

class TestEntityValueResolver implements ValueResolverInterface
{
public function resolve(Request $request, ArgumentMetadata $argument): iterable
{
return Post::class === $argument->getType() && $request->request->has('title')
? [new Post($request->request->get('title'))]
: [];
}
}

class Post
{
public function __construct(
public readonly string $title,
) {
}
}