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

[Validator] Improved dynamic constraints

Browse Source
This commit is contained in:
Sebastian Hörl 2012-01-14 02:24:14 +01:00
parent 54cb6e458e
commit 09c191136a
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/Validator/Validator.php
View File

@ -12,6 +12,7 @@
namespace Symfony\Component\Validator; namespace Symfony\Component\Validator;
use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface; use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface;
use Symfony\Component\Validator\Mapping\ClassMetadata;
/** /**
* The default implementation of the ValidatorInterface. * The default implementation of the ValidatorInterface.
@ -59,7 +60,10 @@ class Validator implements ValidatorInterface
$metadata = $this->metadataFactory->getClassMetadata(get_class($object)); $metadata = $this->metadataFactory->getClassMetadata(get_class($object));
if ($object instanceof ConstraintProviderInterface) { if ($object instanceof ConstraintProviderInterface) {
$object->getConstraints($metadata); $dynamicMetadata = new ClassMetadata(get_class($object));
$dynamicMetadata->mergeConstraints($metadata);
$object->getConstraints($dynamicMetadata);
$metadata = $dynamicMetadata;
} }
$walk = function(GraphWalker $walker, $group) use ($metadata, $object) { $walk = function(GraphWalker $walker, $group) use ($metadata, $object) {

15
tests/Symfony/Tests/Component/Validator/Fixtures/DynamicConstraintsEntity.php
View File

@ -7,15 +7,24 @@ use Symfony\Component\Validator\Mapping\ClassMetadata;
class DynamicConstraintsEntity implements ConstraintProviderInterface class DynamicConstraintsEntity implements ConstraintProviderInterface
{ {
protected $validationEnabled = false;
protected $firstValue; protected $firstValue;
public function getSecondValue() { public function setValidation($enabled)
{
$this->validationEnabled = $enabled;
}
public function getSecondValue()
{
return null; return null;
} }
public function getConstraints(ClassMetadata $metadata) public function getConstraints(ClassMetadata $metadata)
{ {
$metadata->addPropertyConstraint('firstValue', new FailingConstraint()); if ($this->validationEnabled) {
$metadata->addGetterConstraint('secondValue', new FailingConstraint()); $metadata->addPropertyConstraint('firstValue', new FailingConstraint());
$metadata->addGetterConstraint('secondValue', new FailingConstraint());
}
} }
} }

10
tests/Symfony/Tests/Component/Validator/ValidatorTest.php
View File

@ -129,8 +129,9 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
$entity = new DynamicConstraintsEntity(); $entity = new DynamicConstraintsEntity();
$metadata = new ClassMetadata(get_class($entity)); $metadata = new ClassMetadata(get_class($entity));
$this->factory->addClassMetadata($metadata); $this->factory->addClassMetadata($metadata);
$entity->setValidation(true);
// Only the constraint of group "Default" failed
$violations = new ConstraintViolationList(); $violations = new ConstraintViolationList();
$violations->add(new ConstraintViolation( $violations->add(new ConstraintViolation(
'', '',
@ -146,7 +147,12 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
'secondValue', 'secondValue',
'' ''
)); ));
$this->assertEquals($violations, $this->validator->validate($entity));
$entity->setValidation(false);
$violations = new ConstraintViolationList();
$this->assertEquals($violations, $this->validator->validate($entity)); $this->assertEquals($violations, $this->validator->validate($entity));
} }