switch the context when validating nested forms

xabbuh · xabbuh · commit 96f56f55cf31 · 2020-06-11T20:15:44.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
@@ -90,6 +90,7 @@ public function validate($form, Constraint $formConstraint)
                             // in different steps without breaking early enough
                             $this->resolvedGroups[$field] = (array) $group;
                             $fieldFormConstraint = new Form();
+                            $this->context->setNode($this->context->getValue(), $field, $this->context->getMetadata(), $this->context->getPropertyPath());
                             $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);
                         }
                     }
@@ -129,6 +130,7 @@ public function validate($form, Constraint $formConstraint)
                     if ($field->isSubmitted()) {
                         $this->resolvedGroups[$field] = $groups;
                         $fieldFormConstraint = new Form();
+                        $this->context->setNode($this->context->getValue(), $field, $this->context->getMetadata(), $this->context->getPropertyPath());
                         $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);
                     }
                 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
@@ -21,6 +21,7 @@
 use Symfony\Component\Form\Test\ForwardCompatTestTrait;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Collection;
+use Symfony\Component\Validator\Constraints\Expression;
 use Symfony\Component\Validator\Constraints\GroupSequence;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
@@ -283,6 +284,51 @@ public function testCascadeValidationToChildFormsUsingPropertyPathsValidatedInSe
         $this->assertSame('This value should not be blank.', $violations[0]->getMessage());
         $this->assertSame('children[field1].data', $violations[0]->getPropertyPath());
     }
+
+    public function testContextIsPopulatedWithFormBeingValidated()
+    {
+        $form = $this->formFactory->create(FormType::class)
+            ->add('field1', null, [
+                'constraints' => [new Expression([
+                    'expression' => '!this.getParent().get("field2").getData()',
+                ])],
+            ])
+            ->add('field2')
+        ;
+
+        $form->submit([
+            'field1' => '',
+            'field2' => '',
+        ]);
+
+        $violations = $this->validator->validate($form);
+
+        $this->assertCount(0, $violations);
+    }
+
+    public function testContextIsPopulatedWithFormBeingValidatedUsingGroupSequence()
+    {
+        $form = $this->formFactory->create(FormType::class, null, [
+            'validation_groups' => new GroupSequence(['group1']),
+        ])
+            ->add('field1', null, [
+                'constraints' => [new Expression([
+                    'expression' => '!this.getParent().get("field2").getData()',
+                    'groups' => ['group1'],
+                ])],
+            ])
+            ->add('field2')
+        ;
+
+        $form->submit([
+            'field1' => '',
+            'field2' => '',
+        ]);
+
+        $violations = $this->validator->validate($form);
+
+        $this->assertCount(0, $violations);
+    }
 }
 
 class Foo

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ public function validate($form, Constraint $formConstraint)`
`90`	`90`	`// in different steps without breaking early enough`
`91`	`91`	`$this->resolvedGroups[$field] = (array) $group;`
`92`	`92`	`$fieldFormConstraint = new Form();`
	`93`	`+ $this->context->setNode($this->context->getValue(), $field, $this->context->getMetadata(), $this->context->getPropertyPath());`
`93`	`94`	`$validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);`
`94`	`95`	`}`
`95`	`96`	`}`
`@@ -129,6 +130,7 @@ public function validate($form, Constraint $formConstraint)`
`129`	`130`	`if ($field->isSubmitted()) {`
`130`	`131`	`$this->resolvedGroups[$field] = $groups;`
`131`	`132`	`$fieldFormConstraint = new Form();`
	`133`	`+ $this->context->setNode($this->context->getValue(), $field, $this->context->getMetadata(), $this->context->getPropertyPath());`
`132`	`134`	`$validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);`
`133`	`135`	`}`
`134`	`136`	`}`