소스 검색

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

This reverts commit 0078faa84b90e194221871c8adf27e48e20f8653, reversing
changes made to 098b93441001911d0d8a4370c89ab7531347c17e.
Fabien Potencier 13 년 전
부모
커밋
29a41ec13b

+ 1 - 1
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;
             }
 

+ 0 - 13
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);
-}