only check for traits when class exists

Padam87 · Mar 26, 2013 · 8898c91 · 8898c91
1 parent 8e3e2e7
commit 8898c91
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php
@@ -710,11 +710,13 @@ protected function hasProperty($property, ClassMetadataInfo $metadata)
         }
 
         // check traits for existing property
-        $reflClass = new \ReflectionClass($metadata->name);
+        if (class_exists($metadata->name)) {
+            $reflClass = new \ReflectionClass($metadata->name);
 
-        foreach ($reflClass->getTraits() as $trait) {
-            if ($trait->hasProperty($property)) {
-                return true;
+            foreach ($reflClass->getTraits() as $trait) {
+                if ($trait->hasProperty($property)) {
+                    return true;
+                }
             }
         }
 
@@ -742,11 +744,13 @@ protected function hasMethod($method, ClassMetadataInfo $metadata)
         }
 
         // check traits for existing method
-        $reflClass = new \ReflectionClass($metadata->name);
+        if (class_exists($metadata->name)) {
+            $reflClass = new \ReflectionClass($metadata->name);
 
-        foreach ($reflClass->getTraits() as $trait) {
-            if ($trait->hasMethod($method)) {
-                return true;
+            foreach ($reflClass->getTraits() as $trait) {
+                if ($trait->hasMethod($method)) {
+                    return true;
+                }
             }
         }