From 3aea203b9ca77df65f55f036080a9af653194cbf Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 22 Oct 2011 11:28:07 +0200
Subject: [PATCH] Throw exception if target entity is not found.

---
 lib/Doctrine/ORM/Mapping/ClassMetadata.php            |  4 ++--
 .../Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php  | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index 2c9ec63b7..b03a6c7b3 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -134,8 +134,8 @@ class ClassMetadata extends ClassMetadataInfo
     {
         $mapping = parent::_validateAndCompleteAssociationMapping($mapping);
 
-        if ( ! class_exists($mapping['targetEntity']) ) {
-            #throw MappingException::invalidTargetEntityClass($mapping['targetEntity'], $this->name, $mapping['fieldName']);
+        if ( ! \Doctrine\Common\ClassLoader::classExists($mapping['targetEntity']) ) {
+            throw MappingException::invalidTargetEntityClass($mapping['targetEntity'], $this->name, $mapping['fieldName']);
         }
 
         return $mapping;
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index 7a36f808a..bc3268344 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -482,4 +482,15 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $this->setExpectedException("Doctrine\ORM\Mapping\MappingException", "Entity 'Doctrine\Tests\Models\CMS\CmsUser' has no method 'notfound' to be registered as lifecycle callback.");
         $cm->addLifecycleCallback('notfound', 'postLoad');
     }
+
+    /**
+     * @group ImproveErrorMessages
+     */
+    public function testTargetEntityNotFound()
+    {
+        $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+
+        $this->setExpectedException("Doctrine\ORM\Mapping\MappingException", "The target-entity Doctrine\Tests\Models\CMS\UnknownClass cannot be found in 'Doctrine\Tests\Models\CMS\CmsUser#address'.");
+        $cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'UnknownClass'));
+    }
 }