properly cascade validation to child forms

xabbuh · xabbuh · commit 7df5298ddfbf · 2020-06-04T12:14:17.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
@@ -72,7 +72,6 @@ public function validate($form, Constraint $formConstraint)
             if ($groups instanceof GroupSequence) {
                 // Validate the data, the form AND nested fields in sequence
                 $violationsCount = $this->context->getViolations()->count();
-                $fieldPropertyPath = \is_object($data) ? 'children[%s]' : 'children%s';
 
                 foreach ($groups->groups as $group) {
                     if ($validateDataGraph) {
@@ -91,7 +90,7 @@ public function validate($form, Constraint $formConstraint)
                             // in different steps without breaking early enough
                             $this->resolvedGroups[$field] = (array) $group;
                             $fieldFormConstraint = new Form();
-                            $validator->atPath(sprintf($fieldPropertyPath, $field->getPropertyPath()))->validate($field, $fieldFormConstraint);
+                            $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);
                         }
                     }
 
@@ -100,8 +99,6 @@ public function validate($form, Constraint $formConstraint)
                     }
                 }
             } else {
-                $fieldPropertyPath = \is_object($data) ? 'children[%s]' : 'children%s';
-
                 if ($validateDataGraph) {
                     $validator->atPath('data')->validate($data, null, $groups);
                 }
@@ -132,7 +129,7 @@ public function validate($form, Constraint $formConstraint)
                     if ($field->isSubmitted()) {
                         $this->resolvedGroups[$field] = $groups;
                         $fieldFormConstraint = new Form();
-                        $validator->atPath(sprintf($fieldPropertyPath, $field->getPropertyPath()))->validate($field, $fieldFormConstraint);
+                        $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);
                     }
                 }
             }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
 use Symfony\Component\Form\Extension\Validator\Constraints\Form;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
+use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormFactoryBuilder;
 use Symfony\Component\Form\FormFactoryInterface;
@@ -51,7 +52,9 @@ class FormValidatorTest extends ConstraintValidatorTestCase
     protected function setUp()
     {
         $this->dispatcher = new EventDispatcher();
-        $this->factory = (new FormFactoryBuilder())->getFormFactory();
+        $this->factory = (new FormFactoryBuilder())
+            ->addExtension(new ValidatorExtension(Validation::createValidator()))
+            ->getFormFactory();
 
         parent::setUp();
 
@@ -791,6 +794,61 @@ public function testCompositeConstraintValidatedInSequence()
         $this->assertSame('data[field1]', $context->getViolations()[0]->getPropertyPath());
     }
 
+    public function testCascadeValidationToChildFormsUsingPropertyPaths()
+    {
+        $form = $this->getCompoundForm([], [
+            'validation_groups' => ['group1', 'group2'],
+        ])
+            ->add('field1', null, [
+                'constraints' => [new NotBlank(['groups' => 'group1'])],
+                'property_path' => '[foo]',
+            ])
+            ->add('field2', null, [
+                'constraints' => [new NotBlank(['groups' => 'group2'])],
+                'property_path' => '[bar]',
+            ])
+        ;
+
+        $form->submit([
+            'field1' => '',
+            'field2' => '',
+        ]);
+
+        $context = new ExecutionContext(Validation::createValidator(), $form, new IdentityTranslator());
+        $this->validator->initialize($context);
+        $this->validator->validate($form, new Form());
+
+        $this->assertCount(2, $context->getViolations());
+        $this->assertSame('This value should not be blank.', $context->getViolations()[0]->getMessage());
+        $this->assertSame('children[field1].data', $context->getViolations()[0]->getPropertyPath());
+        $this->assertSame('This value should not be blank.', $context->getViolations()[1]->getMessage());
+        $this->assertSame('children[field2].data', $context->getViolations()[1]->getPropertyPath());
+    }
+
+    public function testCascadeValidationToChildFormsUsingPropertyPathsValidatedInSequence()
+    {
+        $form = $this->getCompoundForm([], [
+            'validation_groups' => new GroupSequence(['group1', 'group2']),
+        ])
+            ->add('field1', null, [
+                'constraints' => [new NotBlank(['groups' => 'group1'])],
+                'property_path' => '[foo]',
+            ])
+        ;
+
+        $form->submit([
+            'field1' => '',
+        ]);
+
+        $context = new ExecutionContext(Validation::createValidator(), $form, new IdentityTranslator());
+        $this->validator->initialize($context);
+        $this->validator->validate($form, new Form());
+
+        $this->assertCount(1, $context->getViolations());
+        $this->assertSame('This value should not be blank.', $context->getViolations()[0]->getMessage());
+        $this->assertSame('children[field1].data', $context->getViolations()[0]->getPropertyPath());
+    }
+
     protected function createValidator()
     {
         return new FormValidator();

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,6 @@ public function validate($form, Constraint $formConstraint)`
`72`	`72`	`if ($groups instanceof GroupSequence) {`
`73`	`73`	`// Validate the data, the form AND nested fields in sequence`
`74`	`74`	`$violationsCount = $this->context->getViolations()->count();`
`75`		`- $fieldPropertyPath = \is_object($data) ? 'children[%s]' : 'children%s';`
`76`	`75`
`77`	`76`	`foreach ($groups->groups as $group) {`
`78`	`77`	`if ($validateDataGraph) {`
`@@ -91,7 +90,7 @@ public function validate($form, Constraint $formConstraint)`
`91`	`90`	`// in different steps without breaking early enough`
`92`	`91`	`$this->resolvedGroups[$field] = (array) $group;`
`93`	`92`	`$fieldFormConstraint = new Form();`
`94`		`- $validator->atPath(sprintf($fieldPropertyPath, $field->getPropertyPath()))->validate($field, $fieldFormConstraint);`
	`93`	`+ $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);`
`95`	`94`	`}`
`96`	`95`	`}`
`97`	`96`
`@@ -100,8 +99,6 @@ public function validate($form, Constraint $formConstraint)`
`100`	`99`	`}`
`101`	`100`	`}`
`102`	`101`	`} else {`
`103`		`- $fieldPropertyPath = \is_object($data) ? 'children[%s]' : 'children%s';`
`104`		`-`
`105`	`102`	`if ($validateDataGraph) {`
`106`	`103`	`$validator->atPath('data')->validate($data, null, $groups);`
`107`	`104`	`}`
`@@ -132,7 +129,7 @@ public function validate($form, Constraint $formConstraint)`
`132`	`129`	`if ($field->isSubmitted()) {`
`133`	`130`	`$this->resolvedGroups[$field] = $groups;`
`134`	`131`	`$fieldFormConstraint = new Form();`
`135`		`- $validator->atPath(sprintf($fieldPropertyPath, $field->getPropertyPath()))->validate($field, $fieldFormConstraint);`
	`132`	`+ $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);`
`136`	`133`	`}`
`137`	`134`	`}`
`138`	`135`	`}`