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

Revert "merged branch jakzal/2.0-StaticMethodLoaderFix (PR #3937)" 

This reverts commit 0078faa84b, reversing
changes made to 098b934410.
This commit is contained in:
Fabien Potencier 2012-04-18 11:42:27 +02:00
parent 580c8fa875
commit 29a41ec13b
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ class StaticMethodLoader implements LoaderInterface
throw new MappingException(sprintf('The method %s::%s should be static', $reflClass->getName(), $this->methodName));
}
if ($reflClass->isAbstract() || $reflMethod->getDeclaringClass()->getName() != $reflClass->getName()) {
if ($reflMethod->getDeclaringClass()->getName() != $reflClass->getName()) {
return false;
}

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

@ -35,14 +35,6 @@ class StaticMethodLoaderTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($loader->loadClassMetadata($metadata));
}
public function testLoadClassMetadataReturnsFalseIfMethodIsAbstract()
{
$loader = new StaticMethodLoader('loadMetadata');
$metadata = new ClassMetadata(__NAMESPACE__.'\AbstractStaticLoaderEntity');
$this->assertFalse($loader->loadClassMetadata($metadata));
}
public function testLoadClassMetadata()
{
$loader = new StaticMethodLoader('loadMetadata');
@ -88,8 +80,3 @@ class BaseStaticLoaderDocument
$metadata->addConstraint(new ConstraintA());
}
}
abstract class AbstractStaticLoaderEntity
{
abstract public static function loadMetadata(ClassMetadata $metadata);
}