Skip to content

Commit 8d24202

Browse files
xabbuhxabbuh
committed
Merge branch '2.8' into 3.1
* 2.8: use HHVM 3.15 to run tests [TwigBridge] fix Twig 2.x compatibility removed some PHP CS Fixer rules Improve language [Console] SymfonyStyle: Escape trailing backslashes in user texts Mention the community review guide [Form] fix group sequence based validation [Console] Fix question formatting using SymfonyStyle::ask()
2 parents 3e75e4c + 96281dc commit 8d24202

File tree

4 files changed

+47
-15
lines changed

4 files changed

+47
-15
lines changed

‎Extension/Validator/Constraints/FormValidator.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\Form\FormInterface;
1515
use Symfony\Component\Validator\Constraint;
16+
use Symfony\Component\Validator\Constraints\GroupSequence;
1617
use Symfony\Component\Validator\Constraints\Valid;
1718
use Symfony\Component\Validator\ConstraintValidator;
1819
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -47,8 +48,8 @@ public function validate($form, Constraint $constraint)
4748

4849
// Validate the data against its own constraints
4950
if ($form->isRoot() && (is_object($data) || is_array($data))) {
50-
foreach ($groups as $group) {
51-
$validator->atPath('data')->validate($form->getData(), null, $group);
51+
if (is_array($groups) && count($groups) > 0 || $groups instanceof GroupSequence && count($groups->groups) > 0) {
52+
$validator->atPath('data')->validate($form->getData(), null, $groups);
5253
}
5354
}
5455

@@ -166,6 +167,10 @@ private static function resolveValidationGroups($groups, FormInterface $form)
166167
$groups = call_user_func($groups, $form);
167168
}
168169

170+
if ($groups instanceof GroupSequence) {
171+
return $groups;
172+
}
173+
169174
return (array) $groups;
170175
}
171176
}

‎Extension/Validator/Type/BaseValidatorExtension.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\Form\AbstractTypeExtension;
1515
use Symfony\Component\OptionsResolver\Options;
1616
use Symfony\Component\OptionsResolver\OptionsResolver;
17+
use Symfony\Component\Validator\Constraints\GroupSequence;
1718

