Experimenting ways to abstract the input source

symfony · chalasr · Jan 9, 2025 · Feb 21, 2025 · Mar 5, 2025 · Mar 23, 2025
commit f28fb52d757ef80c69bcce358764fe1e0b7a8fc4
diff --git a/src/Symfony/Component/ArgumentResolver/ArgumentResolver.php b/src/Symfony/Component/ArgumentResolver/ArgumentResolver.php
@@ -26,7 +26,7 @@
 use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
 
 /**
- * Responsible for resolving the arguments passed to an action.
+ * Responsible for resolving the arguments passed to a callable.
  *
  * @author Iltar van der Berg <kjarli@gmail.com>
  * @author Robin Chalas <robin@baksla.sh>
@@ -47,11 +47,11 @@
        $this->argumentValueResolvers = $argumentValueResolvers ?: static::getDefaultValueResolvers();
    }

    public function getArguments(mixed $input, callable $callable, ?\ReflectionFunctionAbstract $reflector = null): array
-    public function getArguments(mixed $input, callable $callable, ?\ReflectionFunctionAbstract $reflector = null): array
+    final public function getArguments(mixed $input, callable $callable, ?\ReflectionFunctionAbstract $reflector = null): array
-    public function getArguments(mixed $input, callable $callable, ?\ReflectionFunctionAbstract $reflector = null): array
+    final public function getArguments(mixed $input, callable $callable, ?\ReflectionFunctionAbstract $reflector = null): array
    {
        $arguments = [];

        foreach ($this->argumentMetadataFactory->createArgumentMetadata($callable, $reflector) as $metadata) {
            $argumentValueResolvers = $this->argumentValueResolvers;
            $disabledResolvers = [];

@@ -140,6 +140,6 @@
      */
     protected function callResolver($resolver, ArgumentMetadata $metadata, mixed $input): iterable
     {
-        return $resolver->resolve($metadata, $input);
+        return $resolver->resolveArgument($metadata, $input);
     }
 }
diff --git a/src/Symfony/Component/ArgumentResolver/ArgumentResolverInterface.php b/src/Symfony/Component/ArgumentResolver/ArgumentResolverInterface.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\ArgumentResolver;
 
+
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\ValueSourceInterface;
+
 /**
  * An ArgumentResolverInterface instance knows how to determine the
  * arguments for a specific function.
@@ -27,5 +30,5 @@
      *
      * @throws \RuntimeException When no value could be provided for a required argument
      */
-    public function getArguments(mixed $input, callable $callable, ?\ReflectionFunctionAbstract $reflector = null): array;
+    public function getArguments(ValueSourceInterface $source, callable $callable, ?\ReflectionFunctionAbstract $reflector = null): array;
 }
diff --git a/src/Symfony/Component/ArgumentResolver/README.md b/src/Symfony/Component/ArgumentResolver/README.md
@@ -1,7 +1,37 @@
 ArgumentResolver Component
 ========================
 
-The ArgumentResolver component provides
+The ArgumentResolver component provides a system that resolves the arguments of a callable based on their metadata and a given input source (e.g. an HTTP Request) at runtime.
+
+```php
+<?php
+
+use Symfony\Component\
A3E2
ArgumentResolver\ArgumentResolver;
+
+enum OrderStatus {
+    case PLACED = 'placed';
+    case CONFIRMED = 'confirmed';
+    case IN_TRANSIT = 'transit';
+    case SHIPPED = 'shipped';
+    case DELIVERED = 'delivered';
+}
+
+final class ChangeOrderStatus
+{
+    public function __invoke(
+        int $orderId,
+        OrderRepositoryInterface $OrderStatus $newStatus,
+        ?\DateTimeInterface $deliveryDate = null
+    ) {
+        // ...
+    }
+}
+
+$arguments = (new ArgumentResolver)->getArguments($ca);
+
+
+
+```
 
 Getting Started
 ---------------

