From 29a41ec13bfc4f717cac8e0e4ff131edf7b40828 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 18 Apr 2012 11:42:27 +0200 Subject: [PATCH] Revert "merged branch jakzal/2.0-StaticMethodLoaderFix (PR #3937)" This reverts commit 0078faa84b90e194221871c8adf27e48e20f8653, reversing changes made to 098b93441001911d0d8a4370c89ab7531347c17e. --- .../Validator/Mapping/Loader/StaticMethodLoader.php | 2 +- .../Mapping/Loader/StaticMethodLoaderTest.php | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php index 3e90fe91b5..a74ffbb429 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php @@ -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; } diff --git a/tests/Symfony/Tests/Component/Validator/Mapping/Loader/StaticMethodLoaderTest.php b/tests/Symfony/Tests/Component/Validator/Mapping/Loader/StaticMethodLoaderTest.php index 6d4493a753..daaf89f6e9 100644 --- a/tests/Symfony/Tests/Component/Validator/Mapping/Loader/StaticMethodLoaderTest.php +++ b/tests/Symfony/Tests/Component/Validator/Mapping/Loader/StaticMethodLoaderTest.php @@ -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); -}