8000 Experimenting ways to abstract the input source · symfony/symfony@f28fb52 · GitHub
[go: up one dir, main page]
Skip to content

Commit f28fb52

Browse files
chalasrchalasr
committed
Experimenting ways to abstract the input source
1 parent d29f355 commit f28fb52

30 files changed

+106
-41
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
2727

2828
/**
29-
* Responsible for resolving the arguments passed to an action.
29+
* Responsible for resolving the arguments passed to a callable.
3030
*
3131
* @author Iltar van der Berg <kjarli@gmail.com>
3232
* @author Robin Chalas <robin@baksla.sh>
@@ -140,6 +140,6 @@ protected static function getExtraValueResolversForNamed(): array
140140
*/
141141
protected function callResolver($resolver, ArgumentMetadata $metadata, mixed $input): iterable
142142
{
143-
return $resolver->resolve($metadata, $input);
143+
return $resolver->resolveArgument($metadata, $input);
144144
}
145145
}

‎src/Symfony/Component/ArgumentResolver/ArgumentResolverInterface.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
namespace Symfony\Component\ArgumentResolver;
1313

14+
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\ValueSourceInterface;
16+
1417
/**
1518
* An ArgumentResolverInterface instance knows how to determine the
1619
* arguments for a specific function.
@@ -27,5 +30,5 @@ interface ArgumentResolverInterface
2730
*
2831
* @throws \RuntimeException When no value could be provided for a required argument
2932
*/
30-
public function getArguments(mixed $input, callable $callable, ?\ReflectionFunctionAbstract $reflector = null): array;
33+
public function getArguments(ValueSourceInterface $source, callable $callable, ?\ReflectionFunctionAbstract $reflector = null): array;
3134
}

‎src/Symfony/Component/ArgumentResolver/README.md

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,37 @@
11
ArgumentResolver Component
22
========================
33

4-
The ArgumentResolver component provides
4+
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.
5+
6+
```php
7+
<?php
8+
9+
use Symfony\Component\ArgumentResolver\ArgumentResolver;
10+
11+
enum OrderStatus {
12+
case PLACED = 'placed';
13+
case CONFIRMED = 'confirmed';
14+
case IN_TRANSIT = 'transit';
15+
case SHIPPED = 'shipped';
16+
case DELIVERED = 'delivered';
17+
}
18+
19+
final class ChangeOrderStatus
20+
{
21+
public function __invoke(
22+
int $orderId,
23+
OrderRepositoryInterface $OrderStatus $newStatus,
24+
?\DateTimeInterface $deliveryDate = null
25+
) {
26+
// ...
27+
}
28+
}
29+
30+
$arguments = (new ArgumentResolver)->getArguments($ca);
31+
32+
33+
34+
```
535

636
Getting Started
737
---------------

‎src/Symfony/Component/ArgumentResolver/Source/InputSourceInterface.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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\ArgumentResolver\ArgumentValueSource;
13+
14+
/**
15+
* Exposes a context-specific input source from which arguments' values can be extracted then resolved.
16+
*
17+
* @author Robin Chalas <robin@baksla.sh>
18+
*/
19+
interface InputSourceInterface
20+
{
21+
/**
22+
* @returns mixed The context-specific source from which to extract arguments' source values e.g. an HTTP request or a CLI input
23+
*/
24+
public function getSource(): mixed;
25+
}

‎src/Symfony/Component/ArgumentResolver/SourceValue.php renamed to ‎src/Symfony/Component/ArgumentResolver/Source/SourceValue.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
<?php
22

3-
namespace Symfony\Component\ArgumentResolver;
3+
namespace Symfony\Component\ArgumentResolver\ArgumentValueSource;
44

