[Validator] Allow validating multiple groups in one GroupSequence step

enumag · enumag · commit 31b609e582a7 · 2016-09-24T06:36:14.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/GroupSequence.php b/src/Symfony/Component/Validator/Constraints/GroupSequence.php
@@ -57,7 +57,7 @@ class GroupSequence
     /**
      * The groups in the sequence.
      *
-     * @var string[]|GroupSequence[]
+     * @var string[]|array[]|GroupSequence[]
      */
     public $groups;
 
diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
@@ -1212,6 +1212,20 @@ public function getTestReplaceDefaultGroup()
                     'Violation in Group 2',
                 ),
             ),
+            array(
+                'sequence' => new GroupSequence(array('Group 1', array('Group 2', 'Group 3'), 'Entity')),
+                'assertViolations' => array(
+                    'Violation in Group 2',
+                    'Violation in Group 3',
+                ),
+            ),
+            array(
+                'sequence' => array('Group 1', array('Group 2', 'Group 3'), 'Entity'),
+                'assertViolations' => array(
+                    'Violation in Group 2',
+                    'Violation in Group 3',
+                ),
+            ),
         );
     }
 }
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -773,7 +773,7 @@ private function stepThroughGroupSequence($value, $object, $cacheKey, MetadataIn
         $cascadedGroups = $cascadedGroup ? array($cascadedGroup) : null;
 
         foreach ($groupSequence->groups as $groupInSequence) {
-            $groups = array($groupInSequence);
+            $groups = (array) $groupInSequence;
 
             if ($metadata instanceof ClassMetadataInterface) {
                 $this->validateClassNode(

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class GroupSequence`
`57`	`57`	`/**`
`58`	`58`	`* The groups in the sequence.`
`59`	`59`	`*`
`60`		`- * @var string[]\|GroupSequence[]`
	`60`	`+ * @var string[]\|array[]\|GroupSequence[]`
`61`	`61`	`*/`
`62`	`62`	`public $groups;`
`63`	`63`