Merge branch '3.4' into 4.4

* 3.4:
  disallow FrameworkBundle 4.4+
  propagate validation groups to subforms
  [Form] [Validator] Add failing testcase to demonstrate group sequence issue

Author: nicolas-grekas

Extension/Validator/Constraints/FormValidator.php

@@ -25,6 +25,7 @@
 class FormValidator extends ConstraintValidator
 {
     private $resolvedGroups;
+    private $fieldFormConstraints;
 
     /**
      * {@inheritdoc}
@@ -67,6 +68,7 @@ public function validate($form, Constraint $formConstraint)
 
             if ($hasChildren && $form->isRoot()) {
                 $this->resolvedGroups = new \SplObjectStorage();
+                $this->fieldFormConstraints = [];
             }
 
             if ($groups instanceof GroupSequence) {
@@ -84,14 +86,16 @@ public function validate($form, Constraint $formConstraint)
 
                     foreach ($form->all() as $field) {
                         if ($field->isSubmitted()) {
-                            // remember to validate this field is one group only
+                            // remember to validate this field in one group only
                             // otherwise resolving the groups would reuse the same
                             // sequence recursively, thus some fields could fail
                             // in different steps without breaking early enough
                             $this->resolvedGroups[$field] = (array) $group;
                             $fieldFormConstraint = new Form();
+                            $fieldFormConstraint->groups = $group;
+                            $this->fieldFormConstraints[] = $fieldFormConstraint;
                             $this->context->setNode($this->context->getValue(), $field, $this->context->getMetadata(), $this->context->getPropertyPath());
-                            $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);
+                            $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint, $group);
                         }
                     }
 
@@ -136,6 +140,7 @@ public function validate($form, Constraint $formConstraint)
                     if ($field->isSubmitted()) {
                         $this->resolvedGroups[$field] = $groups;
                         $fieldFormConstraint = new Form();
+                        $this->fieldFormConstraints[] = $fieldFormConstraint;
                         $this->context->setNode($this->context->getValue(), $field, $this->context->getMetadata(), $this->context->getPropertyPath());
                         $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);
                     }
@@ -145,6 +150,7 @@ public function validate($form, Constraint $formConstraint)
             if ($hasChildren && $form->isRoot()) {
                 // destroy storage to avoid memory leaks
                 $this->resolvedGroups = new \SplObjectStorage();
+                $this->fieldFormConstraints = [];
             }
         } elseif (!$form->isSynchronized()) {
             $childrenSynchronized = true;
@@ -155,6 +161,7 @@ public function validate($form, Constraint $formConstraint)
                     $childrenSynchronized = false;
 
                     $fieldFormConstraint = new Form();
+                    $this->fieldFormConstraints[] = $fieldFormConstraint;
                     $this->context->setNode($this->context->getValue(), $child, $this->context->getMetadata(), $this->context->getPropertyPath());
                     $validator->atPath(sprintf('children[%s]', $child->getName()))->validate($child, $fieldFormConstraint);
                 }

Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php

@@ -236,6 +236,34 @@ public function testConstraintsInDifferentGroupsOnSingleField()
         $this->assertInstanceOf(Length::class, $errors[0]->getCause()->getConstraint());
     }
 
+    public function testConstraintsInDifferentGroupsOnSingleFieldWithAdditionalFieldThatHasNoConstraintsAddedBeforeTheFieldWithConstraints()
+    {
+        $form = $this->formFactory->create(FormType::class, null, [
+            'validation_groups' => new GroupSequence(['group1', 'group2']),
+        ])
+            ->add('bar')
+            ->add('foo', TextType::class, [
+                'constraints' => [
+                    new NotBlank([
+                        'groups' => ['group1'],
+                    ]),
+                    new Length([
+                        'groups' => ['group2'],
+                        'max' => 3,
+                    ]),
+                ],
+            ]);
+        $form->submit([
+            'foo' => '[email protected]',
+        ]);
+
+        $errors = $form->getErrors(true);
+
+        $this->assertFalse($form->isValid());
+        $this->assertCount(1, $errors);
+        $this->assertInstanceOf(Length::class, $errors[0]->getCause()->getConstraint());
+    }
+
     public function testCascadeValidationToChildFormsUsingPropertyPaths()
     {
         $form = $this->formFactory->create(FormType::class, null, [