Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8b7f9b0

Browse filesBrowse files
committed
[HttpKernel] Add #[ValueResolver] for specifying a parameter argument resolver
1 parent 1f7bc10 commit 8b7f9b0
Copy full SHA for 8b7f9b0

File tree

4 files changed

+48
-0
lines changed
Filter options

4 files changed

+48
-0
lines changed
+24Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\HttpKernel\Attribute;
13+
14+
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
15+
16+
#[\Attribute(\Attribute::TARGET_PARAMETER)]
17+
class ValueResolver
18+
{
19+
/** @param class-string<ValueResolverInterface> $class */
20+
public function __construct(
21+
public readonly string $class
22+
) {
23+
}
24+
}

‎src/Symfony/Component/HttpKernel/CHANGELOG.md

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CHANGELOG
99
* Add `#[WithHttpStatus]` for defining status codes for exceptions
1010
* Use an instance of `Psr\Clock\ClockInterface` to generate the current date time in `DateTimeValueResolver`
1111
* Add `#[WithLogLevel]` for defining log levels for exceptions
12+
* Add `#[ValueResolver]` for specifying a parameter argument resolver
1213

1314
6.2
1415
---

‎src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\HttpKernel\Controller;
1313

1414
use Symfony\Component\HttpFoundation\Request;
15+
use Symfony\Component\HttpKernel\Attribute\ValueResolver;
1516
use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
1617
use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
1718
use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestValueResolver;
@@ -45,7 +46,15 @@ public function getArguments(Request $request, callable $controller, \Reflection
4546
$arguments = [];
4647

4748
foreach ($this->argumentMetadataFactory->createArgumentMetadata($controller, $reflector) as $metadata) {
49+
if ($attributes = $metadata->getAttributesOfType(ValueResolver::class)) {
50+
$resolverClass = reset($attributes)->class;
51+
}
52+
4853
foreach ($this->argumentValueResolvers as $resolver) {
54+
if ($resolver::class !== ($resolverClass ?? $resolver::class)) {
55+
continue;
56+
}
57+
4958
if ((!$resolver instanceof ValueResolverInterface || $resolver instanceof TraceableValueResolver) && !$resolver->supports($request, $metadata)) {
5059
continue;
5160
}

‎src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
+14Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Symfony\Component\HttpFoundation\Session\Session;
1717
use Symfony\Component\HttpFoundation\Session\SessionInterface;
1818
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
19+
use Symfony\Component\HttpKernel\Attribute\ValueResolver;
1920
use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
2021
use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
2122
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
@@ -283,6 +284,15 @@ public function testGetSessionMissMatchOnNull()
283284
self::$resolver->getArguments($request, $controller);
284285
}
285286

287+
public function testValueResolverAttribute()
288+
{
289+
$request = Request::create('/');
290+
$request->attributes->set('foo', 'foo');
291+
$controller = [new self(), 'controllerWithAttribute'];
292+
293+
$this->assertEquals(['foo'], self::$resolver->getArguments($request, $controller));
294+
}
295+
286296
public function __invoke($foo, $bar = null)
287297
{
288298
}
@@ -322,6 +332,10 @@ public function controllerWithSessionInterface(SessionInterface $session)
322332
public function controllerWithExtendingSession(ExtendingSession $session)
323333
{
324334
}
335+
336+
public function controllerWithAttribute(#[ValueResolver(RequestAttributeValueResolver::class)] $foo = 'bar')
337+
{
338+
}
325339
}
326340

327341
function controller_function($foo, $foobar)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.