collect all transformation failures

xabbuh · xabbuh · commit 016b3d56dae9 · 2020-06-19T08:07:10.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Validator\ContextualValidatorInterface;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
@@ -146,8 +147,8 @@ public function validate($form, Constraint $formConstraint)
             /** @var FormInterface $child */
             foreach ($form as $child) {
                 if (!$child->isSynchronized()) {
+                    $this->validateChildForm($validator, $child);
                     $childrenSynchronized = false;
-                    break;
                 }
             }
 
@@ -250,4 +251,11 @@ private static function getConstraintsInGroups($constraints, $group)
             return \in_array($group, $constraint->groups, true);
         });
     }
+
+    private function validateChildForm(ContextualValidatorInterface $validator, FormInterface $form)
+    {
+        $fieldFormConstraint = new Form();
+        $this->context->setNode($this->context->getValue(), $form, $this->context->getMetadata(), $this->context->getPropertyPath());
+        $validator->atPath(sprintf('children[%s]', $form->getName()))->validate($form, $fieldFormConstraint);
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
@@ -13,6 +13,9 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
@@ -329,6 +332,63 @@ public function testContextIsPopulatedWithFormBeingValidatedUsingGroupSequence()
 
         $this->assertCount(0, $violations);
     }
+
+    public function testSubmitFormChoiceInvalid()
+    {
+        $form = $this->formFactory->create(DateType::class, null, [
+            'widget' => 'choice',
+            'years' => [2021],
+        ]);
+
+        $form->submit([
+            'year' => '2020',
+            'month' => '13',
+            'day' => '13',
+        ]);
+
+        $this->assertTrue($form->isSubmitted());
+        $this->assertFalse($form->isValid());
+        $this->assertCount(2, $form->getErrors());
+        $this->assertSame('This value is not valid.', $form->getErrors()[0]->getMessage());
+        $this->assertSame($form->get('year'), $form->getErrors()[0]->getOrigin());
+        $this->assertSame('This value is not valid.', $form->getErrors()[1]->getMessage());
+        $this->assertSame($form->get('month'), $form->getErrors()[1]->getOrigin());
+    }
+
+    public function testDoNotAddInvalidMessageIfChildFormIsAlreadyNotSynchronized()
+    {
+        $formBuilder = $this->formFactory->createBuilder()
+            ->add('field1')
+            ->add('field2')
+            ->addModelTransformer(new CallbackTransformer(
+                function () {
+                },
+                function () {
+                    throw new TransformationFailedException('This value is invalid.');
+                }
+            ));
+        $formBuilder->get('field2')->addModelTransformer(new CallbackTransformer(
+                function () {
+                },
+                function () {
+                    throw new TransformationFailedException('This value is invalid.');
+                }
+            ));
+        $form = $formBuilder->getForm();
+
+        $form->submit([
+            'field1' => 'foo',
+            'field2' => 'bar',
+        ]);
+
+        $this->assertTrue($form->isSubmitted());
+        $this->assertFalse($form->isValid());
+        $this->assertCount(0, $form->getErrors());
+        $this->assertTrue($form->get('field1')->isValid());
+        $this->assertCount(0, $form->get('field1')->getErrors());
+        $this->assertFalse($form->get('field2')->isValid());
+        $this->assertCount(1, $form->get('field2')->getErrors());
+    }
 }
 
 class Foo
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -362,40 +362,6 @@ function () { throw new TransformationFailedException(); }
             ->assertRaised();
     }
 
-    // https://github.com/symfony/symfony/issues/4359
-    public function testDontMarkInvalidIfAnyChildIsNotSynchronized()
-    {
-        $object = new \stdClass();
-        $object->child = 'bar';
-
-        $failingTransformer = new CallbackTransformer(
-            function ($data) { return $data; },
-            function () { throw new TransformationFailedException(); }
-        );
-
-        $form = $this->getBuilder('name', '\stdClass')
-            ->setData($object)
-            ->addViewTransformer($failingTransformer)
-            ->setCompound(true)
-            ->setDataMapper(new PropertyPathMapper())
-            ->add(
-                $this->getBuilder('child')
-                    ->addViewTransformer($failingTransformer)
-            )
-            ->getForm();
-
-        // Launch transformer
-        $form->submit(['child' => 'foo']);
-
-        $this->assertTrue($form->isSubmitted());
-        $this->assertFalse($form->isSynchronized());
-        $this->expectNoValidate();
-
-        $this->validator->validate($form, new Form());
-
-        $this->assertNoViolation();
-    }
-
     public function testHandleGroupSequenceValidationGroups()
     {
         $object = new \stdClass();