5+
/**
6+
* Holds a source value to be resolved to an argument.
7+
*
8+
* @author Robin Chalas <robin@baksla.sh>
9+
*/
510
final readonly class SourceValue
611
{
712
const NOT_FOUND = 'notfound';

‎src/Symfony/Component/ArgumentResolver/ValueResolver/BackedEnumValueResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
namespace Symfony\Component\ArgumentResolver\ValueResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1516
use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
1717
use Symfony\Component\ArgumentResolver\ValueAccessor\RawValueAccessorInterface;
1818

1919
/**
20-
* Attempt to resolve backed enum cases from request attributes, for a route path parameter,
20+
* Attempts to resolve backed enum cases from request attributes, for a route path parameter,
2121
* leading to a 404 Not Found if the attribute value isn't a valid backing value for the enum type.
2222
*
2323
* @author Maxime Steinhausser <maxime.steinhausser@gmail.com>

‎src/Symfony/Component/ArgumentResolver/ValueResolver/DateTimeValueResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
use Psr\Clock\ClockInterface;
1515
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
16+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1617
use Symfony\Component\ArgumentResolver\Attribute\MapDateTime;
1718
use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
18-
use Symfony\Component\ArgumentResolver\SourceValue;
1919

2020
/**
2121
* Convert DateTime instances from request attribute variable.

‎src/Symfony/Component/ArgumentResolver/ValueResolver/DefaultValueResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\ArgumentResolver\ValueResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15-
use Symfony\Component\ArgumentResolver\SourceValue;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1616

1717
/**
1818
* Yields the default value defined in the action signature when no value has been given.

‎src/Symfony/Component/ArgumentResolver/ValueResolver/NotTaggedCallableValueResolver.php renamed to ‎src/Symfony/Component/ArgumentResolver/ValueResolver/NotTaggedServiceValueResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313

1414
use Psr\Container\ContainerInterface;
1515
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
16+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1717
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
< F438 /code>
1818

1919
/**
2020
* Provides an intuitive error message when controller fails because it is not registered as a service.
2121
*
2222
* @author Simeon Kolev <simeon.kolev9@gmail.com>
2323
*/
24-
final readonly class NotTaggedCallableValueResolver implements ValueResolverInterface
24+
final readonly class NotTaggedServiceValueResolver implements ValueResolverInterface
2525
{
2626
public function __construct(
2727
private ContainerInterface $container,

‎src/Symfony/Component/ArgumentResolver/ValueResolver/ServiceValueResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
use Psr\Container\ContainerInterface;
1515
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
16+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1617
use Symfony\Component\ArgumentResolver\Exception\NearMissValueResolverException;
17-
use Symfony\Component\ArgumentResolver\SourceValue;
1818
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
1919

2020
/**

‎src/Symfony/Component/ArgumentResolver/ValueResolver/UidValueResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\ArgumentResolver\ValueResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1516
use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
1717
use Symfony\Component\Uid\AbstractUid;
1818

1919
/**

‎src/Symfony/Component/ArgumentResolver/ValueResolver/ValueResolverInterface.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
namespace Symfony\Component\ArgumentResolver\ValueResolver;
1313

14-
use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
1514
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
16+
use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
17+
use Symfony\Component\ArgumentResolver\Exception\NearMissValueResolverException;
1718

1819
/**
1920
* Responsible for resolving the value of an argument based on its metadata and its source value.
@@ -25,6 +26,9 @@ interface ValueResolverInterface
2526
{
2627
/**
2728
* Returns the resolved argument value(s).
29+
*
30+
* @throws InvalidSourceValueException
31+
* @throws NearMissValueResolverException
2832
*/
2933
public function resolveArgument(ArgumentMetadata $argument, SourceValue $value): iterable;
3034
}

‎src/Symfony/Component/ArgumentResolver/ValueResolver/VariadicValueResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
namespace Symfony\Component\ArgumentResolver\ValueResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1516
use Symfony\Component\ArgumentResolver\Exception\InvalidArgumentException;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
17-
use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
1817

1918
/**
2019
* Yields a variadic argument's values from the request attributes.
@@ -35,6 +34,7 @@ public function resolveArgument(ArgumentMetadata $argument, SourceValue $value):
3534
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)));
3635
}
3736

37+
3838
return $values;
3939
}
4040
}

‎src/Symfony/Component/ArgumentResolver/phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</php>
1414

1515
<testsuites>
16-
<testsuite name="Symfony Security Password Component Suite">
16+
<testsuite name="Symfony Argument Resolver Component Suite">
1717
<directory>./Tests/</directory>
1818
</testsuite>
1919
</testsuites>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1516
use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
1717
use Symfony\Component\ArgumentResolver\ValueResolver\BackedEnumValueResolver as BaseBackedEnumValueResolver;
1818
use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
1919
use Symfony\Component\HttpFoundation\Request;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15-
use Symfony\Component\ArgumentResolver\SourceValue;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1616
use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
1717
use Symfony\Component\HttpFoundation\Request;
1818

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
use Psr\Clock\ClockInterface;
1515
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
16+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1617
use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
17-
use Symfony\Component\ArgumentResolver\SourceValue;
1818
use Symfony\Component\ArgumentResolver\ValueResolver\DateTimeValueResolver as BaseDateTimeValueResolver;
1919
use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
2020
use Symfony\Component\HttpFoundation\Request;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
trigger_deprecation('symfony/http-kernel', '7.3', 'The "%s" class is deprecated, use "%s" instead.', DefaultValueResolver::class, BaseDefaultValueResolver::class);
1515

1616
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
17-
use Symfony\Component\ArgumentResolver\SourceValue;
17+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1818
use Symfony\Component\ArgumentResolver\ValueResolver\DefaultValueResolver as BaseDefaultValueResolver;
1919
use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
2020
use Symfony\Component\HttpFoundation\Request;

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313

1414
use Psr\Container\ContainerInterface;
1515
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
16-
use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
17-
use Symfony\Component\ArgumentResolver\SourceValue;
18-
use Symfony\Component\ArgumentResolver\ValueResolver\NotTaggedCallableValueResolver;
16+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
17+
use Symfony\Component\ArgumentResolver\ValueResolver\NotTaggedServiceValueResolver;
1918
use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
2019
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
2120
use Symfony\Component\HttpFoundation\Request;
@@ -35,11 +34,11 @@ public function __construct(
3534
ValueResolverInterface|ContainerInterface $inner,
3635
) {
3736
if ($inner instanceof ContainerInterface) {
38-
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));
39-
$this->inner = new NotTaggedCallableValueResolver($inner);
37+
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));
38+
$this->inner = new NotTaggedServiceValueResolver($inner);
4039
return;
4140
}
42-
$this->inner = new NotTaggedCallableValueResolver($inner);
41+
$this->inner = new NotTaggedServiceValueResolver($inner);
4342
}
4443

4544
public function resolveArgument(ArgumentMetadata $argument, SourceValue $value): iterable

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15-
use Symfony\Component\ArgumentResolver\SourceValue;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1616
use Symfony\Component\HttpFoundation\InputBag;
1717
use Symfony\Component\HttpFoundation\Request;
1818
use Symfony\Component\HttpKernel\Attribute\MapQueryParameter;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15-
use Symfony\Component\ArgumentResolver\SourceValue;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1616
use Symfony\Component\HttpFoundation\Request;
1717
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as LegacyValueResolverInterface;
1818
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata as LegacyArgumentMetadata;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1516
use Symfony\Component\ArgumentResolver\Exception\NearMissValueResolverException;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
1717
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1818
use Symfony\Component\HttpFoundation\File\UploadedFile;
1919
use Symfony\Component\HttpFoundation\Request;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1516
use Symfony\Component\ArgumentResolver\Exception\NearMissValueResolverException;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
1717
use Symfony\Component\HttpFoundation\Request;
18-
use Symfony\Component\HttpKernel\Exception\NearMissValueResolverException as LegacyNearMissValueResolverException;
1918
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as LegacyValueResolverInterface;
2019
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata as LegacyArgumentMetadata;
20+
use Symfony\Component\HttpKernel\Exception\NearMissValueResolverException as LegacyNearMissValueResolverException;
2121

2222
/**
2323
* Yields the same instance as the request object passed along.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Psr\Container\ContainerInterface;
1515
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
16+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1717
use Symfony\Component\ArgumentResolver\ValueResolver\ServiceValueResolver as BaseServiceValueResolver;
1818
use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
1919
use Symfony\Component\HttpFoundation\Request;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15-
use Symfony\Component\ArgumentResolver\SourceValue;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1616
use Symfony\Component\HttpFoundation\Request;
1717
use Symfony\Component\HttpFoundation\Session\SessionInterface;
1818
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as LegacyValueResolverInterface;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15-
use Symfony\Component\ArgumentResolver\SourceValue;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1616
use Symfony\Component\HttpFoundation\Request;
1717
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as LegacyValueResolverInterface;
1818
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata as LegacyArgumentMetadata;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1313

1414
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1516
use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
1717
use Symfony\Component\ArgumentResolver\ValueResolver\UidValueResolver as BaseUidValueResolver;
1818
use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
1919
use Symfony\Component\HttpFoundation\Request;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111

1212
namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1313

14-
use Doctrine\Common\Collections\Expr\Value;
1514
use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
16-
use Symfony\Component\ArgumentResolver\SourceValue;
15+
use Symfony\Component\ArgumentResolver\ArgumentValueSource\SourceValue;
1716
use Symfony\Component\ArgumentResolver\ValueResolver\ValueResolverInterface;
1817
use Symfony\Component\ArgumentResolver\ValueResolver\VariadicValueResolver as BaseVariadicValueResolver;
1918
use Symfony\Component\HttpFoundation\Request;

0 commit comments

Comments
 (0)
0