Rework

Author: chalasr

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -101,7 +101,7 @@
 use Symfony\Component\HttpKernel\Attribute\AsTargetedValueResolver;
 use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
-use Symfony\Component\HttpKernel\Controller\ArgumentResolver\ValueResolver\ControllerValueResolverInterface;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\ControllerValueResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
 use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;

src/Symfony/Component/ArgumentResolver/Attribute/MapDateTime.php

@@ -18,15 +18,15 @@
  * Controller parameter tag to configure DateTime arguments.
  */
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
-final class MapDateTime extends ValueResolver
+class MapDateTime extends ValueResolver
 {
     /**
      * @param string|null                                 $format   The DateTime format to use, @see https://php.net/datetime.format
      * @param bool                                        $disabled Whether this value resolver is disabled; this allows to enable a value resolver globally while disabling it in specific cases
      * @param class-string<ValueResolverInterface>|string $resolver The name of the resolver to use
      */
     public function __construct(
-        public readonly ?string $format = null,
+        public ?string $format = null,
         bool $disabled = false,
         string $resolver = DateTimeValueResolver::class,
     ) {

src/Symfony/Component/ArgumentResolver/Exception/InvalidRawValueException.php renamed to src/Symfony/Component/ArgumentResolver/Exception/InvalidSourceValueException.php

@@ -14,6 +14,6 @@
 /**
  * @author Robin Chalas <[email protected]>
  */
-class InvalidRawValueException extends RuntimeException implements ExceptionInterface
+class InvalidSourceValueException extends RuntimeException implements ExceptionInterface
 {
 }

src/Symfony/Component/ArgumentResolver/SourceValue.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Symfony\Component\ArgumentResolver;
+
+final readonly class SourceValue
+{
+    const NOT_FOUND = 'notfound';
+
+    public function __construct(private mixed $value)
+    {
+    }
+
+    public function get(): mixed
+    {
+        return $this->value;
+    }
+
+    public static function notFound(): self
+    {
+        return new self(static::NOT_FOUND);
+    }
+}

src/Symfony/Component/ArgumentResolver/ValueResolver/Traits/BackedEnumValueResolverTrait.php renamed to src/Symfony/Component/ArgumentResolver/ValueResolver/BackedEnumValueResolver.php

@@ -9,10 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\ArgumentResolver\ValueResolver\Traits;
+namespace Symfony\Component\ArgumentResolver\ValueResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\Exception\InvalidRawValueException;
+use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
+use Symfony\Component\ArgumentResolver\SourceValue;
 use Symfony\Component\ArgumentResolver\ValueAccessor\RawValueAccessorInterface;
 
 /**
@@ -22,21 +23,21 @@
  * @author Maxime Steinhausser <[email protected]>
  * @author Robin Chalas <[email protected]>
  */
-trait BackedEnumValueResolverTrait
+final readonly class BackedEnumValueResolver implements ValueResolverInterface
 {
-    private function doResolve(ArgumentMetadata $argument, array $rawValues): iterable
+    public function resolveArgument(ArgumentMetadata $argument, SourceValue $value): iterable
     {
         if (!is_subclass_of($argument->getType(), \BackedEnum::class)) {
             return [];
         }
 
-        if ($argument->isVariadic()) {
+        $value = $value->get();
+
+        if ($argument->isVariadic() || SourceValue::NOT_FOUND === $value) {
             // not supported
             return [];
         }
 
-        $value = $rawValues[0] ?? null;
-
         if (null === $value) {
             return [null];
         }
@@ -46,7 +47,7 @@ private function doResolve(ArgumentMetadata $argument, array $rawValues): iterab
         }
 
         if (!\is_int($value) && !\is_string($value)) {
-            throw new \LogicException(\sprintf('Could not resolve the "%s $%s" controller argument: expecting an int or string, got "%s".', $argument->getType(), $argument->getName(), get_debug_type($value)));
+            throw new \LogicException(\sprintf('Could not resolve the "%s $%s" argument: expecting an int or string, got "%s".', $argument->getType(), $argument->getName(), get_debug_type($value)));
         }
 
         /** @var class-string<\BackedEnum> $enumType */
@@ -55,7 +56,7 @@ private function doResolve(ArgumentMetadata $argument, array $rawValues): iterab
         try {
             return [$enumType::from($value)];
         } catch (\ValueError|\TypeError $e) {
-            throw new InvalidRawValueException(\sprintf('Could not resolve the "%s $%s" controller argument: ', $argument->getType(), $argument->getName()).$e->getMessage(), $e->getCode(), $e);
+            throw new InvalidSourceValueException(\sprintf('Could not resolve the "%s $%s" argument: ', $argument->getType(), $argument->getName()).$e->getMessage(), $e->getCode(), $e);
         }
     }
 }

src/Symfony/Component/ArgumentResolver/ValueResolver/Traits/DateTimeValueResolverTrait.php renamed to src/Symfony/Component/ArgumentResolver/ValueResolver/DateTimeValueResolver.php

@@ -9,12 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\ArgumentResolver\ValueResolver\Traits;
+namespace Symfony\Component\ArgumentResolver\ValueResolver;
 
 use Psr\Clock\ClockInterface;
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
-use Symfony\Component\ArgumentResolver\Exception\InvalidRawValueException;
-use Symfony\Component\HttpKernel\Attribute\MapDateTime;
+use Symfony\Component\ArgumentResolver\Attribute\MapDateTime;
+use Symfony\Component\ArgumentResolver\Exception\InvalidSourceValueException;
+use Symfony\Component\ArgumentResolver\SourceValue;
 
 /**
  * Convert DateTime instances from request attribute variable.
@@ -23,20 +24,25 @@
  * @author Tim Goudriaan <[email protected]>
  * @author Robin Chalas <[email protected]>
  */
-trait DateTimeValueResolverTrait
+final readonly class DateTimeValueResolver implements ValueResolverInterface
 {
     public function __construct(
         private readonly ?ClockInterface $clock = null,
     ) {
     }
 
-    private function doResolve(ArgumentMetadata $argument, array $rawValues): iterable
+    public function resolveArgument(ArgumentMetadata $argument, SourceValue $value): iterable
     {
         if (!is_a($argument->getType(), \DateTimeInterface::class, true)) {
             return [];
         }
 
-        $value = $rawValues[0] ?? null;
+        $value = $value->get();
+
+        if (SourceValue::NOT_FOUND === $value) {
+            return [];
+        }
+
         $class = \DateTimeInterface::class === $argument->getType() ? \DateTimeImmutable::class : $argument->getType();
 
         if (!$value) {
@@ -78,7 +84,7 @@ private function doResolve(ArgumentMetadata $argument, array $rawValues): iterab
         }
 
         if (!$date) {
-            throw new InvalidRawValueException(\sprintf('Invalid date given for parameter "%s".', $argument->getName()));
+            throw new InvalidSourceValueException(\sprintf('Invalid date given for parameter "%s".', $argument->getName()));
         }
 
         return [$date];

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

@@ -12,6 +12,7 @@
 namespace Symfony\Component\ArgumentResolver\ValueResolver;
 
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\SourceValue;
 
 /**
  * Yields the default value defined in the action signature when no value has been given.
@@ -20,7 +21,7 @@
  */
 final class DefaultValueResolver implements ValueResolverInterface
 {
-    public function resolve(ArgumentMetadata $argument): iterable
+    public function resolveArgument(ArgumentMetadata $argument, SourceValue $value): iterable
     {
         if ($argument->hasDefaultValue()) {
             return [$argument->getDefaultValue()];

src/Symfony/Component/ArgumentResolver/ValueResolver/NotTaggedCallableValueResolver.php

@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ArgumentResolver\ValueResolver;
+
+use Psr\Container\ContainerInterface;
+use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
+use Symfony\Component\ArgumentResolver\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 <[email protected]>
+ */
+final readonly class NotTaggedCallableValueResolver implements ValueResolverInterface
+{
+    public function __construct(
+        private ContainerInterface $container,
+    ) {
+    }
+
+    public function resolveArgument(ArgumentMetadata $argument, SourceValue $value): iterable
+    {
+        $callable = $value->get();
+
+        if (\is_array($callable) && \is_callable($callable, true) && \is_string($callable[0])) {
+            $callable = $callable[0].'::'.$callable[1];
+        } elseif (!\is_string($callable) || '' === $callable || SourceValue::NOT_FOUND === $callable) {
+            return [];
+        }
+
+        if ('\\' === $callable[0]) {
+            $callable = ltrim($callable, '\\');
+        }
+
+        if (!$this->container->has($callable)) {
+            $callable = (false !== $i = strrpos($callable, ':'))
+                ? substr($callable, 0, $i).strtolower(substr($callable, $i))
+                : $callable.'::__invoke';
+        }
+
+        if ($this->container->has($callable)) {
+            return [];
+        }
+
+        throw new RuntimeException(\sprintf('Could not resolve argument $%s of "%s()", maybe you forgot to register it as a service?', $argument->getName(), $callable));
+    }
+}

src/Symfony/Component/ArgumentResolver/ValueResolver/Traits/ServiceValueResolverTrait.php renamed to src/Symfony/Component/ArgumentResolver/ValueResolver/ServiceValueResolver.php

@@ -9,11 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\ArgumentResolver\ValueResolver\Traits;
+namespace Symfony\Component\ArgumentResolver\ValueResolver;
 
 use Psr\Container\ContainerInterface;
 use Symfony\Component\ArgumentResolver\ArgumentMetadata\ArgumentMetadata;
 use Symfony\Component\ArgumentResolver\Exception\NearMissValueResolverException;
+use Symfony\Component\ArgumentResolver\SourceValue;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
@@ -22,16 +23,26 @@
  * @author Nicolas Grekas <[email protected]>
  * @author Robin Chalas <[email protected]>
  */
-trait ServiceValueResolverTrait
+final readonly class ServiceValueResolver implements ValueResolverInterface
 {
     public function __construct(
         private ContainerInterface $container,
     ) {
     }
 
-    private function doResolve(ArgumentMetadata $argument, array $rawValues): iterable
+    public function resolveArgument(ArgumentMetadata $argument, SourceValue $value): iterable
     {
-        $callable = $rawValues[0];
+        $callable = $value->get();
+
+        if (SourceValue::NOT_FOUND === $callable) {
+            return [];
+        }
+
+        if (\is_array($callable) && \is_callable($callable, true) && \is_string($callable[0])) {
+            $callable = $callable[0].'::'.$callable[1];
+        } elseif (!\is_string($callable) || '' === $callable) {
+            return [];
+        }
 
         if ('\\' === $callable[0]) {
             $callable = ltrim($callable, '\\');