validate subforms in all validation groups

xabbuh · xabbuh · commit d17a4d2f51ae · 2020-05-19T16:33:27.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
@@ -86,7 +86,8 @@ public function validate($form, Constraint $formConstraint)
                             // sequence recursively, thus some fields could fail
                             // in different steps without breaking early enough
                             $this->resolvedGroups[$field] = (array) $group;
-                            $validator->atPath(sprintf($fieldPropertyPath, $field->getPropertyPath()))->validate($field, $formConstraint);
+                            $fieldFormConstraint = new Form();
+                            $validator->atPath(sprintf($fieldPropertyPath, $field->getPropertyPath()))->validate($field, $fieldFormConstraint);
                         }
                     }
 
@@ -100,6 +101,8 @@ public function validate($form, Constraint $formConstraint)
                     $this->resolvedGroups = null;
                 }
             } else {
+                $fieldPropertyPath = \is_object($data) ? 'children[%s]' : 'children%s';
+
                 if ($validateDataGraph) {
                     $validator->atPath('data')->validate($data, null, $groups);
                 }
@@ -125,6 +128,13 @@ public function validate($form, Constraint $formConstraint)
                         }
                     }
                 }
+
+                foreach ($form->all() as $field) {
+                    if ($field->isSubmitted()) {
+                        $fieldFormConstraint = new Form();
+                        $validator->atPath(sprintf($fieldPropertyPath, $field->getPropertyPath()))->validate($field, $fieldFormConstraint);
+                    }
+                }
             }
         } elseif (!$form->isSynchronized()) {
             $childrenSynchronized = true;
diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
@@ -13,8 +13,8 @@
 
 use Symfony\Component\Form\AbstractExtension;
 use Symfony\Component\Form\Extension\Validator\Constraints\Form;
-use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
+use Symfony\Component\Validator\Mapping\TraversalStrategy;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
@@ -37,7 +37,7 @@ public function __construct(ValidatorInterface $validator)
 
         /* @var $metadata ClassMetadata */
         $metadata->addConstraint(new Form());
-        $metadata->addPropertyConstraint('children', new Valid());
+        $metadata->traversalStrategy = TraversalStrategy::NONE;
 
         $this->validator = $validator;
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php
@@ -54,9 +54,8 @@ public function test2Dot5ValidationApi()
         $this->assertInstanceOf(FormConstraint::class, $metadata->getConstraints()[0]);
 
         $this->assertSame(CascadingStrategy::NONE, $metadata->cascadingStrategy);
-        $this->assertSame(TraversalStrategy::IMPLICIT, $metadata->traversalStrategy);
-        $this->assertSame(CascadingStrategy::CASCADE, $metadata->getPropertyMetadata('children')[0]->cascadingStrategy);
-        $this->assertSame(TraversalStrategy::IMPLICIT, $metadata->getPropertyMetadata('children')[0]->traversalStrategy);
+        $this->assertSame(TraversalStrategy::NONE, $metadata->traversalStrategy);
+        $this->assertCount(0, $metadata->getPropertyMetadata('children'));
     }
 
     public function testDataConstraintsInvalidateFormEvenIfFieldIsNotSubmitted()
@@ -138,6 +137,33 @@ public function testFieldsValidateInSequenceWithNestedGroupsArray()
         $this->assertInstanceOf(Length::class, $errors[1]->getCause()->getConstraint());
     }
 
+    public function testConstraintsInDifferentGroupsOnSingleField()
+    {
+        $form = $this->createForm(FormType::class, null, [
+            'validation_groups' => new GroupSequence(['group1', 'group2']),
+        ])
+            ->add('foo', TextType::class, [
+                'constraints' => [
+                    new NotBlank([
+                        'groups' => ['group1'],
+                    ]),
+                    new Length([
+                        'groups' => ['group2'],
+                        'max' => 3,
+                    ]),
+                ],
+            ]);
+        $form->submit([
+            'foo' => 'test@example.com',
+        ]);
+
+        $errors = $form->getErrors(true);
+
+        $this->assertFalse($form->isValid());
+        $this->assertCount(1, $errors);
+        $this->assertInstanceOf(Length::class, $errors[0]->getCause()->getConstraint());
+    }
+
     private function createForm($type, $data = null, array $options = [])
     {
         $validator = Validation::createValidatorBuilder()

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@ public function validate($form, Constraint $formConstraint)`
`86`	`86`	`// sequence recursively, thus some fields could fail`
`87`	`87`	`// in different steps without breaking early enough`
`88`	`88`	`$this->resolvedGroups[$field] = (array) $group;`
`89`		`- $validator->atPath(sprintf($fieldPropertyPath, $field->getPropertyPath()))->validate($field, $formConstraint);`
	`89`	`+ $fieldFormConstraint = new Form();`
	`90`	`+ $validator->atPath(sprintf($fieldPropertyPath, $field->getPropertyPath()))->validate($field, $fieldFormConstraint);`
`90`	`91`	`}`
`91`	`92`	`}`
`92`	`93`
`@@ -100,6 +101,8 @@ public function validate($form, Constraint $formConstraint)`
`100`	`101`	`$this->resolvedGroups = null;`
`101`	`102`	`}`
`102`	`103`	`} else {`
	`104`	`+ $fieldPropertyPath = \is_object($data) ? 'children[%s]' : 'children%s';`
	`105`	`+`
`103`	`106`	`if ($validateDataGraph) {`
`104`	`107`	`$validator->atPath('data')->validate($data, null, $groups);`
`105`	`108`	`}`
`@@ -125,6 +128,13 @@ public function validate($form, Constraint $formConstraint)`
`125`	`128`	`}`
`126`	`129`	`}`
`127`	`130`	`}`
	`131`	`+`
	`132`	`+ foreach ($form->all() as $field) {`
	`133`	`+ if ($field->isSubmitted()) {`
	`134`	`+ $fieldFormConstraint = new Form();`
	`135`	`+ $validator->atPath(sprintf($fieldPropertyPath, $field->getPropertyPath()))->validate($field, $fieldFormConstraint);`
	`136`	`+ }`
	`137`	`+ }`
`128`	`138`	`}`
`129`	`139`	`} elseif (!$form->isSynchronized()) {`
`130`	`140`	`$childrenSynchronized = true;`