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

[Form] Fixed check of violation constraint #12792

Browse Source 
ConstraintViolation::getConstraint() must not expect to provide a
constraint as long as Symfony\Component\Validator\ExecutionContext
exists (before 3.0)
This commit is contained in:
Alexander Schwenn 2015-01-09 05:42:47 +01:00
parent ccee4ea91d
commit aedabc76b6
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
View File

@ -66,7 +66,8 @@ class ValidationListener implements EventSubscriberInterface
foreach ($violations as $violation) {
// Allow the "invalid" constraint to be put onto
// non-synchronized forms
$allowNonSynchronized = $violation->getConstraint() instanceof Form && Form::NOT_SYNCHRONIZED_ERROR === $violation->getCode();
// ConstraintViolation::getConstraint() must not expect to provide a constraint as long as Symfony\Component\Validator\ExecutionContext exists (before 3.0)
$allowNonSynchronized = (null === $violation->getConstraint() || $violation->getConstraint() instanceof Form) && Form::NOT_SYNCHRONIZED_ERROR === $violation->getCode();
$this->violationMapper->mapViolation($violation, $form, $allowNonSynchronized);
}

29
src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
View File

@ -64,9 +64,9 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
$this->params = array('foo' => 'bar');
}
private function getConstraintViolation($code = null)
private function getConstraintViolation($code = null, $constraint = null)
{
return new ConstraintViolation($this->message, $this->messageTemplate, $this->params, null, 'prop.path', null, null, $code, new Form());
return new ConstraintViolation($this->message, $this->messageTemplate, $this->params, null, 'prop.path', null, null, $code, $constraint);
}
private function getBuilder($name = 'name', $propertyPath = null, $dataClass = null)
@ -93,7 +93,7 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
// More specific mapping tests can be found in ViolationMapperTest
public function testMapViolation()
{
$violation = $this->getConstraintViolation();
$violation = $this->getConstraintViolation(null, new Form());
$form = $this->getForm('street');
$this->validator->expects($this->once())
@ -109,7 +109,28 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
public function testMapViolationAllowsNonSyncIfInvalid()
{
$violation = $this->getConstraintViolation(Form::NOT_SYNCHRONIZED_ERROR);
$violation = $this->getConstraintViolation(Form::NOT_SYNCHRONIZED_ERROR, new Form());
$form = $this->getForm('street');
$this->validator->expects($this->once())
->method('validate')
->will($this->returnValue(array($violation)));
$this->violationMapper->expects($this->once())
->method('mapViolation')
// pass true now
->with($violation, $form, true);
$this->listener->validateForm(new FormEvent($form, null));
}
public function testMapViolationAllowsNonSyncIfInvalidWithoutConstraintReference()
{
// constraint violations have no reference to the constraint if they are created by
// Symfony\Component\Validator\ExecutionContext
// which is deprecated in favor of
// Symfony\Component\Validator\Context\ExecutionContext
$violation = $this->getConstraintViolation(Form::NOT_SYNCHRONIZED_ERROR, null);
$form = $this->getForm('street');
$this->validator->expects($this->once())