diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php index 88d2cfbc119a2..396b7b745dfbb 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php +++ b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php @@ -70,9 +70,7 @@ public function validate($form, Constraint $constraint) // in the form $constraints = $config->getOption('constraints'); foreach ($constraints as $constraint) { - foreach ($groups as $group) { - $graphWalker->walkConstraint($constraint, $form->getData(), $group, $path . 'data'); - } + $graphWalker->walkConstraint($constraint, $form->getData(), Constraint::DEFAULT_GROUP, $path . 'data'); } } else { $clientDataAsString = is_scalar($form->getViewData()) 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 9a545c129d36a..1ebbe099a5eeb 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php @@ -110,16 +110,10 @@ public function testValidateConstraints() // Then custom constraints $graphWalker->expects($this->at(2)) ->method('walkConstraint') - ->with($constraint1, $object, 'group1', 'data'); + ->with($constraint1, $object, 'Default', 'data'); $graphWalker->expects($this->at(3)) ->method('walkConstraint') - ->with($constraint1, $object, 'group2', 'data'); - $graphWalker->expects($this->at(4)) - ->method('walkConstraint') - ->with($constraint2, $object, 'group1', 'data'); - $graphWalker->expects($this->at(5)) - ->method('walkConstraint') - ->with($constraint2, $object, 'group2', 'data'); + ->with($constraint2, $object, 'Default', 'data'); $this->validator->initialize($context); $this->validator->validate($form, new Form()); @@ -165,16 +159,10 @@ public function testValidateConstraintsEvenIfNoCascadeValidation() $graphWalker->expects($this->at(0)) ->method('walkConstraint') - ->with($constraint1, $object, 'group1', 'data'); + ->with($constraint1, $object, 'Default', 'data'); $graphWalker->expects($this->at(1)) ->method('walkConstraint') - ->with($constraint1, $object, 'group2', 'data'); - $graphWalker->expects($this->at(2)) - ->method('walkConstraint') - ->with($constraint2, $object, 'group1', 'data'); - $graphWalker->expects($this->at(3)) - ->method('walkConstraint') - ->with($constraint2, $object, 'group2', 'data'); + ->with($constraint2, $object, 'Default', 'data'); $this->validator->initialize($context); $this->validator->validate($form, new Form());