diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
index 6a8923ecbf0a5..6811dceb9832a 100644
--- 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
index 3d7111f85f3c1..927dd64f52071 100644
--- 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();
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy