DCOM-93 - Adjust ClassMetadataFactory#getClassParents() to use reflec…

…tion service.
LaMiu · Jan 2, 2012 · 9bdf9a9 · 9bdf9a9
1 parent 87e0c69
commit 9bdf9a9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -24,6 +24,8 @@
     Doctrine\ORM\EntityManager,
     Doctrine\DBAL\Platforms,
     Doctrine\ORM\Events,
+    Doctrine\Common\Persistence\Mapping\RuntimeReflectionService,
+    Doctrine\Common\Persistence\Mapping\ReflectionService,
     Doctrine\Common\Persistence\Mapping\ClassMetadataFactory as ClassMetadataFactoryInterface;
 
 /**
@@ -74,6 +76,11 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
      */
     private $initialized = false;
 
+    /**
+     * @var ReflectionException
+     */
+    private $reflectionService;
+
     /**
      * @param EntityManager $$em
      */
@@ -220,7 +227,7 @@ protected function getParentClasses($name)
     {
         // Collect parent classes, ignoring transient (not-mapped) classes.
         $parentClasses = array();
-        foreach (array_reverse(class_parents($name)) as $parentClass) {
+        foreach (array_reverse($this->getReflectionService()->getParentClasses($name)) as $parentClass) {
             if ( ! $this->driver->isTransient($parentClass)) {
                 $parentClasses[] = $parentClass;
             }
@@ -533,4 +540,27 @@ public function isTransient($class)
 
         return $this->driver->isTransient($class);
     }
+
+    /**
+     * Get reflectionService.
+     *
+     * @return \Doctrine\Common\Persistence\Mapping\ReflectionService
+     */
+    public function getReflectionService()
+    {
+        if ($this->reflectionService === null) {
+            $this->reflectionService = new RuntimeReflectionService();
+        }
+        return $this->reflectionService;
+    }
+
+    /**
+     * Set reflectionService.
+     *
+     * @param reflectionService the value to set.
+     */
+    public function setReflectionService(ReflectionService $reflectionService)
+    {
+        $this->reflectionService = $reflectionService;
+    }
 }
diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common
+55 −2		lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php
+7 −0		lib/Doctrine/Common/Persistence/Mapping/ClassMetadata.php
+80 −0		lib/Doctrine/Common/Persistence/Mapping/ReflectionService.php
+102 −0		lib/Doctrine/Common/Persistence/Mapping/RuntimeReflectionService.php
+105 −0		lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php
+10 −1		tests/Doctrine/Tests/Common/Persistence/Mapping/ClassMetadataFactoryTest.php
+70 −0		tests/Doctrine/Tests/Common/Persistence/Mapping/RuntimeReflectionServiceTest.php
+70 −0		tests/Doctrine/Tests/Common/Persistence/Mapping/StaticReflectionServiceTest.php
+16 −0		tests/Doctrine/Tests/Common/Persistence/PersistentObjectTest.php