diff --git a/src/Symfony/Component/ArgumentResolver/Source/InputSourceInterface.php b/src/Symfony/Component/ArgumentResolver/Source/InputSourceInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ArgumentResolver\ArgumentValueSource;
+
+/**
+ * Exposes a context-specific input source from which arguments' values can be extracted then resolved.
+ *
+ * @author Robin Chalas <robin@baksla.sh>
+ */
+interface InputSourceInterface
+{
+    /**
+     * @returns mixed The context-specific source from which to extract arguments' source values e.g. an HTTP request or a CLI input
+     */
+    public function getSource(): mixed;
+}
diff --git a/...omponent/ArgumentResolver/SourceValue.php → ...t/ArgumentResolver/Source/SourceValue.php b/...omponent/ArgumentResolver/SourceValue.php → ...t/ArgumentResolver/Source/SourceValue.php
@@ -1,7 +1,12 @@
 <?php
 
-namespace Symfony\Component\ArgumentResolver;
+namespace Symfony\Component\ArgumentResolver\ArgumentValueSource;
 
+/**
+ * Holds a source value to be resolved to an argument.
+ *
+ * @author Robin Chalas <robin@baksla.sh>
+ */
 final readonly class SourceValue
 {
     const NOT_FOUND = 'notfound';

diff --git a/src/Symfony/Component/ArgumentResolver/ValueResolver/BackedEnumValueResolver.php b/src/Symfony/Component/ArgumentResolver/ValueResolver/BackedEnumValueResolver.php
@@ -12,12 +12,12 @@
 namespace Symfony\Component\ArgumentResolver\ValueResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
-use Symfony\Component\ArgumentResolver\SourceValue;
 use Symfony\Component\ArgumentResolver\ValueAccessor\RawValueAccessorInterface;
 
 /**
- * Attempt to resolve backed enum cases from request attributes, for a route path parameter,
+ * Attempts to resolve backed enum cases from request attributes, for a route path parameter,
  * leading to a 404 Not Found if the attribute value isn't a valid backing value for the enum type.
  *
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>

diff --git a/src/Symfony/Component/ArgumentResolver/ValueResolver/DateTimeValueResolver.php b/src/Symfony/Component/ArgumentResolver/ValueResolver/DateTimeValueResolver.php
@@ -13,9 +13,9 @@
 
 use Psr\Clock\ClockInterface;
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\Attribute\MapDateTime;
 use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
-use Symfony\Component\ArgumentResolver\SourceValue;
 
 /**
  * Convert DateTime instances from request attribute variable.
@@ -56,7 +56,7 @@
        }

        if ($value instanceof \DateTimeInterface) {
            return [$value instanceof $class ? $value : $class::createFromInterface($value)];
        }

        $format = null;
@@ -67,9 +67,9 @@
        }

        if (null !== $format) {
            $date = $class::createFromFormat($format, $value, $this->clock?->now()->getTimeZone());

            if (($class::getLastErrors() ?: ['warning_count' => 0])['warning_count']) {
                $date = false;
            }
        } else {

diff --git a/src/Symfony/Component/ArgumentResolver/ValueResolver/DefaultValueResolver.php b/src/Symfony/Component/ArgumentResolver/ValueResolver/DefaultValueResolver.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\ArgumentResolver\ValueResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 
 /**
  * Yields the default value defined in the action signature when no value has been given.

diff --git a/...solver/NotTaggedCallableValueResolver.php → ...esolver/NotTaggedServiceValueResolver.php b/...solver/NotTaggedCallableValueResolver.php → ...esolver/NotTaggedServiceValueResolver.php
@@ -13,15 +13,15 @@
 
 use Psr\Container\ContainerInterface;
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
  * Provides an intuitive error message when controller fails because it is not registered as a service.
  *
  * @author Simeon Kolev <simeon.kolev9@gmail.com>
  */
-final readonly class NotTaggedCallableValueResolver implements ValueResolverInterface
+final readonly class NotTaggedServiceValueResolver implements ValueResolverInterface
 {
     public function __construct(
         private ContainerInterface $container,

diff --git a/src/Symfony/Component/ArgumentResolver/ValueResolver/ServiceValueResolver.php b/src/Symfony/Component/ArgumentResolver/ValueResolver/ServiceValueResolver.php
@@ -13,8 +13,8 @@
 
 use Psr\Container\ContainerInterface;
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\Exception\NearMissValueResolverException;
-use Symfony\Component\ArgumentResolver\SourceValue;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**

diff --git a/src/Symfony/Component/ArgumentResolver/ValueResolver/UidValueResolver.php b/src/Symfony/Component/ArgumentResolver/ValueResolver/UidValueResolver.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\ArgumentResolver\ValueResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
-use Symfony\Component\ArgumentResolver\SourceValue;
 use Symfony\Component\Uid\AbstractUid;
 
 /**

diff --git a/src/Symfony/Component/ArgumentResolver/ValueResolver/ValueResolverInterface.php b/src/Symfony/Component/ArgumentResolver/ValueResolver/ValueResolverInterface.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\ArgumentResolver\ValueResolver;
 
-use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
+use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
+use Symfony\Component\ArgumentResolver\Exception\NearMissValueResolverException;
 
 /**
  * Responsible for resolving the value of an argument based on its metadata and its source value.
@@ -25,6 +26,9 @@ interface ValueResolverInterface
 {
     /**
      * Returns the resolved argument value(s).
-     * Returns the resolved argument value(s).
+     * Returns the resolved argument value(s).
+     *
+     * @return T
-     * Returns the resolved argument value(s).
+     * Returns the resolved argument value(s).
+     *
+     * @return T
+     *
+     * @throws InvalidSourceValueException
+     * @throws NearMissValueResolverException
      */
     public function resolveArgument(ArgumentMetadata $argument, SourceValue $value): iterable;
 }
diff --git a/src/Symfony/Component/ArgumentResolver/ValueResolver/VariadicValueResolver.php b/src/Symfony/Component/ArgumentResolver/ValueResolver/VariadicValueResolver.php
@@ -12,9 +12,8 @@
 namespace Symfony\Component\ArgumentResolver\ValueResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\Exception\InvalidArgumentException;
-use Symfony\Component\ArgumentResolver\SourceValue;
-use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
 
 /**
  * Yields a variadic argument's values from the request attributes.
@@ -35,6 +34,7 @@ public function resolveArgument(ArgumentMetadata $argument, SourceValue $value):
             throw new InvalidArgumentException(\sprintf('Argument "...$%1$s" is required to be an array, source value "%1$s" contains a type of "%2$s" instead.', $argument->getName(), get_debug_type($values)));
         }
 
+
         return $values;
     }
 }
diff --git a/src/Symfony/Component/ArgumentResolver/phpunit.xml.dist b/src/Symfony/Component/ArgumentResolver/phpunit.xml.dist
@@ -13,7 +13,7 @@
     </php>
 
     <testsuites>
-        <testsuite name="Symfony Security Password Component Suite">
+        <testsuite name="Symfony Argument Resolver Component Suite">
             <directory>./Tests/</directory>
         </testsuite>
     </testsuites>

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/BackedEnumValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/BackedEnumValueResolver.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
-use Symfony\Component\ArgumentResolver\SourceValue;
 use Symfony\Component\ArgumentResolver\ValueResolver\BackedEnumValueResolver as BaseBackedEnumValueResolver;
 use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/...ony/Component/HttpKernel/Controller/ArgumentResolver/ControllerValueResolverInterface.php b/...ony/Component/HttpKernel/Controller/ArgumentResolver/ControllerValueResolverInterface.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
 use Symfony\Component\HttpFoundation\Request;
 

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
@@ -13,8 +13,8 @@
 
 use Psr\Clock\ClockInterface;
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
-use Symfony\Component\ArgumentResolver\SourceValue;
 use Symfony\Component\ArgumentResolver\ValueResolver\DateTimeValueResolver as BaseDateTimeValueResolver;
 use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DefaultValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DefaultValueResolver.php
@@ -14,7 +14,7 @@
 trigger_deprecation('symfony/http-kernel', '7.3', 'The "%s" class is deprecated, use "%s" instead.', DefaultValueResolver::class, BaseDefaultValueResolver::class);
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\ValueResolver\DefaultValueResolver as BaseDefaultValueResolver;
 use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/...ony/Component/HttpKernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php b/...ony/Component/HttpKernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php
@@ -13,9 +13,8 @@
 
 use Psr\Container\ContainerInterface;
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
-use Symfony\Component\ArgumentResolver\SourceValue;
-use Symfony\Component\ArgumentResolver\ValueResolver\NotTaggedCallableValueResolver;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
+use Symfony\Component\ArgumentResolver\ValueResolver\NotTaggedServiceValueResolver;
 use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\HttpFoundation\Request;
@@ -35,11 +34,11 @@ public function __construct(
         ValueResolverInterface|ContainerInterface $inner,
     ) {
         if ($inner instanceof ContainerInterface) {
-            trigger_deprecation('symfony/http-kernel', '7.3', sprintf('The "$container" argument of "%s::__construct()" is deprecated, pass a "%s" instance as "$inner" instead.', __CLASS__, NotTaggedCallableValueResolver::class));
-            $this->inner = new NotTaggedCallableValueResolver($inner);
+            trigger_deprecation('symfony/http-kernel', '7.3', sprintf('The "$container" argument of "%s::__construct()" is deprecated, pass a "%s" instance as "$inner" instead.', __CLASS__, NotTaggedServiceValueResolver::class));
+            $this->inner = new NotTaggedServiceValueResolver($inner);
             return;
         }
-        $this->inner = new NotTaggedCallableValueResolver($inner);
+        $this->inner = new NotTaggedServiceValueResolver($inner);
     }
 
     public function resolveArgument(ArgumentMetadata $argument, SourceValue $value): iterable

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\MapQueryParameter;

diff --git a/...ymfony/Component/HttpKernel/Controller/ArgumentResolver/RequestAttributeValueResolver.php b/...ymfony/Component/HttpKernel/Controller/ArgumentResolver/RequestAttributeValueResolver.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as LegacyValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata as LegacyArgumentMetadata;

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\Exception\NearMissValueResolverException;
-use Symfony\Component\ArgumentResolver\SourceValue;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestValueResolver.php
@@ -12,12 +12,12 @@
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\Exception\NearMissValueResolverException;
-use Symfony\Component\ArgumentResolver\SourceValue;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NearMissValueResolverException as LegacyNearMissValueResolverException;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as LegacyValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata as LegacyArgumentMetadata;
+use Symfony\Component\HttpKernel\Exception\NearMissValueResolverException as LegacyNearMissValueResolverException;
 
 /**
  * Yields the same instance as the request object passed along.

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php
@@ -13,7 +13,7 @@
 
 use Psr\Container\ContainerInterface;
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\ValueResolver\ServiceValueResolver as BaseServiceValueResolver;
 use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/SessionValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/SessionValueResolver.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as LegacyValueResolverInterface;

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as LegacyValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata as LegacyArgumentMetadata;

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/UidValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/UidValueResolver.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
-use Symfony\Component\ArgumentResolver\SourceValue;
 use Symfony\Component\ArgumentResolver\ValueResolver\UidValueResolver as BaseUidValueResolver;
 use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/VariadicValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/VariadicValueResolver.php
@@ -11,9 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
-use Doctrine\Common\Collections\Expr\Value;
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\SourceValue;
+use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
 use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
 use Symfony\Component\ArgumentResolver\ValueResolver\VariadicValueResolver as BaseVariadicValueResolver;
 use Symfony\Component\HttpFoundation\Request;