From db2be55e27c87fa513073b2bf44456f1d1423582 Mon Sep 17 00:00:00 2001
From: "Roman S. Borschel" <roman.borschel@googlemail.com>
Date: Fri, 30 Apr 2010 17:30:27 +0200
Subject: [PATCH] [DDC-561] Fixed.

---
 lib/Doctrine/ORM/Mapping/AssociationMapping.php        | 3 ++-
 lib/Doctrine/ORM/Mapping/ClassMetadata.php             | 1 +
 lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php   | 2 +-
 lib/Doctrine/ORM/PersistentCollection.php              | 2 +-
 tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php | 2 ++
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/AssociationMapping.php b/lib/Doctrine/ORM/Mapping/AssociationMapping.php
index cadda07e3..488bcd0ff 100644
--- a/lib/Doctrine/ORM/Mapping/AssociationMapping.php
+++ b/lib/Doctrine/ORM/Mapping/AssociationMapping.php
@@ -356,7 +356,8 @@ abstract class AssociationMapping
         $serialized = array(
             'sourceEntityName',
             'targetEntityName',
-            'sourceFieldName'
+            'sourceFieldName',
+            'fetchMode'
         );
 
         if ($this->isCascadeDetach) {
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index a659e8235..18558c01a 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -286,6 +286,7 @@ class ClassMetadata extends ClassMetadataInfo
             'identifier',
             'isIdentifierComposite', // TODO: REMOVE
             'name',
+            'namespace', // TODO: REMOVE
             'table',
             'rootEntityName',
             'idGenerator', //TODO: Does not really need to be serialized. Could be moved to runtime.
diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
index ec3d92f7b..e44af01cf 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
@@ -143,7 +143,7 @@ class AnnotationDriver implements Driver
             throw MappingException::classIsNotAValidEntityOrMappedSuperClass($className);
         }
 
-        // Evaluate DoctrineTable annotation
+        // Evaluate Table annotation
         if (isset($classAnnotations['Doctrine\ORM\Mapping\Table'])) {
             $tableAnnot = $classAnnotations['Doctrine\ORM\Mapping\Table'];
             $primaryTable = array(
diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php
index 81d9a3e07..afbbf361f 100644
--- a/lib/Doctrine/ORM/PersistentCollection.php
+++ b/lib/Doctrine/ORM/PersistentCollection.php
@@ -359,7 +359,7 @@ final class PersistentCollection implements Collection
                 $this->_em->getUnitOfWork()->scheduleOrphanRemoval($removed);
             }
         }
-        
+
         return $removed;
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index 92231ae8e..96fc026f7 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -37,6 +37,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
 
         // Check state
         $this->assertTrue(count($cm->getReflectionProperties()) > 0);
+        $this->assertEquals('Doctrine\Tests\Models\CMS', $cm->namespace);
         $this->assertTrue($cm->reflClass instanceof \ReflectionClass);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name);
         $this->assertEquals('UserParent', $cm->rootEntityName);
@@ -47,6 +48,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $this->assertTrue($cm->getAssociationMapping('phonenumbers') instanceof \Doctrine\ORM\Mapping\OneToOneMapping);
         $this->assertEquals(1, count($cm->associationMappings));
         $oneOneMapping = $cm->getAssociationMapping('phonenumbers');
+        $this->assertTrue($oneOneMapping->fetchMode == \Doctrine\ORM\Mapping\AssociationMapping::FETCH_LAZY);
         $this->assertEquals('phonenumbers', $oneOneMapping->sourceFieldName);
         $this->assertEquals('Doctrine\Tests\Models\CMS\Bar', $oneOneMapping->targetEntityName);
     }