Skip to content

[Validator] Allow validating multiple groups in one GroupSequence step #19982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabpot merged 3 commits into from
Oct 19, 2016
Merged

[Validator] Allow validating multiple groups in one GroupSequence step #19982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38b643a
[Validator] Fix annotation
enumag Sep 19, 2016
3847bad
[Validator] Refactor tests
enumag Sep 19, 2016
31b609e
[Validator] Allow validating multiple groups in one GroupSequence step
enumag Sep 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Component/Validator/Constraints/GroupSequence.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class GroupSequence
/**
* The groups in the sequence.
*
* @var string[]|GroupSequence[]
* @var string[]|array[]|GroupSequence[]
*/
public $groups;

Expand Down
74 changes: 37 additions & 37 deletions src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,9 +1157,11 @@ public function testValidateCustomGroupWhenDefaultGroupWasReplaced()
$this->assertSame('Violation in other group', $violations[0]->getMessage());
}

public function testReplaceDefaultGroupWithObjectFromGroupSequenceProvider()
/**
* @dataProvider getTestReplaceDefaultGroup
*/
public function testReplaceDefaultGroup($sequence, array $assertViolations)
{
$sequence = new GroupSequence(array('Group 1', 'Group 2', 'Group 3', 'Entity'));
$entity = new GroupSequenceProviderEntity($sequence);

$callback1 = function ($value, ExecutionContextInterface $context) {
Expand Down Expand Up @@ -1189,43 +1191,41 @@ public function testReplaceDefaultGroupWithObjectFromGroupSequenceProvider()
$violations = $this->validate($entity, null, 'Default');

/* @var ConstraintViolationInterface[] $violations */
$this->assertCount(1, $violations);
$this->assertSame('Violation in Group 2', $violations[0]->getMessage());
$this->assertCount(count($assertViolations), $violations);
foreach ($assertViolations as $key => $message) {
$this->assertSame($message, $violations[$key]->getMessage());
}
}

public function testReplaceDefaultGroupWithArrayFromGroupSequenceProvider()
public function getTestReplaceDefaultGroup()
{
$sequence = array('Group 1', 'Group 2', 'Group 3', 'Entity');
$entity = new GroupSequenceProviderEntity($sequence);

$callback1 = function ($value, ExecutionContextInterface $context) {
$context->addViolation('Violation in Group 2');
};
$callback2 = function ($value, ExecutionContextInterface $context) {
$context->addViolation('Violation in Group 3');
};

$metadata = new ClassMetadata(get_class($entity));
$metadata->addConstraint(new Callback(array(
'callback' => function () {},
'groups' => 'Group 1',
)));
$metadata->addConstraint(new Callback(array(
'callback' => $callback1,
'groups' => 'Group 2',
)));
$metadata->addConstraint(new Callback(array(
'callback' => $callback2,
'groups' => 'Group 3',
)));
$metadata->setGroupSequenceProvider(true);

$this->metadataFactory->addMetadata($metadata);

$violations = $this->validate($entity, null, 'Default');

/* @var ConstraintViolationInterface[] $violations */
$this->assertCount(1, $violations);
$this->assertSame('Violation in Group 2', $violations[0]->getMessage());
return array(
array(
'sequence' => new GroupSequence(array('Group 1', 'Group 2', 'Group 3', 'Entity')),
'assertViolations' => array(
'Violation in Group 2',
),
),
array(
'sequence' => array('Group 1', 'Group 2', 'Group 3', 'Entity'),
'assertViolations' => array(
'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',
),
),
);
}
}
4 changes: 2 additions & 2 deletions src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ private function validateGenericNode($value, $object, $cacheKey, MetadataInterfa
* @param int $traversalStrategy The strategy used for
* traversing the value
* @param GroupSequence $groupSequence The group sequence
* @param string[]|null $cascadedGroup The group that should
* @param string|null $cascadedGroup The group that should
* be passed to cascaded
* objects instead of
* the group sequence
Expand All @@ -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(
Expand Down