properly cascade validation to child forms

symfony · Jun 3, 2020 · babe8ce · babe8ce
1 parent 3519647
commit babe8ce
Showing 1 changed file with 2 additions and 5 deletions.
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);
                     }
                 }
             }