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

[Validator] fixed the static method loader to not repeat the loading when the static method is in the parent classes

Browse Source
This commit is contained in:
pablodip 2010-12-06 11:34:54 +01:00 committed by Fabien Potencier
parent c8c9fba7d9
commit 984a857a96
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php
View File

@ -37,6 +37,10 @@ class StaticMethodLoader implements LoaderInterface
throw new MappingException(sprintf('The method %s::%s should be static', $reflClass->getName(), $this->methodName));
}
if ($reflMethod->getDeclaringClass()->getName() != $reflClass->getName()) {
return false;
}
$reflMethod->invoke(null, $metadata);
return true;
@ -44,4 +48,4 @@ class StaticMethodLoader implements LoaderInterface
return false;
}
}
}

26
tests/Symfony/Tests/Component/Validator/Mapping/Loader/StaticMethodLoaderTest.php
View File

@ -4,6 +4,7 @@ namespace Symfony\Tests\Component\Validator\Mapping\Loader;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader;
use Symfony\Component\Validator\Constraints\NotNull;
class StaticMethodLoaderTest extends \PHPUnit_Framework_TestCase
{
@ -32,6 +33,19 @@ class StaticMethodLoaderTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(StaticLoaderEntity::$invokedWith, $metadata);
}
public function testLoadClassMetadataDoesNotRepeatLoadWithParentClasses()
{
$loader = new StaticMethodLoader('loadMetadata');
$metadata = new ClassMetadata(__NAMESPACE__.'\StaticLoaderDocument');
$loader->loadClassMetadata($metadata);
$this->assertSame(0, count($metadata->getConstraints()));
$loader = new StaticMethodLoader('loadMetadata');
$metadata = new ClassMetadata(__NAMESPACE__.'\BaseStaticLoaderDocument');
$loader->loadClassMetadata($metadata);
$this->assertSame(1, count($metadata->getConstraints()));
}
}
class StaticLoaderEntity
@ -43,3 +57,15 @@ class StaticLoaderEntity
self::$invokedWith = $metadata;
}
}
class StaticLoaderDocument extends BaseStaticLoaderDocument
{
}
class BaseStaticLoaderDocument
{
static public function loadMetadata(ClassMetadata $metadata)
{
$metadata->addConstraint(new NotNull());
}
}