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

[Validator] Allow empty keys in the validation config

Browse Source
This commit is contained in:
Jordi Boggiano 2012-04-05 17:21:24 +02:00
parent 6bcd0a2d40
commit 8702ea5f6d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
View File

@ -58,24 +58,28 @@ class YamlFileLoader extends FileLoader
$metadata->setGroupSequenceProvider((bool)$yaml['group_sequence_provider']);
}
if (isset($yaml['constraints'])) {
if (isset($yaml['constraints']) && is_array($yaml['constraints'])) {
foreach ($this->parseNodes($yaml['constraints']) as $constraint) {
$metadata->addConstraint($constraint);
}
}
if (isset($yaml['properties'])) {
if (isset($yaml['properties']) && is_array($yaml['constraints'])) {
foreach ($yaml['properties'] as $property => $constraints) {
foreach ($this->parseNodes($constraints) as $constraint) {
$metadata->addPropertyConstraint($property, $constraint);
if (null !== $constraints) {
foreach ($this->parseNodes($constraints) as $constraint) {
$metadata->addPropertyConstraint($property, $constraint);
}
}
}
}
if (isset($yaml['getters'])) {
foreach ($yaml['getters'] as $getter => $constraints) {
foreach ($this->parseNodes($constraints) as $constraint) {
$metadata->addGetterConstraint($getter, $constraint);
if (null !== $constraints) {
foreach ($this->parseNodes($constraints) as $constraint) {
$metadata->addGetterConstraint($getter, $constraint);
}
}
}
}

1
src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.yml
View File

@ -35,6 +35,7 @@ Symfony\Component\Validator\Tests\Fixtures\Entity:
- Min: 5
# Constraint with options
- Choice: { choices: [A, B], message: Must be one of %choices% }
dummy:
getters:
lastName: