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

fix validator class metadata warning

Browse Source
This commit is contained in:
Thomas 2011-02-02 11:10:42 +01:00 committed by Fabien Potencier
parent de401fd94c
commit e6dc155e89
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Component/Form/FieldFactory/ValidatorFieldFactoryGuesser.php
View File

@ -81,14 +81,17 @@ class ValidatorFieldFactoryGuesser implements FieldFactoryGuesserInterface
{
$guesses = array();
$classMetadata = $this->metadataFactory->getClassMetadata($class);
$memberMetadatas = $classMetadata->getMemberMetadatas($property);
foreach ($memberMetadatas as $memberMetadata) {
$constraints = $memberMetadata->getConstraints();
if ($classMetadata->hasMemberMetadatas($property)) {
$memberMetadatas = $classMetadata->getMemberMetadatas($property);
foreach ($constraints as $constraint) {
if ($guess = $guessForConstraint($constraint)) {
$guesses[] = $guess;
foreach ($memberMetadatas as $memberMetadata) {
$constraints = $memberMetadata->getConstraints();
foreach ($constraints as $constraint) {
if ($guess = $guessForConstraint($constraint)) {
$guesses[] = $guess;
}
}
}
}

12
src/Symfony/Component/Validator/Mapping/ClassMetadata.php
View File

@ -207,6 +207,18 @@ class ClassMetadata extends ElementMetadata
$this->members[$property][] = $metadata;
}
/**
* Returns true if metadatas of members is present for the given property.
*
* @param string $property The name of the property
*
* @return Boolean
*/
public function hasMemberMetadatas($property)
{
return array_key_exists($property, $this->members);
}
/**
* Returns all metadatas of members describing the given property
*

8
tests/Symfony/Tests/Component/Validator/Mapping/ClassMetadataTest.php
View File

@ -109,6 +109,14 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($constraints, $members[0]->getConstraints());
}
public function testMemberMetadatas()
{
$this->metadata->addPropertyConstraint('firstName', new ConstraintA());
$this->assertTrue($this->metadata->hasMemberMetadatas('firstName'));
$this->assertFalse($this->metadata->hasMemberMetadatas('non_existant_field'));
}
public function testMergeConstraintsKeepsPrivateMembersSeperate()
{
$parent = new ClassMetadata(self::PARENTCLASS);