10000 [Validator] Target aware class constraints by lemoinem · Pull Request #16978 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Validator] Target aware class constraints #16978

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

Closed
wants to merge 6 commits into from
Closed

[Validator] Target aware class constraints #16978

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef2bad6
[Validator] Target aware constraint's interface and trait
lemoinem Dec 12, 2015
9427089
[Validator] Target aware constraint test fixture
lemoinem Dec 12, 2015
42dc2d2
[Validator] Target aware constraint support for YamlFileLoader
lemoinem Dec 12, 2015
04d3bdc
[Validator] Target aware constraint support for XmlFileLoader
lemoinem Dec 12, 2015
c02329d
[Validator] Target aware constraint support for AnnotationLoader
lemoinem Dec 12, 2015
697833b
Update CHANGELOG
lemoinem Dec 12, 2015
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
Prev Previous commit
Next Next commit
[Validator] Target aware constraint support for YamlFileLoader
  • Loading branch information
@lemoinem
lemoinem committed Feb 2, 2016
commit 42dc2d2d1db389250dcd8cca297a5debff3ad4b0
5 changes: 5 additions & 0 deletions src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Mapping\Loader;

use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Constraints\TargetAwareConstraintInterface;
use Symfony\Component\Yaml\Exception\ParseException;
use Symfony\Component\Yaml\Parser as YamlParser;

Expand Down Expand Up @@ -157,6 +158,10 @@ private function loadClassMetadataFromYaml(ClassMetadata $metadata, array $class

if (isset($classDescription['constraints']) && is_array($classDescription['constraints'])) {
foreach ($this->parseNodes($classDescription['constraints']) as $constraint) {
if ($constraint instanceof TargetAwareConstraintInterface) {
$constraint->target = $metadata->getClassName();
}

$metadata->addConstraint($constraint);
}
}
Expand Down
69 changes: 69 additions & 0 deletions src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use Symfony\Component\Validator\Mapping\Loader\YamlFileLoader;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintD;

class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
{
Expand Down Expand Up @@ -119,6 +120,74 @@ public function testLoadClassMetadata()
$this->assertEquals($expected, $metadata);
}

/**
* Test MetaData merge with parent annotation.
*/
public function testLoadParentClassMetadata()
{
$loader = new YamlFileLoader(__DIR__.'/constraint-mapping.yml');

// Load Parent MetaData
$parent_metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\EntityParent');
$loader->loadClassMetadata($parent_metadata);

$expected_parent = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\EntityParent');
$expected_parent->addConstraint(new ConstraintD(array('target' => 'Symfony\Component\Validator\Tests\Fixtures\EntityParent')));
$expected_parent->addPropertyConstraint('other', new NotNull());

$this->assertEquals($expected_parent, $parent_metadata);
}
/**
* Test MetaData merge with parent annotation.
*/
public function testLoadClassMetadataAndMerge()
{
$loader = new YamlFileLoader(__DIR__.'/constraint-mapping.yml');

// Load Parent MetaData
$parent_metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\EntityParent');
$loader->loadClassMetadata($parent_metadata);

$metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');

// Merge parent metaData.
$metadata->mergeConstraints($parent_metadata);

$loader->loadClassMetadata($metadata);

$expected_parent = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\EntityParent');
$expected_parent->addConstraint(new ConstraintD(array('target' => 'Symfony\Component\Validator\Tests\Fixtures\EntityParent')));
$expected_parent->addPropertyConstraint('other', new NotNull());

$expected = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
$expected->mergeConstraints($expected_parent);

$expected->setGroupSequence(array('Foo', 'Entity'));
$expected->addConstraint(new ConstraintA());
$expected->addConstraint(new ConstraintB());
$expected->addConstraint(new Callback('validateMe'));
$expected->addConstraint(new Callback('validateMeStatic'));
$expected->addConstraint(new Callback(array('Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback')));
$expected->addPropertyConstraint('firstName', new NotNull());
$expected->addPropertyConstraint('firstName', new Range(array('min' => 3)));
$expected->addPropertyConstraint('firstName', new Choice(array('A', 'B')));
$expected->addPropertyConstraint('firstName', new All(array(new NotNull(), new Range(array('min' => 3)))));
$expected->addPropertyConstraint('firstName', new All(array('constraints' => array(new NotNull(), new Range(array('min' => 3))))));
$expected->addPropertyConstraint('firstName', new Collection(array('fields' => array(
'foo' => array(new NotNull(), new Range(array('min' => 3))),
'bar' => array(new Range(array('min' => 5))),
))));
$expected->addPropertyConstraint('firstName', new Choice(array(
'message' => 'Must be one of %choices%',
'choices' => array('A', 'B'),
)));
$expected->addGetterConstraint('lastName', new NotNull());
$expected->addGetterConstraint('valid', new IsTrue());
$expected->addGetterConstraint('permissions', new IsTrue());

$this->assertEquals($expected, $metadata);
}

public function testLoadGroupSequenceProvider()
{
$loader = new YamlFileLoader(__DIR__.'/constraint-mapping.yml');
Expand Down
8 changes: 8 additions & 0 deletions src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
namespaces:
custom: Symfony\Component\Validator\Tests\Fixtures\

Symfony\Component\Validator\Tests\Fixtures\EntityParent:
constraints:
# Target aware constraint
- Symfony\Component\Validator\Tests\Fixtures\ConstraintD: ~
properties:
other:
- NotNull: ~

Symfony\Component\Validator\Tests\Fixtures\Entity:
group_sequence:
- Foo
Expand Down
0