symfony · GaryPEGEOT · Mar 3, 2022 · Mar 3, 2022 · Mar 3, 2022 · Mar 5, 2022
commit 406f1eb48cc26a1af976a83397769f47f2777464
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -531,17 +531,6 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('mime_type.php');
         }
 
-        if ($this->isConfigEnabled($container, $config['validation']) && $this->isConfigEnabled($container, $config['serializer'])) {
-            $container->register(InputValidationFailedExceptionListener::class)
-                ->setArguments([new Reference('serializer'), new Reference('logger')])
-                // Must run before Symfony\Component\HttpKernel\EventListener\ErrorListener::onKernelException()
-                ->addTag('kernel.event_listener', ['event' => 'kernel.exception', 'priority' => 10]);
-
-            $container->register(UserInputResolver::class)
-                ->setArguments([new Reference('validator'), new Reference('serializer')])
-                ->addTag('controller.argument_value_resolver');
-        }
-
         $container->registerForAutoconfiguration(PackageInterface::class)
             ->addTag('assets.package');
         $container->registerForAutoconfiguration(Command::class)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
@@ -14,15 +14,18 @@
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\SerializerCacheWarmer;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
 use Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer;
 use Symfony\Component\PropertyInfo\Extractor\SerializerExtractor;
+use Symfony\Component\Serializer\ArgumentResolver\UserInputResolver;
 use Symfony\Component\Serializer\Encoder\CsvEncoder;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\Encoder\YamlEncoder;
+use Symfony\Component\Serializer\EventListener\InputValidationFailedExceptionListener;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorResolverInterface;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
@@ -68,6 +71,17 @@
 
         ->alias('serializer.property_accessor', 'property_accessor')
 
+        // Argument Resolvers
+        ->set(UserInputResolver::class)
+            ->args([service('serializer'), service('validator')->nullOnInvalid()])
+            ->tag('controller.argument_value_resolver')
+
+        // Event Listeners
+        ->set(InputValidationFailedExceptionListener::class)
+            ->args([service('serializer'), service('logger')])
+            // Must run before Symfony\Component\HttpKernel\EventListener\ErrorListener::onKernelException()
+            ->tag('kernel.event_listener', ['event' => 'kernel.exception', 'priority' => 10])
+
         // Discriminator Map
         ->set('serializer.mapping.class_discriminator_resolver', ClassDiscriminatorFromClassMetadata::class)
             ->args([service('serializer.mapping.class_metadata_factory')])

@@ -14,13 +14,14 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 use Symfony\Component\Serializer\Annotation\Input;
 use Symfony\Component\Serializer\Ex
8000
ception\PartialDenormalizationException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
-use Symfony\Component\Validator\Exception\ValidationFailedException;
+use Symfony\Component\Validator\Exception\InputValidationFailedException;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
@@ -32,7 +33,7 @@
  */
 class UserInputResolver implements ArgumentValueResolverInterface
 {
-    public function __construct(private ValidatorInterface $validator, private SerializerInterface $serializer, )
+    public function __construct(private SerializerInterface $serializer, private ?ValidatorInterface $validator = null)
     {
     }
 
@@ -55,12 +56,13 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
         ]);
         $format = $attribute->format ?? $request->attributes->get('_format', 'json');
 
-        $input = null;
         try {
             $input = $this->serializer->deserialize(data: $request->getContent(), type: $argument->getType(), format: $format, context: $context);
-
-            $errors = $this->validator->validate(value: $input, groups: $attribute->validationGroups);
         } catch (PartialDenormalizationException $e) {
+            if (null === $this->validator) {
+                throw new UnprocessableEntityHttpException(message: $e->getMessage(), previous: $e);
+            }
+
             $errors = new ConstraintViolationList();
 
             foreach ($e->getErrors() as $exception) {
@@ -73,10 +75,16 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
 
                 $errors->add(new ConstraintViolation($message, '', $parameters, null, $exception->getPath(), null));
             }
+
+            throw new InputValidationFailedException(null, $errors);
         }
 
-        if ($errors->count() > 0) {
-            throw new ValidationFailedException($input, $errors);
+        if ($this->validator) {
+            $errors = $this->validator->validate(value: $input, groups: $attribute->validationGroups);
+
+            if ($errors->count() > 0) {
+                throw new InputValidationFailedException($input, $errors);
+            }
         }
 
         yield $input;

@@ -15,7 +15,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Validator\Exception\ValidationFailedException;
+use Symfony\Component\Validator\Exception\InputValidationFailedException;
 
 /**
  * Works in duo with Symfony\Bundle\FrameworkBundle\ArgumentResolver\UserInputResolver.
@@ -33,7 +33,7 @@ public function __invoke(ExceptionEvent $event): void
         $throwable = $event->getThrowable();
         $format = $event->getRequest()->attributes->get('_format', 'json');
-        $format = $event->getRequest()->attributes->get('_format', 'json');
+        $format = $event->getPreferredFormat('json');
-        $format = $event->getRequest()->attributes->get('_format', 'json');
+        $format = $event->getPreferredFormat('json');
 
-        if (!$throwable instanceof ValidationFailedException) {
+        if (!$throwable instanceof InputValidationFailedException) {
             return;
         }
 

@@ -22,8 +22,9 @@ protected function setUp(): void
     {
         $encoders = [new JsonEncoder()];
         $normalizers = [new ObjectNormalizer()];
+        $validator = Validation::createValidatorBuilder()->enableAnnotationMapping()->getValidator();
 
-        $this->resolver = new UserInputResolver(Validation::createValidatorBuilder()->enableAnnotationMapping()->getValidator(), new Serializer($normalizers, $encoders));
+        $this->resolver = new UserInputResolver(serializer: new Serializer($normalizers, $encoders), validator: $validator);
     }
 
     public function testSupports()
@@ -63,7 +64,7 @@ public function provideInvalidValues(): \Generator
         yield 'Not normalizable' => ['{"randomText": ["Did", "You", "Expect", "That?"]}'];
     }
 
-    private function createMetadata(array $attributes = [new Input()]): ArgumentMetadata
+    private function createMetadata(?array $attributes = [new Input()]): ArgumentMetadata
     {
         $arguments = [
             'name' => 'foo',

diff --git a/src/Symfony/Component/Validator/Exception/InputValidationFailedException.php b/src/Symfony/Component/Validator/Exception/InputValidationFailedException.php
@@ -0,0 +1,19 @@
+<?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\Validator\Exception;
+
+/**
+ * @author Gary PEGEOT <garypegeot@gmail.com>
+ */
+class InputValidationFailedException extends ValidationFailedException
+{
+}