diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Validator] Allow validating multiple groups in one GroupSequence step

Browse Source
This commit is contained in:
Jáchym Toušek 2016-09-19 21:26:49 +02:00
parent 3847badd47
commit 31b609e582
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Validator/Constraints/GroupSequence.php
View File

@ -57,7 +57,7 @@ class GroupSequence
/**
* The groups in the sequence.
*
* @var string[]|GroupSequence[]
* @var string[]|array[]|GroupSequence[]
*/
public $groups;

14
src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
View File

@ -1212,6 +1212,20 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase
'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',
),
),
);
}
}

2
src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
View File

@ -773,7 +773,7 @@ class RecursiveContextualValidator implements ContextualValidatorInterface
$cascadedGroups = $cascadedGroup ? array($cascadedGroup) : null;
foreach ($groupSequence->groups as $groupInSequence) {
$groups = array($groupInSequence);
$groups = (array) $groupInSequence;
if ($metadata instanceof ClassMetadataInterface) {
$this->validateClassNode(