Register QueryParameterValueResolver as "controller.targeted_value_resolver"

nicolas-grekas · nicolas-grekas · commit bd7c669c89f4 · 2023-04-14T13:28:53.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -45,6 +45,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'container.service_subscriber',
         'container.stack',
         'controller.argument_value_resolver',
+        'controller.targeted_value_resolver',
         'controller.service_arguments',
         'controller.targeted_value_resolver',
         'data_collector',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
@@ -16,6 +16,7 @@
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\BackedEnumValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DateTimeValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\QueryParameterValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestPayloadValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestValueResolver;
@@ -90,6 +91,9 @@
         ->set('argument_resolver.variadic', VariadicValueResolver::class)
             ->tag('controller.argument_value_resolver', ['priority' => -150, 'name' => VariadicValueResolver::class])
 
+        ->set('argument_resolver.query_parameter_value_resolver', QueryParameterValueResolver::class)
+            ->tag('controller.targeted_value_resolver', ['name' => QueryParameterValueResolver::class])
+
         ->set('response_listener', ResponseListener::class)
             ->args([
                 param('kernel.charset'),
diff --git a/src/Symfony/Component/HttpKernel/Attribute/MapQueryParameter.php b/src/Symfony/Component/HttpKernel/Attribute/MapQueryParameter.php
@@ -11,13 +11,15 @@
 
 namespace Symfony\Component\HttpKernel\Attribute;
 
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\QueryParameterValueResolver;
+
 /**
  * Can be used to pass a query parameter to a controller argument.
  *
  * @author Ruud Kamphuis <ruud@ticketswap.com>
  */
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
-final class MapQueryParameter
+final class MapQueryParameter extends ValueResolver
 {
     /**
      * @see https://php.net/filter.filters.validate for filter, flags and options
@@ -29,6 +31,8 @@ public function __construct(
         public ?int $filter = null,
         public int $flags = 0,
         public array $options = [],
+        string $resolver = QueryParameterValueResolver::class,
     ) {
+        parent::__construct($resolver);
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
@@ -62,6 +62,8 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
         if ('array' === $argument->getType() || $argument->isVariadic()) {
             $value = (array) $value;
             $options['flags'] |= \FILTER_REQUIRE_ARRAY;
+        } else {
+            $options['flags'] |= \FILTER_REQUIRE_SCALAR;
         }
 
         $filter = match ($argument->getType()) {

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,15 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpKernel\Attribute;`
`13`	`13`
	`14`	`+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\QueryParameterValueResolver;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* Can be used to pass a query parameter to a controller argument.`
`16`	`18`	`*`
`17`	`19`	`* @author Ruud Kamphuis <ruud@ticketswap.com>`
`18`	`20`	`*/`
`19`	`21`	`#[\Attribute(\Attribute::TARGET_PARAMETER)]`
`20`		`-final class MapQueryParameter`
	`22`	`+final class MapQueryParameter extends ValueResolver`
`21`	`23`	`{`
`22`	`24`	`/**`
`23`	`25`	`* @see https://php.net/filter.filters.validate for filter, flags and options`
`@@ -29,6 +31,8 @@ public function __construct(`
`29`	`31`	`public ?int $filter = null,`
`30`	`32`	`public int $flags = 0,`
`31`	`33`	`public array $options = [],`
	`34`	`+ string $resolver = QueryParameterValueResolver::class,`
`32`	`35`	`) {`
	`36`	`+ parent::__construct($resolver);`
`33`	`37`	`}`
`34`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ public function resolve(Request $request, ArgumentMetadata $argument): array`
`62`	`62`	`if ('array' === $argument->getType() \|\| $argument->isVariadic()) {`
`63`	`63`	`$value = (array) $value;`
`64`	`64`	`$options['flags'] \|= \FILTER_REQUIRE_ARRAY;`
	`65`	`+ } else {`
	`66`	`+ $options['flags'] \|= \FILTER_REQUIRE_SCALAR;`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`$filter = match ($argument->getType()) {`