1819
/**
1920
* Encapsulates common logic of {@link FormTypeValidatorExtension} and
@@ -42,6 +43,10 @@ public function configureOptions(OptionsResolver $resolver)
4243
return $groups;
4344
}
4445

46+
if ($groups instanceof GroupSequence) {
47+
return $groups;
48+
}
49+
4550
return (array) $groups;
4651
};
4752

‎Tests/Extension/Validator/Constraints/FormValidatorTest.php‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Symfony\Component\Form\Extension\Validator\Constraints\Form;
1919
use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
2020
use Symfony\Component\Form\SubmitButtonBuilder;
21+
use Symfony\Component\Validator\Constraints\GroupSequence;
2122
use Symfony\Component\Validator\Constraints\NotNull;
2223
use Symfony\Component\Validator\Constraints\NotBlank;
2324
use Symfony\Component\Validator\Constraints\Valid;
@@ -65,8 +66,7 @@ public function testValidate()
6566
->setData($object)
6667
->getForm();
6768

68-
$this->expectValidateAt(0, 'data', $object, 'group1');
69-
$this->expectValidateAt(1, 'data', $object, 'group2');
69+
$this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
7070

7171
$this->validator->validate($form, new Form());
7272

@@ -88,12 +88,11 @@ public function testValidateConstraints()
8888
->getForm();
8989

9090
// First default constraints
91-
$this->expectValidateAt(0, 'data', $object, 'group1');
92-
$this->expectValidateAt(1, 'data', $object, 'group2');
91+
$this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
9392

9493
// Then custom constraints
95-
$this->expectValidateValueAt(2, 'data', $object, $constraint1, 'group1');
96-
$this->expectValidateValueAt(3, 'data', $object, $constraint2, 'group2');
94+
$this->expectValidateValueAt(1, 'data', $object, $constraint1, 'group1');
95+
$this->expectValidateValueAt(2, 'data', $object, $constraint2, 'group2');
9796

9897
$this->validator->validate($form, new Form());
9998

@@ -151,7 +150,7 @@ public function testMissingConstraintIndex()
151150
$form = new FormBuilder('name', '\stdClass', $this->dispatcher, $this->factory);
152151
$form = $form->setData($object)->getForm();
153152

154-
$this->expectValidateAt(0, 'data', $object, 'Default');
153+
$this->expectValidateAt(0, 'data', $object, array('Default'));
155154

156155
$this->validator->validate($form, new Form());
157156

@@ -362,6 +361,21 @@ function () { throw new TransformationFailedException(); }
362361
$this->assertNoViolation();
363362
}
364363

364+
public function testHandleGroupSequenceValidationGroups()
365+
{
366+
$object = $this->getMockBuilder('\stdClass')->getMock();
367+
$options = array('validation_groups' => new GroupSequence(array('group1', 'group2')));
368+
$form = $this->getBuilder('name', '\stdClass', $options)
369+
->setData($object)
370+
->getForm();
371+
372+
$this->expectValidateAt(0, 'data', $object, new GroupSequence(array('group1', 'group2')));
373+
374+
$this->validator->validate($form, new Form());
375+
376+
$this->assertNoViolation();
377+
}
378+
365379
public function testHandleCallbackValidationGroups()
366380
{
367381
$object = $this->getMockBuilder('\stdClass')->getMock();
@@ -370,8 +384,7 @@ public function testHandleCallbackValidationGroups()
370384
->setData($object)
371385
->getForm();
372386

373-
$this->expectValidateAt(0, 'data', $object, 'group1');
374-
$this->expectValidateAt(1, 'data', $object, 'group2');
387+
$this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
375388

376389
$this->validator->validate($form, new Form());
377390

@@ -386,7 +399,7 @@ public function testDontExecuteFunctionNames()
386399
->setData($object)
387400
->getForm();
388401

389-
$this->expectValidateAt(0, 'data', $object, 'header');
402+
$this->expectValidateAt(0, 'data', $object, array('header'));
390403

391404
$this->validator->validate($form, new Form());
392405

@@ -403,8 +416,7 @@ public function testHandleClosureValidationGroups()
403416
->setData($object)
404417
->getForm();
405418

406-
$this->expectValidateAt(0, 'data', $object, 'group1');
407-
$this->expectValidateAt(1, 'data', $object, 'group2');
419+
$this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
408420

409421
$this->validator->validate($form, new Form());
410422

@@ -542,7 +554,7 @@ public function testAppendPropertyPath()
542554
->setData($object)
543555
->getForm();
544556

545-
$this->expectValidateAt(0, 'data', $object, 'Default');
557+
$this->expectValidateAt(0, 'data', $object, array('Default'));
546558

547559
$this->validator->validate($form, new Form());
548560

‎Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
1313

1414
use Symfony\Component\Form\Test\FormInterface;
15+
use Symfony\Component\Validator\Constraints\GroupSequence;
1516

1617
/**
1718
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -70,5 +71,14 @@ public function testValidationGroupsCanBeSetToClosure()
7071
$this->assertInternalType('callable', $form->getConfig()->getOption('validation_groups'));
7172
}
7273

74+
public function testValidationGroupsCanBeSetToGroupSequence()
75+
{
76+
$form = $this->createForm(array(
77+
'validation_groups' => new GroupSequence(array('group1', 'group2')),
78+
));
79+
80+
$this->assertInstanceOf('Symfony\Component\Validator\Constraints\GroupSequence', $form->getConfig()->getOption('validation_groups'));
81+
}
82+
7383
abstract protected function createForm(array $options = array());
7484
}

0 commit comments

Comments
 (0)