From cb28bfd4848e8d6dcf5b682e3ace624a8d69fa96 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 15 Oct 2011 17:38:55 +0200
Subject: [PATCH 01/59] Improve Error Messages in ClassMetadata and UnitOfWork

---
 lib/Doctrine/ORM/Mapping/ClassMetadata.php    | 19 +++++++++++++++++
 lib/Doctrine/ORM/Mapping/MappingException.php |  5 +++++
 lib/Doctrine/ORM/UnitOfWork.php               |  4 ++--
 .../ORM/Mapping/AbstractMappingDriverTest.php |  6 +++++-
 .../Mapping/BasicInheritanceMappingTest.php   |  1 +
 .../ORM/Mapping/ClassMetadataFactoryTest.php  |  4 ++--
 .../Tests/ORM/Mapping/ClassMetadataTest.php   |  4 ++--
 .../AbstractClassMetadataExporterTest.php     | 21 +++++++++++++------
 8 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index 9caa79e11..2c9ec63b7 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -122,6 +122,25 @@ class ClassMetadata extends ClassMetadataInfo
         $this->reflFields[$mapping['fieldName']] = $refProp;
     }
 
+    /**
+     * Validates & completes the basic mapping information that is common to all
+     * association mappings (one-to-one, many-ot-one, one-to-many, many-to-many).
+     *
+     * @param array $mapping The mapping.
+     * @return array The updated mapping.
+     * @throws MappingException If something is wrong with the mapping.
+     */
+    protected function _validateAndCompleteAssociationMapping(array $mapping)
+    {
+        $mapping = parent::_validateAndCompleteAssociationMapping($mapping);
+
+        if ( ! class_exists($mapping['targetEntity']) ) {
+            #throw MappingException::invalidTargetEntityClass($mapping['targetEntity'], $this->name, $mapping['fieldName']);
+        }
+
+        return $mapping;
+    }
+
     /**
      * Extracts the identifier values of an entity of this class.
      * 
diff --git a/lib/Doctrine/ORM/Mapping/MappingException.php b/lib/Doctrine/ORM/Mapping/MappingException.php
index 97fbf94f6..a359081c8 100644
--- a/lib/Doctrine/ORM/Mapping/MappingException.php
+++ b/lib/Doctrine/ORM/Mapping/MappingException.php
@@ -298,4 +298,9 @@ class MappingException extends \Doctrine\ORM\ORMException
     {
         return new self("Entity '" . $className . "' has no method '" . $methodName . "' to be registered as lifecycle callback.");
     }
+
+    public static function invalidTargetEntityClass($targetEntity, $sourceEntity, $associationName)
+    {
+        return new self("The target-entity " . $targetEntity . " cannot be found in '" . $sourceEntity."#".$associationName."'.");
+    }
 }
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index f53ec67a7..8af2a7337 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -594,8 +594,8 @@ class UnitOfWork implements PropertyChangedListener
                     throw new InvalidArgumentException("A new entity was found through the relationship '"
                             . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' that was not"
                             . " configured to cascade persist operations for entity: " . self::objToStr($entry) . "."
-                            . " Explicitly persist the new entity or configure cascading persist operations"
-                            . " on the relationship. If you cannot find out which entity causes the problem"
+                            . " Explicitly call EntityManager#persist() on this entity or configure to cascade persist "
+                            . " the association. If you cannot find out which entity causes the problem"
                             . " implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue.");
                 }
                 $this->persistNew($targetClass, $entry);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
index 98c43a5b9..05498c1d5 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
@@ -551,4 +551,8 @@ class Dog extends Animal
     {
         
     }
-}
\ No newline at end of file
+}
+
+class Address {}
+class Phonenumber {}
+class Group {}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
index 93504ec53..b4ed5b34c 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
@@ -197,6 +197,7 @@ class MappedSuperclassBase {
     private $mappedRelated1;
     private $transient;
 }
+class MappedSuperclassRelated1 {}
 
 /** @Entity */
 class EntitySubClass2 extends MappedSuperclassBase {
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
index dbb82f054..868dac7cd 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -32,12 +32,12 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
         // Add a mapped field
         $cm1->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true));
         // and a mapped association
-        $cm1->mapOneToOne(array('fieldName' => 'other', 'targetEntity' => 'Other', 'mappedBy' => 'this'));
+        $cm1->mapOneToOne(array('fieldName' => 'other', 'targetEntity' => 'TestEntity1', 'mappedBy' => 'this'));
         // and an association on the owning side
         $joinColumns = array(
             array('name' => 'other_id', 'referencedColumnName' => 'id')
         );
-        $cm1->mapOneToOne(array('fieldName' => 'association', 'targetEntity' => 'Other', 'joinColumns' => $joinColumns));
+        $cm1->mapOneToOne(array('fieldName' => 'association', 'targetEntity' => 'TestEntity1', 'joinColumns' => $joinColumns));
         // and an id generator type
         $cm1->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO);
 
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index fed31d9c5..7a36f808a 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -29,7 +29,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $cm->setParentClasses(array("UserParent"));
         $cm->setCustomRepositoryClass("UserRepository");
         $cm->setDiscriminatorColumn(array('name' => 'disc', 'type' => 'integer'));
-        $cm->mapOneToOne(array('fieldName' => 'phonenumbers', 'targetEntity' => 'Bar', 'mappedBy' => 'foo'));
+        $cm->mapOneToOne(array('fieldName' => 'phonenumbers', 'targetEntity' => 'CmsAddress', 'mappedBy' => 'foo'));
         $cm->markReadOnly();
         $cm->addNamedQuery(array('name' => 'dql', 'query' => 'foo'));
         $this->assertEquals(1, count($cm->associationMappings));
@@ -52,7 +52,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $oneOneMapping = $cm->getAssociationMapping('phonenumbers');
         $this->assertTrue($oneOneMapping['fetch'] == ClassMetadata::FETCH_LAZY);
         $this->assertEquals('phonenumbers', $oneOneMapping['fieldName']);
-        $this->assertEquals('Doctrine\Tests\Models\CMS\Bar', $oneOneMapping['targetEntity']);
+        $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $oneOneMapping['targetEntity']);
         $this->assertTrue($cm->isReadOnly);
         $this->assertEquals(array('dql' => 'foo'), $cm->namedQueries);
     }
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
index c9bfdccf0..8e263ba40 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
@@ -98,6 +98,8 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
 
     public function testExportDirectoryAndFilesAreCreated()
     {
+        $this->_deleteDirectory(__DIR__ . '/export/'.$this->_getType());
+
         $type = $this->_getType();
         $metadataDriver = $this->_createMetadataDriver($type, __DIR__ . '/' . $type);
         $em = $this->_createEntityManager($metadataDriver);
@@ -320,12 +322,6 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
         $this->assertEquals('user', $class->associationMappings['address']['inversedBy']);
     }
 
-    public function __destruct()
-    {
-        $type = $this->_getType();
-        $this->_deleteDirectory(__DIR__ . '/export/'.$this->_getType());
-    }
-
     protected function _deleteDirectory($path)
     {
         if (is_file($path)) {
@@ -338,4 +334,17 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
             return rmdir($path);
         }
     }
+}
+
+class Address
+{
+
+}
+class Phonenumber
+{
+
+}
+class Group
+{
+    
 }
\ No newline at end of file

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 02/59] 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'));
+    }
 }

From 5392737de422f1d68a9e135eb35985ba4b76b4ee Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 22 Oct 2011 12:40:12 +0200
Subject: [PATCH 03/59] Improved and extracted UnitOfWork error messages

---
 .../ORM/ORMInvalidArgumentException.php       | 81 +++++++++++++++++++
 lib/Doctrine/ORM/UnitOfWork.php               | 33 +++-----
 .../Functional/UnitOfWorkLifecycleTest.php    | 71 ++++++++++++++++
 3 files changed, 164 insertions(+), 21 deletions(-)
 create mode 100644 lib/Doctrine/ORM/ORMInvalidArgumentException.php
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php

diff --git a/lib/Doctrine/ORM/ORMInvalidArgumentException.php b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
new file mode 100644
index 000000000..b4edc5dd2
--- /dev/null
+++ b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM;
+
+class ORMInvalidArgumentException extends \InvalidArgumentException
+{
+    static public function scheduleInsertForManagedEntity($entity)
+    {
+        return new self("A managed+dirty entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+    }
+
+    static public function scheduleInsertForRemovedEntity($entity)
+    {
+        return new self("Removed entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+    }
+
+    static public function scheduleInsertTwice($entity)
+    {
+        return new self("Entity " . self::objToStr($entity) . " can not be scheduled for insertion twice.");
+    }
+
+    static public function entityWithoutIdentity($className, $entity)
+    {
+        throw new self(
+            "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " . 
+            "id values set. It cannot be added to the identity map."
+        );
+    }
+
+    static public function readOnlyRequiresManagedEntity($entity)
+    {
+        return new self("Only managed entities can be marked or checked as read only. But " . self::objToStr($entity) . " is not");
+    }
+
+    static public function newEntityFoundThroughRelationship(array $assoc, $entry)
+    {
+        return new self("A new entity was found through the relationship '"
+                            . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' that was not"
+                            . " configured to cascade persist operations for entity: " . self::objToStr($entry) . "."
+                            . " To solve this issue: Either explicitly call EntityManager#persist()"
+                            . " on this unknown entity or configure cascade persist "
+                            . " this association in the mapping for example @ManyToOne(..,cascade={\"persist\"}). "
+                            . " If you cannot find out which entity causes the problem"
+                            . " implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue.");
+    }
+
+    static public function detachedEntityFoundThroughRelationship(array $assoc, $entry)
+    {
+        throw new self("A detached entity of type " . $assoc['targetEntity'] . " (" . self::objToStr($entry) . ") "
+                        . " was found through the relationship '" . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' "
+                        . "during cascading a persist operation.");
+    }
+
+    /**
+     * Helper method to show an object as string.
+     *
+     * @param  object $obj
+     * @return string
+     */
+    private static function objToStr($obj)
+    {
+        return method_exists($obj, '__toString') ? (string)$obj : get_class($obj).'@'.spl_object_hash($obj);
+    }
+}
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 1e6d13fb5..2b696063f 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -595,25 +595,16 @@ class UnitOfWork implements PropertyChangedListener
             $oid = spl_object_hash($entry);
             if ($state == self::STATE_NEW) {
                 if ( ! $assoc['isCascadePersist']) {
-                    throw new InvalidArgumentException("A new entity was found through the relationship '"
-                            . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' that was not"
-                            . " configured to cascade persist operations for entity: " . self::objToStr($entry) . "."
-                            . " Explicitly call EntityManager#persist() on this entity or configure to cascade persist "
-                            . " the association. If you cannot find out which entity causes the problem"
-                            . " implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue.");
+                    throw ORMInvalidArgumentException::newEntityFoundThroughRelationship($assoc, $entry);
                 }
                 $this->persistNew($targetClass, $entry);
                 $this->computeChangeSet($targetClass, $entry);
-            } else if ($state == self::STATE_REMOVED) {
-                return new InvalidArgumentException("Removed entity detected during flush: "
-                        . self::objToStr($entry).". Remove deleted entities from associations.");
             } else if ($state == self::STATE_DETACHED) {
                 // Can actually not happen right now as we assume STATE_NEW,
                 // so the exception will be raised from the DBAL layer (constraint violation).
-                throw new InvalidArgumentException("A detached entity was found through a "
-                        . "relationship during cascading a persist operation.");
+                throw ORMInvalidArgumentException::detachedEntityFoundThroughRelationship($assoc, $entry);
             }
-            // MANAGED associated entities are already taken into account
+            // MANAGED and REMOVED associated entities are already taken into account
             // during changeset calculation anyway, since they are in the identity map.
         }
     }
@@ -662,7 +653,7 @@ class UnitOfWork implements PropertyChangedListener
         $oid = spl_object_hash($entity);
         
         if ( ! isset($this->entityStates[$oid]) || $this->entityStates[$oid] != self::STATE_MANAGED) {
-            throw new InvalidArgumentException('Entity must be managed.');
+            throw new InvalidArgumentException("Entity of type '" . $class->name . "' must be managed.");
         }
         
         /* TODO: Just return if changetracking policy is NOTIFY?
@@ -907,14 +898,14 @@ class UnitOfWork implements PropertyChangedListener
     {
         $oid = spl_object_hash($entity);
 
-        if (isset($this->entityUpdates[$oid])) {
-            throw new InvalidArgumentException("Dirty entity can not be scheduled for insertion.");
-        }
         if (isset($this->entityDeletions[$oid])) {
-            throw new InvalidArgumentException("Removed entity can not be scheduled for insertion.");
+            throw ORMInvalidArgumentException::scheduleInsertForRemovedEntity($entity);
+        }
+        if (isset($this->originalEntityData[$oid]) && ! isset($this->entityInsertions[$oid])) {
+            throw ORMInvalidArgumentException::scheduleInsertForManagedEntity($entity);
         }
         if (isset($this->entityInsertions[$oid])) {
-            throw new InvalidArgumentException("Entity can not be scheduled for insertion twice.");
+            throw ORMInvalidArgumentException::scheduleInsertTwice($entity);
         }
 
         $this->entityInsertions[$oid] = $entity;
@@ -1071,7 +1062,7 @@ class UnitOfWork implements PropertyChangedListener
         $classMetadata = $this->em->getClassMetadata(get_class($entity));
         $idHash = implode(' ', $this->entityIdentifiers[spl_object_hash($entity)]);
         if ($idHash === '') {
-            throw new InvalidArgumentException("The given entity has no identity.");
+            throw ORMInvalidArgumentException::entityWithoutIdentity($classMetadata->name, $entity);
         }
         $className = $classMetadata->rootEntityName;
         if (isset($this->identityMap[$className][$idHash])) {
@@ -2466,7 +2457,7 @@ class UnitOfWork implements PropertyChangedListener
     public function markReadOnly($object)
     {
         if ( ! is_object($object) || ! $this->isInIdentityMap($object)) {
-            throw new InvalidArgumentException("Managed entity required");
+            throw ORMInvalidArgumentException::readOnlyRequiresManagedEntity($object);
         }
         $this->readOnlyObjects[spl_object_hash($object)] = true;
     }
@@ -2481,7 +2472,7 @@ class UnitOfWork implements PropertyChangedListener
     public function isReadOnly($object)
     {
         if ( ! is_object($object) ) {
-            throw new InvalidArgumentException("Managed entity required");
+            throw ORMInvalidArgumentException::readOnlyRequiresManagedEntity($object);
         }
         return isset($this->readOnlyObjects[spl_object_hash($object)]);
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php b/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php
new file mode 100644
index 000000000..08e3720ca
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional;
+
+use Doctrine\Tests\Models\CMS\CmsUser;
+
+class UnitOfWorkLifecycleTest extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        $this->useModelSet('cms');
+        parent::setUp();
+    }
+
+    public function testScheduleInsertManaged()
+    {
+        $user = new CmsUser();
+        $user->username = "beberlei";
+        $user->name = "Benjamin";
+        $user->status = "active";
+        $this->_em->persist($user);
+        $this->_em->flush();
+
+        $this->setExpectedException("Doctrine\ORM\ORMInvalidArgumentException", "A managed+dirty entity Doctrine\Tests\Models\CMS\CmsUser");
+        $this->_em->getUnitOfWork()->scheduleForInsert($user);
+    }
+
+    public function testScheduleInsertDeleted()
+    {
+        $user = new CmsUser();
+        $user->username = "beberlei";
+        $user->name = "Benjamin";
+        $user->status = "active";
+        $this->_em->persist($user);
+        $this->_em->flush();
+
+        $this->_em->remove($user);
+
+        $this->setExpectedException("Doctrine\ORM\ORMInvalidArgumentException", "Removed entity Doctrine\Tests\Models\CMS\CmsUser");
+        $this->_em->getUnitOfWork()->scheduleForInsert($user);
+    }
+
+    public function testScheduleInsertTwice()
+    {
+        $user = new CmsUser();
+        $user->username = "beberlei";
+        $user->name = "Benjamin";
+        $user->status = "active";
+
+        $this->_em->getUnitOfWork()->scheduleForInsert($user);
+
+        $this->setExpectedException("Doctrine\ORM\ORMInvalidArgumentException", "Entity Doctrine\Tests\Models\CMS\CmsUser");
+        $this->_em->getUnitOfWork()->scheduleForInsert($user);
+    }
+
+    public function testAddToIdentityMapWithoutIdentity()
+    {
+        $user = new CmsUser();
+
+        $this->setExpectedException("Doctrine\ORM\ORMInvalidArgumentException", "The given entity of type 'Doctrine\Tests\Models\CMS\CmsUser' (Doctrine\Tests\Models\CMS\CmsUser@");
+        $this->_em->getUnitOfWork()->registerManaged($user, array(), array());
+    }
+
+    public function testMarkReadOnlyNonManaged()
+    {
+        $user = new CmsUser();
+
+        $this->setExpectedException("Doctrine\ORM\ORMInvalidArgumentException", "Only managed entities can be marked or checked as read only. But Doctrine\Tests\Models\CMS\CmsUser@");
+        $this->_em->getUnitOfWork()->markReadOnly($user);
+    }
+}
\ No newline at end of file

From a8906ce572a7b2ac69aeb02d66581dfdded49f13 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 22 Oct 2011 12:49:33 +0200
Subject: [PATCH 04/59] Stringify entity in all UnitOfWork exceptions

---
 .../ORM/ORMInvalidArgumentException.php       |  6 +++++
 lib/Doctrine/ORM/UnitOfWork.php               | 23 ++++++++++---------
 .../Tests/ORM/Functional/Locking/LockTest.php |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/lib/Doctrine/ORM/ORMInvalidArgumentException.php b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
index b4edc5dd2..a4a03c41a 100644
--- a/lib/Doctrine/ORM/ORMInvalidArgumentException.php
+++ b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
@@ -68,6 +68,12 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
                         . "during cascading a persist operation.");
     }
 
+    static public function entityNotManaged($entity)
+    {
+        throw new self("Entity " . self::objToStr($entity) . " is not managed. An entity is managed if its fetched " .
+                "from the database or registered as new through EntityManager#persist");
+    }
+
     /**
      * Helper method to show an object as string.
      *
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 2b696063f..a80079041 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -653,7 +653,7 @@ class UnitOfWork implements PropertyChangedListener
         $oid = spl_object_hash($entity);
         
         if ( ! isset($this->entityStates[$oid]) || $this->entityStates[$oid] != self::STATE_MANAGED) {
-            throw new InvalidArgumentException("Entity of type '" . $class->name . "' must be managed.");
+            throw ORMInvalidArgumentException::entityNotManaged($entity);
         }
         
         /* TODO: Just return if changetracking policy is NOTIFY?
@@ -935,10 +935,10 @@ class UnitOfWork implements PropertyChangedListener
     {
         $oid = spl_object_hash($entity);
         if ( ! isset($this->entityIdentifiers[$oid])) {
-            throw new InvalidArgumentException("Entity has no identity.");
+            throw new InvalidArgumentException("Entity has no identity." . self::objToStr($entity));
         }
         if (isset($this->entityDeletions[$oid])) {
-            throw new InvalidArgumentException("Entity is removed.");
+            throw new InvalidArgumentException("Entity is removed." . self::objToStr($entity));
         }
 
         if ( ! isset($this->entityUpdates[$oid]) && ! isset($this->entityInsertions[$oid])) {
@@ -1160,7 +1160,7 @@ class UnitOfWork implements PropertyChangedListener
         $classMetadata = $this->em->getClassMetadata(get_class($entity));
         $idHash = implode(' ', $this->entityIdentifiers[$oid]);
         if ($idHash === '') {
-            throw new InvalidArgumentException("The given entity has no identity.");
+            throw new InvalidArgumentException("The given entity has no identity." . self::objToStr($entity));
         }
         $className = $classMetadata->rootEntityName;
         if (isset($this->identityMap[$className][$idHash])) {
@@ -1291,9 +1291,9 @@ class UnitOfWork implements PropertyChangedListener
                 break;
             case self::STATE_DETACHED:
                 // Can actually not happen right now since we assume STATE_NEW.
-                throw new InvalidArgumentException("Detached entity passed to persist().");
+                throw new InvalidArgumentException("Detached entity passed to persist()." . self::objToStr($entity));
             default:
-                throw new UnexpectedValueException("Unexpected entity state: $entityState.");
+                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
         }
 
         $this->cascadePersist($entity, $visited);
@@ -1350,9 +1350,9 @@ class UnitOfWork implements PropertyChangedListener
                 $this->scheduleForDelete($entity);
                 break;
             case self::STATE_DETACHED:
-                throw new InvalidArgumentException("A detached entity can not be removed.");
+                throw new InvalidArgumentException("A detached entity can not be removed." . self::objToStr($entity));
             default:
-                throw new UnexpectedValueException("Unexpected entity state: $entityState.");
+                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
         }
 
     }
@@ -1417,7 +1417,8 @@ class UnitOfWork implements PropertyChangedListener
                 if ($managedCopy) {
                     // We have the entity in-memory already, just make sure its not removed.
                     if ($this->getEntityState($managedCopy) == self::STATE_REMOVED) {
-                        throw new InvalidArgumentException('Removed entity detected during merge.'
+                        throw new InvalidArgumentException(
+                                'Removed entity ' . self::objToStr($managedCopy) . ' detected during merge.'
                                 . ' Can not merge with a removed entity.');
                     }
                 } else {
@@ -1624,7 +1625,7 @@ class UnitOfWork implements PropertyChangedListener
                 $entity
             );
         } else {
-            throw new InvalidArgumentException("Entity is not MANAGED.");
+            throw ORMInvalidArgumentException::entityNotManaged($entity);
         }
         
         $this->cascadeRefresh($entity, $visited);
@@ -1789,7 +1790,7 @@ class UnitOfWork implements PropertyChangedListener
     public function lock($entity, $lockMode, $lockVersion = null)
     {
         if ($this->getEntityState($entity, self::STATE_DETACHED) != self::STATE_MANAGED) {
-            throw new InvalidArgumentException("Entity is not MANAGED.");
+            throw ORMInvalidArgumentException::entityNotManaged($entity);
         }
         
         $entityName = get_class($entity);
diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
index 6917e7252..62c787409 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
@@ -71,7 +71,7 @@ class LockTest extends \Doctrine\Tests\OrmFunctionalTestCase {
     public function testLockUnmanagedEntity_ThrowsException() {
         $article = new CmsArticle();
 
-        $this->setExpectedException('InvalidArgumentException', 'Entity is not MANAGED.');
+        $this->setExpectedException('InvalidArgumentException', 'Entity Doctrine\Tests\Models\CMS\CmsArticle');
         $this->_em->lock($article, LockMode::OPTIMISTIC, $article->version + 1);
     }
 

From 719e05e53e9e376c7d4138a1d20070ece2cfc57b Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 22 Oct 2011 12:57:55 +0200
Subject: [PATCH 05/59] Extract more messages into ORMInvalidArgumentException

---
 .../ORM/ORMInvalidArgumentException.php       | 20 +++++++++++++++++++
 lib/Doctrine/ORM/UnitOfWork.php               | 14 ++++++-------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lib/Doctrine/ORM/ORMInvalidArgumentException.php b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
index a4a03c41a..878ee4b71 100644
--- a/lib/Doctrine/ORM/ORMInvalidArgumentException.php
+++ b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
@@ -19,6 +19,11 @@
 
 namespace Doctrine\ORM;
 
+/**
+ * Contains exception messages for all invalid lifecycle state exceptions inside UnitOfWork
+ *
+ * @author Benjamin Eberlei <kontakt@beberlei.de>
+ */
 class ORMInvalidArgumentException extends \InvalidArgumentException
 {
     static public function scheduleInsertForManagedEntity($entity)
@@ -74,6 +79,21 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
                 "from the database or registered as new through EntityManager#persist");
     }
 
+    static public function entityHasNoIdentity($entity, $operation)
+    {
+        throw new self("Entity has no identity, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+    }
+
+    static public function entityIsRemoved($entity, $operation)
+    {
+        throw new self("Entity is removed, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+    }
+
+    static public function detachedEntityCannot($entity, $operation)
+    {
+        throw new self("A detached entity was found during " . $operation . " " . self::objToStr($entity));
+    }
+
     /**
      * Helper method to show an object as string.
      *
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index a80079041..e4168a1a0 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -935,10 +935,10 @@ class UnitOfWork implements PropertyChangedListener
     {
         $oid = spl_object_hash($entity);
         if ( ! isset($this->entityIdentifiers[$oid])) {
-            throw new InvalidArgumentException("Entity has no identity." . self::objToStr($entity));
+            throw ORMInvalidArgumentException::entityHasNoIdentity($entity, "scheduling for update");
         }
         if (isset($this->entityDeletions[$oid])) {
-            throw new InvalidArgumentException("Entity is removed." . self::objToStr($entity));
+            throw ORMInvalidArgumentException::entityIsRemoved($entity, "schedule for update");
         }
 
         if ( ! isset($this->entityUpdates[$oid]) && ! isset($this->entityInsertions[$oid])) {
@@ -1160,7 +1160,7 @@ class UnitOfWork implements PropertyChangedListener
         $classMetadata = $this->em->getClassMetadata(get_class($entity));
         $idHash = implode(' ', $this->entityIdentifiers[$oid]);
         if ($idHash === '') {
-            throw new InvalidArgumentException("The given entity has no identity." . self::objToStr($entity));
+            throw ORMInvalidArgumentException::entityHasNoIdentity($entity, "remove from identity map");
         }
         $className = $classMetadata->rootEntityName;
         if (isset($this->identityMap[$className][$idHash])) {
@@ -1291,7 +1291,7 @@ class UnitOfWork implements PropertyChangedListener
                 break;
             case self::STATE_DETACHED:
                 // Can actually not happen right now since we assume STATE_NEW.
-                throw new InvalidArgumentException("Detached entity passed to persist()." . self::objToStr($entity));
+                throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted");
             default:
                 throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
         }
@@ -1350,7 +1350,7 @@ class UnitOfWork implements PropertyChangedListener
                 $this->scheduleForDelete($entity);
                 break;
             case self::STATE_DETACHED:
-                throw new InvalidArgumentException("A detached entity can not be removed." . self::objToStr($entity));
+                throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed");
             default:
                 throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
         }
@@ -1417,9 +1417,7 @@ class UnitOfWork implements PropertyChangedListener
                 if ($managedCopy) {
                     // We have the entity in-memory already, just make sure its not removed.
                     if ($this->getEntityState($managedCopy) == self::STATE_REMOVED) {
-                        throw new InvalidArgumentException(
-                                'Removed entity ' . self::objToStr($managedCopy) . ' detected during merge.'
-                                . ' Can not merge with a removed entity.');
+                        throw ORMInvalidArgumentException::entityIsRemoved($managedCopy, "merge");
                     }
                 } else {
                     // We need to fetch the managed copy in order to merge.

From f6eb83705adc9603a87e8d194aa7f29e8ab36ebe Mon Sep 17 00:00:00 2001
From: Guilherme Blanco <guilhermeblanco@gmail.com>
Date: Tue, 20 Dec 2011 00:05:14 -0500
Subject: [PATCH 06/59] Added coverage to DDC-1521. Small CS changes.

---
 .../Mapping/Driver/SimplifiedYamlDriver.php   |  1 -
 .../ORM/Functional/Ticket/DDC1521Test.php     | 77 +++++++++++++++++++
 .../ORM/Functional/Ticket/DDC1545Test.php     |  6 +-
 .../ORM/Functional/Ticket/DDC1548Test.php     |  1 +
 4 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1521Test.php

diff --git a/lib/Doctrine/ORM/Mapping/Driver/SimplifiedYamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/SimplifiedYamlDriver.php
index 679ee85cc..b88a76939 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/SimplifiedYamlDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/SimplifiedYamlDriver.php
@@ -61,7 +61,6 @@ class SimplifiedYamlDriver extends YamlDriver
         $this->_prefixes[$path] = $prefix;
     }
 
-
     public function getNamespacePrefixes()
     {
         return $this->_prefixes;
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1521Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1521Test.php
new file mode 100644
index 000000000..b305c4005
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1521Test.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+
+/**
+ * @group DDC-1521
+ */
+class DDC1521Test extends OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        $this->useModelSet('navigation');
+
+        parent::setUp();
+
+        $config = $this->_em->getConfiguration();
+        $config->addCustomNumericFunction('TEST', __NAMESPACE__ . '\TestFunction');
+    }
+
+    public function testIssue()
+    {
+        $dql    = 'SELECT TEST(p.lat, p.long, :lat, :lng) FROM Doctrine\Tests\Models\Navigation\NavPointOfInterest p WHERE p.name = :name';
+        $params = array('lat' => 1, 'lng' => 2, 'name' => 'My restaurant');
+
+        $query  = $this->_em->createQuery($dql)->setParameters($params);
+
+        $this->assertEquals('SELECT ((12733.129728 + (n0_.nav_lat - ?) + (n0_.nav_long - ?)) * ((n0_.nav_lat - ?) / (12733.129728 * n0_.nav_long - ?))) AS sclr0 FROM navigation_pois n0_ WHERE n0_.name = ?', $query->getSQL());
+
+        $result = $query->getScalarResult();
+
+        $this->assertEquals(0, count($result));
+    }
+}
+
+class TestFunction extends FunctionNode
+{
+	protected $fromLat;
+	protected $fromLng;
+	protected $toLat;
+	protected $toLng;
+
+	public function parse(\Doctrine\ORM\Query\Parser $parser)
+	{
+		$parser->match(Lexer::T_IDENTIFIER);
+		$parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+		$this->fromLat = $parser->ArithmeticPrimary();
+		$parser->match(Lexer::T_COMMA);
+
+		$this->fromLng = $parser->ArithmeticPrimary();
+		$parser->match(Lexer::T_COMMA);
+
+		$this->toLat = $parser->ArithmeticPrimary();
+		$parser->match(Lexer::T_COMMA);
+
+		$this->toLng = $parser->ArithmeticPrimary();
+
+		$parser->match(Lexer::T_CLOSE_PARENTHESIS);
+	}
+
+	public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+	{
+		$fromLat = $this->fromLat->dispatch($sqlWalker);
+		$fromLng = $this->fromLng->dispatch($sqlWalker);
+		$toLat   = $this->toLat->dispatch($sqlWalker);
+		$toLng   = $this->toLng->dispatch($sqlWalker);
+
+		$earthDiameterInKM = 1.609344 * 3956 * 2;
+
+		return "(($earthDiameterInKM + ($fromLat - $toLat) + ($fromLng - $toLng)) * (($fromLat - $toLat) / ($earthDiameterInKM * $fromLng - $toLng)))";
+	}
+}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
index e7b55eb1f..6af9cc547 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
@@ -2,14 +2,12 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-use Doctrine\Tests\Models\Qelista\User;
-
-use Doctrine\Tests\Models\Qelista\ShoppingList;
-
 use Doctrine\Common\Collections\ArrayCollection;
+
 use Doctrine\Tests\Models\CMS\CmsComment;
 use Doctrine\Tests\Models\CMS\CmsArticle;
 use Doctrine\Tests\Models\CMS\CmsUser;
+
 require_once __DIR__ . '/../../../TestInit.php';
 
 /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php
index dc77ed60e..74c1fe1d5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php
@@ -46,6 +46,7 @@ class DDC1548E1
      */
     public $rel;
 }
+
 /**
  * @Entity
  */

From 772f58a95ba0ec594b24140983ac168bbd96fe74 Mon Sep 17 00:00:00 2001
From: Guilherme Blanco <guilhermeblanco@gmail.com>
Date: Tue, 20 Dec 2011 00:48:19 -0500
Subject: [PATCH 07/59] Removed test since I'm unable to test now.

---
 .../ORM/Functional/Ticket/DDC1521Test.php     | 77 -------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1521Test.php

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1521Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1521Test.php
deleted file mode 100644
index b305c4005..000000000
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1521Test.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Functional\Ticket;
-
-use Doctrine\Tests\OrmFunctionalTestCase;
-
-use Doctrine\ORM\Query\AST\Functions\FunctionNode;
-use Doctrine\ORM\Query\Lexer;
-
-/**
- * @group DDC-1521
- */
-class DDC1521Test extends OrmFunctionalTestCase
-{
-    public function setUp()
-    {
-        $this->useModelSet('navigation');
-
-        parent::setUp();
-
-        $config = $this->_em->getConfiguration();
-        $config->addCustomNumericFunction('TEST', __NAMESPACE__ . '\TestFunction');
-    }
-
-    public function testIssue()
-    {
-        $dql    = 'SELECT TEST(p.lat, p.long, :lat, :lng) FROM Doctrine\Tests\Models\Navigation\NavPointOfInterest p WHERE p.name = :name';
-        $params = array('lat' => 1, 'lng' => 2, 'name' => 'My restaurant');
-
-        $query  = $this->_em->createQuery($dql)->setParameters($params);
-
-        $this->assertEquals('SELECT ((12733.129728 + (n0_.nav_lat - ?) + (n0_.nav_long - ?)) * ((n0_.nav_lat - ?) / (12733.129728 * n0_.nav_long - ?))) AS sclr0 FROM navigation_pois n0_ WHERE n0_.name = ?', $query->getSQL());
-
-        $result = $query->getScalarResult();
-
-        $this->assertEquals(0, count($result));
-    }
-}
-
-class TestFunction extends FunctionNode
-{
-	protected $fromLat;
-	protected $fromLng;
-	protected $toLat;
-	protected $toLng;
-
-	public function parse(\Doctrine\ORM\Query\Parser $parser)
-	{
-		$parser->match(Lexer::T_IDENTIFIER);
-		$parser->match(Lexer::T_OPEN_PARENTHESIS);
-
-		$this->fromLat = $parser->ArithmeticPrimary();
-		$parser->match(Lexer::T_COMMA);
-
-		$this->fromLng = $parser->ArithmeticPrimary();
-		$parser->match(Lexer::T_COMMA);
-
-		$this->toLat = $parser->ArithmeticPrimary();
-		$parser->match(Lexer::T_COMMA);
-
-		$this->toLng = $parser->ArithmeticPrimary();
-
-		$parser->match(Lexer::T_CLOSE_PARENTHESIS);
-	}
-
-	public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
-	{
-		$fromLat = $this->fromLat->dispatch($sqlWalker);
-		$fromLng = $this->fromLng->dispatch($sqlWalker);
-		$toLat   = $this->toLat->dispatch($sqlWalker);
-		$toLng   = $this->toLng->dispatch($sqlWalker);
-
-		$earthDiameterInKM = 1.609344 * 3956 * 2;
-
-		return "(($earthDiameterInKM + ($fromLat - $toLat) + ($fromLng - $toLng)) * (($fromLat - $toLat) / ($earthDiameterInKM * $fromLng - $toLng)))";
-	}
-}
\ No newline at end of file

From 24dc74a80033d50e9a0267f819dad095969bf807 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Tue, 20 Dec 2011 10:31:00 -0200
Subject: [PATCH 08/59] Fixed DDC-1539

---
 lib/Doctrine/ORM/Query/Parser.php             |  4 ++--
 .../ORM/Query/SelectSqlGenerationTest.php     | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index 234444226..59b7fc3b7 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -2149,8 +2149,8 @@ class Parser
 
         // Peek beyond the matching closing paranthesis ')'
         $peek = $this->_peekBeyondClosingParenthesis();
-
-        if (in_array($peek['value'], array("=",  "<", "<=", "<>", ">", ">=", "!=")) ||
+        
+        if (in_array($peek['value'], array("=",  "<", "<=", "<>", ">", ">=", "!=", "!=")) || $this->_isMathOperator($peek) ||
             in_array($peek['type'], array(Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS))) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
 
diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
index a71f9f25d..a079e6574 100644
--- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
@@ -1415,6 +1415,25 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
         );
     }
 
+    /**
+     * @group DDC-1539
+     */
+    public function testParenthesesOnTheLeftHandOfComparison()
+    {
+        $this->assertSqlGeneration(
+            'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u where ( (u.id + u.id) * u.id ) > 100',
+            'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE (c0_.id + c0_.id) * c0_.id > 100'
+        );
+        $this->assertSqlGeneration(
+            'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u where (u.id + u.id) * u.id > 100',
+            'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE (c0_.id + c0_.id) * c0_.id > 100'
+        );
+        $this->assertSqlGeneration(
+            'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u where 100 < (u.id + u.id) * u.id ',
+            'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE 100 < (c0_.id + c0_.id) * c0_.id'
+        );
+    }
+
     public function testCustomTypeValueSql()
     {
         if (DBALType::hasType('negative_to_positive')) {

From e45ebbac46d591efdaade1671c8fa836002353ed Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Tue, 20 Dec 2011 10:40:29 -0200
Subject: [PATCH 09/59] remove white spaces

---
 lib/Doctrine/ORM/Query/Parser.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index 59b7fc3b7..420083680 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -2149,9 +2149,10 @@ class Parser
 
         // Peek beyond the matching closing paranthesis ')'
         $peek = $this->_peekBeyondClosingParenthesis();
-        
-        if (in_array($peek['value'], array("=",  "<", "<=", "<>", ">", ">=", "!=", "!=")) || $this->_isMathOperator($peek) ||
-            in_array($peek['type'], array(Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS))) {
+
+        if (in_array($peek['value'], array("=",  "<", "<=", "<>", ">", ">=", "!=")) ||
+            in_array($peek['type'], array(Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS)) ||
+            $this->_isMathOperator($peek)) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
 
             return $condPrimary;

From 0a01b14830352a5bf47272caccf4d8b2c96c07bd Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Tue, 20 Dec 2011 16:14:01 -0200
Subject: [PATCH 10/59] fix QueryTest#testJoinQueries order

---
 tests/Doctrine/Tests/ORM/Functional/QueryTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
index 31399754b..6bd37408a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
@@ -87,7 +87,7 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        $query = $this->_em->createQuery("select u, a from Doctrine\Tests\Models\CMS\CmsUser u join u.articles a");
+        $query = $this->_em->createQuery("select u, a from Doctrine\Tests\Models\CMS\CmsUser u join u.articles a ORDER BY a.id");
         $users = $query->getResult();
         $this->assertEquals(1, count($users));
         $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]);

From e90545cef5f65e2fcb8683e25a8c9258619b5eb6 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Tue, 20 Dec 2011 17:22:14 -0200
Subject: [PATCH 11/59] ORDER BY CmsArticle#topic

---
 tests/Doctrine/Tests/ORM/Functional/QueryTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
index 6bd37408a..557e4689e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
@@ -87,7 +87,7 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        $query = $this->_em->createQuery("select u, a from Doctrine\Tests\Models\CMS\CmsUser u join u.articles a ORDER BY a.id");
+        $query = $this->_em->createQuery("select u, a from Doctrine\Tests\Models\CMS\CmsUser u join u.articles a ORDER BY a.topic");
         $users = $query->getResult();
         $this->assertEquals(1, count($users));
         $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]);

From 9f81d5d077c0e15653727109a5da26c7fdd2b292 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 20 Dec 2011 21:55:58 +0100
Subject: [PATCH 12/59] Fix PEAR path

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 6bfe35a6d..a2379c654 100644
--- a/build.xml
+++ b/build.xml
@@ -94,8 +94,8 @@
                <pear minimum_version="1.6.0" recommended_version="1.6.1" />
                <package name="DoctrineCommon" channel="pear.doctrine-project.org" minimum_version="${dependencies.common}" />
                <package name="DoctrineDBAL" channel="pear.doctrine-project.org" minimum_version="${dependencies.dbal}" />
-               <package name="Console" channel="pear.symfony.org" minimum_version="2.0.0" />
-               <package name="Yaml" channel="pear.symfony.org" minimum_version="2.0.0" />
+               <package name="Console" channel="pear.symfony.com" minimum_version="2.0.0" />
+               <package name="Yaml" channel="pear.symfony.com" minimum_version="2.0.0" />
            </dependencies>
            <dirroles key="bin">script</dirroles>
            <ignore>Doctrine/Common/</ignore>

From dcaf1b589170f3332b5dc5fe43f06af5262d9c80 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 20 Dec 2011 22:38:38 +0100
Subject: [PATCH 13/59] Prepare 2.2 beta

---
 build.properties           | 4 ++--
 lib/vendor/doctrine-common | 2 +-
 lib/vendor/doctrine-dbal   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.properties b/build.properties
index 6b45548c0..37c834c0e 100644
--- a/build.properties
+++ b/build.properties
@@ -2,8 +2,8 @@
 project.name=DoctrineORM
 
 # Dependency minimum versions
-dependencies.common=2.1.0
-dependencies.dbal=2.1.0
+dependencies.common=2.2.0beta1
+dependencies.dbal=2.2.0beta1
 dependencies.sfconsole=2.0.0
 
 # Version class and file
diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common
index ef7382756..febecd320 160000
--- a/lib/vendor/doctrine-common
+++ b/lib/vendor/doctrine-common
@@ -1 +1 @@
-Subproject commit ef7382756672d99c92b746aea56f10295edfc96b
+Subproject commit febecd320261d4a49a83b0c51286182cba1fa587
diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal
index 4410e4cec..29b714b7f 160000
--- a/lib/vendor/doctrine-dbal
+++ b/lib/vendor/doctrine-dbal
@@ -1 +1 @@
-Subproject commit 4410e4cec20b0f1f209578320e5b7d111e90c2a0
+Subproject commit 29b714b7fe72641d749ae90324a5759853fe09b0

From 9d906fa31e42ded68837f0230bee0365022a3432 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 20 Dec 2011 22:39:12 +0100
Subject: [PATCH 14/59] Update build common

---
 lib/vendor/doctrine-build-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vendor/doctrine-build-common b/lib/vendor/doctrine-build-common
index 5c43f26f8..5812b7acd 160000
--- a/lib/vendor/doctrine-build-common
+++ b/lib/vendor/doctrine-build-common
@@ -1 +1 @@
-Subproject commit 5c43f26f82bde0234c0645e349fb12a48bd39c7f
+Subproject commit 5812b7acdc962196140e6b9f7a4758fb6d6f4933

From 6136654dad148f914c113ca7e101e0316da18047 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 20 Dec 2011 22:39:27 +0100
Subject: [PATCH 15/59] Release 2.2.0-BETA1

---
 composer.json                | 2 +-
 lib/Doctrine/ORM/Version.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 8f570e200..f3f0852cc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "doctrine/orm",
-    "type": "library",
+    "type": "library","version":"2.2.0-BETA1",
     "description": "Object-Relational-Mapper for PHP",
     "keywords": ["orm", "database"],
     "homepage": "http://www.doctrine-project.org",
diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php
index e8124cd45..6afb373e4 100644
--- a/lib/Doctrine/ORM/Version.php
+++ b/lib/Doctrine/ORM/Version.php
@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.2.0-DEV';
+    const VERSION = '2.2.0-BETA1';
 
     /**
      * Compares a Doctrine version with the current one.

From 0551ccca92d9af634e468c97387626ed0d3f3bae Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 20 Dec 2011 22:39:27 +0100
Subject: [PATCH 16/59] Bump dev version to 2.2.01

---
 composer.json                | 2 +-
 lib/Doctrine/ORM/Version.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index f3f0852cc..8f570e200 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "doctrine/orm",
-    "type": "library","version":"2.2.0-BETA1",
+    "type": "library",
     "description": "Object-Relational-Mapper for PHP",
     "keywords": ["orm", "database"],
     "homepage": "http://www.doctrine-project.org",
diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php
index 6afb373e4..a8bfd4eff 100644
--- a/lib/Doctrine/ORM/Version.php
+++ b/lib/Doctrine/ORM/Version.php
@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.2.0-BETA1';
+    const VERSION = '2.2.01-DEV';
 
     /**
      * Compares a Doctrine version with the current one.

From ca470d8ba765d8b383f735eeef7f66d9560f9965 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Wed, 21 Dec 2011 00:00:43 +0100
Subject: [PATCH 17/59] Fix glitch in Version produced by build-script

---
 lib/Doctrine/ORM/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php
index a8bfd4eff..e8124cd45 100644
--- a/lib/Doctrine/ORM/Version.php
+++ b/lib/Doctrine/ORM/Version.php
@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.2.01-DEV';
+    const VERSION = '2.2.0-DEV';
 
     /**
      * Compares a Doctrine version with the current one.

From b91689fe2fb986fc705431d5f0f05a90eb6341a4 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Wed, 21 Dec 2011 23:57:33 +0100
Subject: [PATCH 18/59] Update common with fix on interface detection

---
 lib/vendor/doctrine-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common
index febecd320..18d11e0a5 160000
--- a/lib/vendor/doctrine-common
+++ b/lib/vendor/doctrine-common
@@ -1 +1 @@
-Subproject commit febecd320261d4a49a83b0c51286182cba1fa587
+Subproject commit 18d11e0a54f8c4e726940a3753e3c2949dbf1c02

From 06de4e62a5314abe06760565454c569370abc2d9 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Thu, 22 Dec 2011 00:08:53 +0100
Subject: [PATCH 19/59] Add 2.2 to travis status icon list

---
 README.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 00458ca04..2c2b3a482 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,7 +1,8 @@
 # Doctrine 2 ORM
 
 Master: [![Build Status](https://secure.travis-ci.org/doctrine/doctrine2.png?branch=master)](http://travis-ci.org/doctrine/doctrine2)
-2.1.x: [![Build Status](https://secure.travis-ci.org/doctrine/doctrine2.png?branch=2.1.x)](http://travis-ci.org/doctrine/doctrine2)
+2.2: [![Build Status](https://secure.travis-ci.org/doctrine/doctrine2.png?branch=2.2)](http://travis-ci.org/doctrine/doctrine2)
+2.1: [![Build Status](https://secure.travis-ci.org/doctrine/doctrine2.png?branch=2.1.x)](http://travis-ci.org/doctrine/doctrine2)
 
 Doctrine 2 is an object-relational mapper (ORM) for PHP 5.3.2+ that provides transparent persistence
 for PHP objects. It sits on top of a powerful database abstraction layer (DBAL). One of its key features

From 62be27b295e2363a455e15f43645c6f180aa491a Mon Sep 17 00:00:00 2001
From: Alexander <iam.asm89@gmail.com>
Date: Wed, 21 Dec 2011 23:56:17 +0100
Subject: [PATCH 20/59] Added tests for ManyToMany associations and lazy
 collection to STI entity

---
 .../ORM/Persisters/ManyToManyPersister.php    | 20 +++--
 .../Tests/Models/Company/CompanyContract.php  |  4 +-
 .../Tests/Models/Company/CompanyEmployee.php  |  7 +-
 .../Models/Company/CompanyFlexContract.php    | 25 +++++-
 .../Tests/Models/Company/CompanyManager.php   |  7 +-
 .../Tests/ORM/Functional/SQLFilterTest.php    | 78 +++++++++++++++++++
 6 files changed, 130 insertions(+), 11 deletions(-)

diff --git a/lib/Doctrine/ORM/Persisters/ManyToManyPersister.php b/lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
index 34498a325..33dab21d1 100644
--- a/lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
+++ b/lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
@@ -192,7 +192,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
      */
     public function count(PersistentCollection $coll)
     {
-        $mapping = $coll->getMapping();
+        $mapping = $filterMapping = $coll->getMapping();
         $class   = $this->_em->getClassMetadata($mapping['sourceEntity']);
         $id      = $this->_em->getUnitOfWork()->getEntityIdentifier($coll->getOwner());
 
@@ -218,7 +218,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
                 : $id[$class->fieldNames[$joinColumns[$joinTableColumn]]];
         }
 
-        list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($mapping);
+        list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($filterMapping);
         if ($filterSql) {
             $whereClauses[] = $filterSql;
         }
@@ -295,7 +295,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
     private function getJoinTableRestrictions(PersistentCollection $coll, $element, $addFilters)
     {
         $uow     = $this->_em->getUnitOfWork();
-        $mapping = $coll->getMapping();
+        $mapping = $filterMapping = $coll->getMapping();
 
         if ( ! $mapping['isOwningSide']) {
             $sourceClass = $this->_em->getClassMetadata($mapping['targetEntity']);
@@ -332,7 +332,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
         }
 
         if ($addFilters) {
-            list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($mapping);
+            list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($filterMapping);
             if ($filterSql) {
                 $quotedJoinTable .= ' t ' . $joinTargetEntitySQL;
                 $whereClauses[] = $filterSql;
@@ -351,13 +351,21 @@ class ManyToManyPersister extends AbstractCollectionPersister
      * have to join in the actual entities table leading to additional
      * JOIN.
      *
-     * @param array $targetEntity Array containing mapping information.
+     * @param array $mapping Array containing mapping information.
      *
      * @return string The SQL query part to add to a query.
      */
     public function getFilterSql($mapping)
     {
         $targetClass = $this->_em->getClassMetadata($mapping['targetEntity']);
+
+        if ($mapping['isOwningSide']) {
+            $joinColumns = $mapping['relationToTargetKeyColumns'];
+        } else {
+            $mapping = $targetClass->associationMappings[$mapping['mappedBy']];
+            $joinColumns = $mapping['relationToSourceKeyColumns'];
+        }
+
         $targetClass = $this->_em->getClassMetadata($targetClass->rootEntityName);
 
         // A join is needed if there is filtering on the target entity
@@ -368,7 +376,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
                 . ' ON';
 
             $joinTargetEntitySQLClauses = array();
-            foreach ($mapping['relationToTargetKeyColumns'] as $joinTableColumn => $targetTableColumn) {
+            foreach ($joinColumns as $joinTableColumn => $targetTableColumn) {
                 $joinTargetEntitySQLClauses[] = ' t.' . $joinTableColumn . ' = ' . 'te.' . $targetTableColumn;
             }
 
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyContract.php b/tests/Doctrine/Tests/Models/Company/CompanyContract.php
index 221bf1cd8..70dd2fcb4 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyContract.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyContract.php
@@ -32,7 +32,7 @@ abstract class CompanyContract
     private $completed = false;
 
     /**
-     * @ManyToMany(targetEntity="CompanyEmployee")
+     * @ManyToMany(targetEntity="CompanyEmployee", inversedBy="contracts")
      * @JoinTable(name="company_contract_employees",
      *    joinColumns={@JoinColumn(name="contract_id", referencedColumnName="id", onDelete="CASCADE")},
      *    inverseJoinColumns={@JoinColumn(name="employee_id", referencedColumnName="id")}
@@ -86,4 +86,4 @@ abstract class CompanyContract
     }
 
     abstract public function calculatePrice();
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyEmployee.php b/tests/Doctrine/Tests/Models/Company/CompanyEmployee.php
index 5e050f948..a9235c321 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyEmployee.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyEmployee.php
@@ -23,6 +23,11 @@ class CompanyEmployee extends CompanyPerson
      */
     private $startDate;
 
+    /**
+     * @ManyToMany(targetEntity="CompanyContract", mappedBy="engineers", fetch="EXTRA_LAZY")
+     */
+    public $contracts;
+
     public function getSalary() {
         return $this->salary;
     }
@@ -46,4 +51,4 @@ class CompanyEmployee extends CompanyPerson
     public function setStartDate($date) {
         $this->startDate = $date;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php b/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php
index 11f966f17..976506d7c 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php
@@ -18,6 +18,15 @@ class CompanyFlexContract extends CompanyContract
      */
     private $pricePerHour = 0;
 
+    /**
+     * @ManyToMany(targetEntity="CompanyManager", inversedBy="managedContracts")
+     * @JoinTable(name="company_contract_managers",
+     *    joinColumns={@JoinColumn(name="contract_id", referencedColumnName="id", onDelete="CASCADE")},
+     *    inverseJoinColumns={@JoinColumn(name="employee_id", referencedColumnName="id")}
+     * )
+     */
+    private $managers;
+
     public function calculatePrice()
     {
         return $this->hoursWorked * $this->pricePerHour;
@@ -42,4 +51,18 @@ class CompanyFlexContract extends CompanyContract
     {
         $this->pricePerHour = $pricePerHour;
     }
-}
\ No newline at end of file
+    public function getManagers()
+    {
+        return $this->managers;
+    }
+
+    public function addManager(CompanyManager $manager)
+    {
+        $this->managers[] = $manager;
+    }
+
+    public function removeManager(CompanyManager $manager)
+    {
+        $this->managers->removeElement($manager);
+    }
+}
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyManager.php b/tests/Doctrine/Tests/Models/Company/CompanyManager.php
index e0d39dfcf..aec9a77ae 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyManager.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyManager.php
@@ -19,6 +19,11 @@ class CompanyManager extends CompanyEmployee
      */
     private $car;
 
+    /**
+     * @ManyToMany(targetEntity="CompanyFlexContract", mappedBy="managers", fetch="EXTRA_LAZY")
+     */
+    public $managedContracts;
+
     public function getTitle() {
         return $this->title;
     }
@@ -34,4 +39,4 @@ class CompanyManager extends CompanyEmployee
     public function setCar(CompanyCar $car) {
         $this->car = $car;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
index 98b3fafd4..6444877d0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
@@ -34,6 +34,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     private $userId, $userId2, $articleId, $articleId2;
     private $groupId, $groupId2;
+    private $managerId, $contractId1, $contractId2;
 
     public function setUp()
     {
@@ -655,12 +656,89 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $contract4 = new CompanyFlexContract;
         $contract4->markCompleted();
 
+        $manager = new CompanyManager;
+        $manager->setName('Alexander');
+        $manager->setSalary(42);
+        $manager->setDepartment('Doctrine');
+        $manager->setTitle('Filterer');
+
+        $contract1->addManager($manager);
+        $contract2->addManager($manager);
+        $contract3->addManager($manager);
+        $contract4->addManager($manager);
+
+        $this->_em->persist($manager);
         $this->_em->persist($contract1);
         $this->_em->persist($contract2);
         $this->_em->persist($contract3);
         $this->_em->persist($contract4);
         $this->_em->flush();
         $this->_em->clear();
+
+        $this->managerId = $manager->getId();
+        $this->contractId1 = $contract1->getId();
+        $this->contractId2 = $contract2->getId();
+    }
+
+    private function useCompletedContractFilter()
+    {
+        $conf = $this->_em->getConfiguration();
+        $conf->addFilter("completed_contract", "\Doctrine\Tests\ORM\Functional\CompletedContractFilter");
+        $this->_em->getFilters()
+            ->enable("completed_contract")
+            ->setParameter("completed", true, DBALType::BOOLEAN);
+    }
+
+    public function testManyToMany_ExtraLazyCountWithFilterOnSTI()
+    {
+        $this->loadCompanySingleTableInheritanceFixtureData();
+
+        $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId);
+
+        $this->assertFalse($manager->managedContracts->isInitialized());
+        $this->assertEquals(4, count($manager->managedContracts));
+
+        // Enable the filter
+        $this->useCompletedContractFilter();
+
+        $this->assertFalse($manager->managedContracts->isInitialized());
+        $this->assertEquals(2, count($manager->managedContracts));
+    }
+
+    public function testManyToMany_ExtraLazyContainsWithFilterOnSTI()
+    {
+        $this->loadCompanySingleTableInheritanceFixtureData();
+
+        $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId);
+        $contract1 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->contractId1);
+        $contract2 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->contractId2);
+
+        $this->assertFalse($manager->managedContracts->isInitialized());
+        $this->assertTrue($manager->managedContracts->contains($contract1));
+        $this->assertTrue($manager->managedContracts->contains($contract2));
+
+        // Enable the filter
+        $this->useCompletedContractFilter();
+
+        $this->assertFalse($manager->managedContracts->isInitialized());
+        $this->assertFalse($manager->managedContracts->contains($contract1));
+        $this->assertTrue($manager->managedContracts->contains($contract2));
+    }
+
+    public function testManyToMany_ExtraLazySliceWithFilterOnSTI()
+    {
+        $this->loadCompanySingleTableInheritanceFixtureData();
+
+        $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId);
+
+        $this->assertFalse($manager->managedContracts->isInitialized());
+        $this->assertEquals(4, count($manager->managedContracts->slice(0, 10)));
+
+        // Enable the filter
+        $this->useCompletedContractFilter();
+
+        $this->assertFalse($manager->managedContracts->isInitialized());
+        $this->assertEquals(2, count($manager->managedContracts->slice(0, 10)));
     }
 }
 

From 177adbdfc74581dcb297a2f902580b400916358f Mon Sep 17 00:00:00 2001
From: holtkamp <menno.holtkamp@gmail.com>
Date: Thu, 22 Dec 2011 09:38:55 -0200
Subject: [PATCH 21/59] Allow ExporterDrivers that implement the
 exportClassMetadata() function to return FALSE when no content is
 available/needs to be written to a file by the AbstractExporter, preventing
 empty files to be generated foreach processed ClassMetadataInfo instance.

---
 .../Tools/Export/Driver/AbstractExporter.php  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
index 14f654130..41ec6fdf6 100644
--- a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
+++ b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
@@ -111,16 +111,18 @@ abstract class AbstractExporter
         }
 
         foreach ($this->_metadata as $metadata) {
-            $output = $this->exportClassMetadata($metadata);
-            $path = $this->_generateOutputPath($metadata);
-            $dir = dirname($path);
-            if ( ! is_dir($dir)) {
-                mkdir($dir, 0777, true);
+            //In case output is returned, write it to a file, skip otherwise
+            if($output = $this->exportClassMetadata($metadata)){
+                $path = $this->_generateOutputPath($metadata);
+                $dir = dirname($path);
+                if ( ! is_dir($dir)) {
+                    mkdir($dir, 0777, true);
+                }
+                if (file_exists($path) && !$this->_overwriteExistingFiles) {
+                    throw ExportException::attemptOverwriteExistingFile($path);
+                }
+                file_put_contents($path, $output);
             }
-            if (file_exists($path) && !$this->_overwriteExistingFiles) {
-                throw ExportException::attemptOverwriteExistingFile($path);
-            }
-            file_put_contents($path, $output);
         }
     }
 

From c2cee0d6ebcc41a303b7f91a02a06d8cc00f2752 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Thu, 22 Dec 2011 11:05:11 -0200
Subject: [PATCH 22/59] error messages

---
 lib/Doctrine/ORM/EntityManager.php               | 10 +++++-----
 lib/Doctrine/ORM/ORMInvalidArgumentException.php |  6 ++++++
 tests/Doctrine/Tests/ORM/EntityManagerTest.php   |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php
index ab3e4c7ee..18f457bc9 100644
--- a/lib/Doctrine/ORM/EntityManager.php
+++ b/lib/Doctrine/ORM/EntityManager.php
@@ -488,7 +488,7 @@ class EntityManager implements ObjectManager
     public function persist($entity)
     {
         if ( ! is_object($entity)) {
-            throw new \InvalidArgumentException(gettype($entity));
+            throw ORMInvalidArgumentException::invalidObject('EntityManager#persist()' , $entity);
         }
 
         $this->errorIfClosed();
@@ -507,7 +507,7 @@ class EntityManager implements ObjectManager
     public function remove($entity)
     {
         if ( ! is_object($entity)) {
-            throw new \InvalidArgumentException(gettype($entity));
+            throw ORMInvalidArgumentException::invalidObject('EntityManager#remove()' , $entity);
         }
 
         $this->errorIfClosed();
@@ -524,7 +524,7 @@ class EntityManager implements ObjectManager
     public function refresh($entity)
     {
         if ( ! is_object($entity)) {
-            throw new \InvalidArgumentException(gettype($entity));
+            throw ORMInvalidArgumentException::invalidObject('EntityManager#refresh()' , $entity);
         }
 
         $this->errorIfClosed();
@@ -544,7 +544,7 @@ class EntityManager implements ObjectManager
     public function detach($entity)
     {
         if ( ! is_object($entity)) {
-            throw new \InvalidArgumentException(gettype($entity));
+            throw ORMInvalidArgumentException::invalidObject('EntityManager#detach()' , $entity);
         }
 
         $this->unitOfWork->detach($entity);
@@ -561,7 +561,7 @@ class EntityManager implements ObjectManager
     public function merge($entity)
     {
         if ( ! is_object($entity)) {
-            throw new \InvalidArgumentException(gettype($entity));
+            throw ORMInvalidArgumentException::invalidObject('EntityManager#merge()' , $entity);
         }
 
         $this->errorIfClosed();
diff --git a/lib/Doctrine/ORM/ORMInvalidArgumentException.php b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
index 878ee4b71..87039b411 100644
--- a/lib/Doctrine/ORM/ORMInvalidArgumentException.php
+++ b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
@@ -94,6 +94,12 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
         throw new self("A detached entity was found during " . $operation . " " . self::objToStr($entity));
     }
 
+    public static function invalidObject($context, $given, $parameterIndex = 1)
+    {
+        return new self($context .' expects parameter ' . $parameterIndex . 
+                    ' to be an entity object, '. gettype($given) . ' given.');
+    }
+
     /**
      * Helper method to show an object as string.
      *
diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php
index 5f1578153..4c4787763 100644
--- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php
+++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php
@@ -114,10 +114,10 @@ class EntityManagerTest extends \Doctrine\Tests\OrmTestCase
 
     /**
      * @dataProvider dataMethodsAffectedByNoObjectArguments
-     * @expectedException \InvalidArgumentException
-     * @param string $methodName
      */
     public function testThrowsExceptionOnNonObjectValues($methodName) {
+        $this->setExpectedException('Doctrine\ORM\ORMInvalidArgumentException',
+            'EntityManager#'.$methodName.'() expects parameter 1 to be an entity object, NULL given.');
         $this->_em->$methodName(null);
     }
 

From 909dbdf29d1153c3abe1f7962e36a89c6dc348a6 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Thu, 22 Dec 2011 12:07:18 -0200
Subject: [PATCH 23/59] default NamingStrategy

---
 lib/Doctrine/ORM/DefaultNamingStrategy.php    | 113 ++++++++++++++++
 lib/Doctrine/ORM/NamingStrategy.php           | 121 ++++++++++++++++++
 .../Doctrine/Tests/ORM/NamingStrategyTest.php |  20 +++
 3 files changed, 254 insertions(+)
 create mode 100644 lib/Doctrine/ORM/DefaultNamingStrategy.php
 create mode 100644 lib/Doctrine/ORM/NamingStrategy.php
 create mode 100644 tests/Doctrine/Tests/ORM/NamingStrategyTest.php

diff --git a/lib/Doctrine/ORM/DefaultNamingStrategy.php b/lib/Doctrine/ORM/DefaultNamingStrategy.php
new file mode 100644
index 000000000..7e712a3bb
--- /dev/null
+++ b/lib/Doctrine/ORM/DefaultNamingStrategy.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM;
+
+/**
+ * The default NamingStrategy
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.3
+ * @author  Fabio B. Silva <fabio.bat.silva@gmail.com>
+ */
+class DefaultNamingStrategy implements NamingStrategy
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function classToTableName($className)
+    {
+        return $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function propertyToColumnName($propertyName)
+    {
+        return $propertyName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function tableName($tableName)
+    {
+        return $tableName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function columnName($columnName)
+    {
+        return $columnName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function collectionTableName($ownerEntity, $ownerEntityTable, $associatedEntity, $associatedEntityTable, $propertyName)
+    {
+        return $propertyName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function joinKeyColumnName($joinedColumn, $joinedTable)
+    {
+        return $joinedColumn;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function foreignKeyColumnName($propertyName, $propertyEntityName, $propertyTableName, $referencedColumnName)
+    {
+        return $propertyName ?: $propertyTableName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logicalColumnName($columnName, $propertyName)
+    {
+        return $columnName ?: $propertyName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logicalCollectionTableName($tableName, $ownerEntityTable, $associatedEntityTable, $propertyName)
+    {
+        return $ownerEntityTable . '_' . ( $associatedEntityTable ?: $propertyName );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logicalCollectionColumnName($columnName, $propertyName, $referencedColumn)
+    {
+        return $columnName ?: ($propertyName . '_' . $referencedColumn);
+    }
+}
diff --git a/lib/Doctrine/ORM/NamingStrategy.php b/lib/Doctrine/ORM/NamingStrategy.php
new file mode 100644
index 000000000..ff72be46f
--- /dev/null
+++ b/lib/Doctrine/ORM/NamingStrategy.php
@@ -0,0 +1,121 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM;
+
+/**
+ * A set of rules for determining the physical column and table names
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.3
+ * @author  Fabio B. Silva <fabio.bat.silva@gmail.com>
+ */
+interface NamingStrategy
+{
+
+    /**
+     * Return a table name for an entity class
+     *
+     * @param   string  $className  The fully-qualified class name
+     * @return  string              A table name
+     */
+    function classToTableName($className);
+
+    /**
+     * Return a column name for a property path expression
+     *
+     * @param   string  $propertyName   A property path
+     * @return  string                  A column name
+     */
+    function propertyToColumnName($propertyName);
+
+    /**
+     * Alter the table name given in the mapping document
+     *
+     * @param   string  tableName   A table name
+     * @return  string              A table name
+     */
+    function tableName($tableName);
+
+    /**
+     * Alter the column name given in the mapping document
+     * 
+     * @param   string $columnName  A column name
+     * @return  string              A column name
+     */
+    function columnName($columnName);
+
+    /**
+     * Return a collection table name ie an association having a join table
+     *
+     * @param string   $ownerEntity
+     * @param string   $ownerEntityTable        Owner side table name
+     * @param string   $associatedEntity
+     * @param string   $associatedEntityTable   Reverse side table name if any
+     * @param string   $propertyName            Collection role
+     */
+    function collectionTableName($ownerEntity, $ownerEntityTable, $associatedEntity, $associatedEntityTable, $propertyName);
+
+    /**
+     * Return the join key column name ie a FK column used in a JOINED strategy or for a secondary table
+     *
+     * @param string   $joinedColumn    Joined column name used to join with
+     * @param string   $joinedTable     Joined table name used to join with
+     */
+    function joinKeyColumnName($joinedColumn, $joinedTable);
+
+    /**
+     * Return the foreign key column name for the given parameters
+     *
+     * @param string   $propertyName            The property name involved
+     * @param string   $propertyEntityName
+     * @param string   $propertyTableName       The property table name involved (logical one)
+     * @param string   $referencedColumnName    The referenced column name involved (logical one)
+     */
+    function foreignKeyColumnName($propertyName, $propertyEntityName, $propertyTableName, $referencedColumnName);
+
+    /**
+     * Return the logical column name used to refer to a column in the metadata
+     *
+     * @param string   $columnName      Given column name if any
+     * @param string   $propertyName    Property name of this column
+     */
+    function logicalColumnName($columnName, $propertyName);
+
+    /**
+     * Returns the logical collection table name used to refer to a table in the mapping metadata
+     *
+     * @param string   $tableName               The metadata explicit name
+     * @param string   $ownerEntityTable        Owner table entity table name (logical one)
+     * @param string   $associatedEntityTable   Reverse side table name if any (logical one)
+     * @param string   $propertyName            Collection role
+     */
+    function logicalCollectionTableName($tableName, $ownerEntityTable, $associatedEntityTable, $propertyName);
+
+    /**
+     * Returns the logical foreign key column name used to refer to this column in the mapping metadata
+     *
+     * @param string   $columnName          Given column name in the metadata if any
+     * @param string   $propertyName        Property name
+     * @param string   $referencedColumn    Referenced column name in the join
+     */
+    function logicalCollectionColumnName($columnName, $propertyName, $referencedColumn);
+}
diff --git a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
new file mode 100644
index 000000000..9bfa9afba
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Doctrine\Tests\ORM;
+
+use Doctrine\ORM\DefaultNamingStrategy;
+
+require_once __DIR__ . '/../TestInit.php';
+
+/**
+ * @group DDC-559
+ */
+class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
+{
+    public function testDefaultNamingStrategy()
+    {
+       $strategy = new \Doctrine\ORM\DefaultNamingStrategy();
+
+       $this->assertEquals('ShortClassName', $strategy->classToTableName('ShortClassName'));
+    }
+}
\ No newline at end of file

From a038e6cbad59b034840aeaa5b380843da37c3582 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Thu, 22 Dec 2011 14:07:58 -0200
Subject: [PATCH 24/59] test case

---
 .../Doctrine/Tests/ORM/NamingStrategyTest.php | 388 +++++++++++++++++-
 1 file changed, 384 insertions(+), 4 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
index 9bfa9afba..08b8c1b51 100644
--- a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
@@ -3,6 +3,7 @@
 namespace Doctrine\Tests\ORM;
 
 use Doctrine\ORM\DefaultNamingStrategy;
+use Doctrine\ORM\NamingStrategy;
 
 require_once __DIR__ . '/../TestInit.php';
 
@@ -11,10 +12,389 @@ require_once __DIR__ . '/../TestInit.php';
  */
 class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
 {
-    public function testDefaultNamingStrategy()
+    /**
+     * @var DefaultNamingStrategy
+     */
+    private static $defaultNamingStrategy;
+    
+    /**
+     * @return DefaultNamingStrategy
+     */
+    static private function defaultNaming()
     {
-       $strategy = new \Doctrine\ORM\DefaultNamingStrategy();
-
-       $this->assertEquals('ShortClassName', $strategy->classToTableName('ShortClassName'));
+        if (self::$defaultNamingStrategy == null) {
+           self::$defaultNamingStrategy = new DefaultNamingStrategy();
+        }
+        return self::$defaultNamingStrategy;
     }
+
+    /**
+     * Data Provider for NamingStrategy#classToTableName
+     *
+     * @return array
+     */
+    static public function dataClassToTableName()
+    {
+        return array(
+            array(self::defaultNaming(), 'SomeClassName',
+                'SomeClassName'
+            ),
+            array(self::defaultNaming(), 'SOME_CLASS_NAME',
+                'SOME_CLASS_NAME'
+            ),
+            array(self::defaultNaming(), 'some_class_name',
+                'some_class_name'
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider dataClassToTableName
+     */
+    public function testClassToTableName(NamingStrategy $strategy, $className, $expected)
+    {
+        $this->assertEquals($expected, $strategy->classToTableName($className));
+    }
+
+    /**
+     * Data Provider for NamingStrategy#propertyToColumnName
+     * 
+     * @return array
+     */
+    static public function dataPropertyToColumnName()
+    {
+        return array(
+            array(self::defaultNaming(), 'someProperty',
+                'someProperty'
+            ),
+            array(self::defaultNaming(), 'SOME_PROPERTY',
+                'SOME_PROPERTY'
+            ),
+            array(self::defaultNaming(), 'some_property',
+                'some_property'
+            ),
+        );
+    }
+    
+    /**
+     * @dataProvider dataPropertyToColumnName
+     *
+     * @param NamingStrategy    $strategy
+     * @param string            $expected
+     * @param string            $propertyName
+     */
+    public function testPropertyToColumnName(NamingStrategy $strategy, $expected, $propertyName)
+    {
+        $this->assertEquals($expected, $strategy->propertyToColumnName($propertyName));
+    }
+
+    /**
+     * Data Provider for NamingStrategy#tableName
+     *
+     * @return array
+     */
+    static public function dataTableName()
+    {
+        return array(
+            array(self::defaultNaming(), 'someTable',
+                'someTable'
+            ),
+            array(self::defaultNaming(), 'SOME_TABLE',
+                'SOME_TABLE'
+            ),
+            array(self::defaultNaming(), 'some_table',
+                'some_table'
+            ),
+        );
+    }
+    
+    /**
+     * @dataProvider dataTableName
+     * 
+     * @param NamingStrategy    $strategy
+     * @param string            $expected
+     * @param string            $tableName
+     */
+    public function testTableName(NamingStrategy $strategy, $expected, $tableName)
+    {
+        $this->assertEquals($expected, $strategy->tableName($tableName));
+    }
+
+    /**
+     * Data Provider for NamingStrategy#columnName
+     *
+     * @return array
+     */
+    static public function dataColumnName()
+    {
+        return array(
+            array(self::defaultNaming(), 'someColumn',
+                'someColumn'
+            ),
+            array(self::defaultNaming(), 'SOME_COLUMN',
+                'SOME_COLUMN'
+            ),
+            array(self::defaultNaming(), 'some_column',
+                'some_column'
+            ),
+        );
+    }
+    
+    /**
+     * @dataProvider dataColumnName
+     * 
+     * @param NamingStrategy    $strategy
+     * @param string            $expected
+     * @param string            $columnName
+     */
+    public function testColumnName(NamingStrategy $strategy, $expected, $columnName)
+    {
+        $this->assertEquals($expected, $strategy->columnName($columnName));
+    }
+
+    /**
+     * Data Provider for NamingStrategy#collectionTableName
+     *
+     * @return array
+     */
+    static public function dataCollectionTableName()
+    {
+        return array(
+            array(self::defaultNaming(), 'someColumn',
+                null, null, null, null, 'someColumn',
+            ),
+            array(self::defaultNaming(), 'SOME_COLUMN',
+                null, null, null, null, 'SOME_COLUMN'
+            ),
+            array(self::defaultNaming(), 'some_column',
+                null, null, null, null, 'some_column'
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider dataCollectionTableName
+     *
+     * @param NamingStrategy    $strategy
+     * @param string            $expected
+     * @param string            $ownerEntity
+     * @param string            $ownerEntityTable
+     * @param string            $associatedEntity
+     * @param string            $associatedEntityTable
+     * @param string            $propertyName
+     */
+    public function testCollectionTableName(NamingStrategy $strategy, $expected, $ownerEntity, $ownerEntityTable, $associatedEntity, $associatedEntityTable, $propertyName)
+    {
+        $this->assertEquals($expected, $strategy->collectionTableName($ownerEntity, $ownerEntityTable, $associatedEntity, $associatedEntityTable, $propertyName));
+    }
+
+    /**
+     * Data Provider for NamingStrategy#joinKeyColumnName
+     *
+     * @return array
+     */
+    static public function dataJoinKeyColumnName()
+    {
+        return array(
+            array(self::defaultNaming(), 'someColumn',
+                'someColumn', null,
+            ),
+            array(self::defaultNaming(), 'SOME_COLUMN',
+                'SOME_COLUMN', null,
+            ),
+            array(self::defaultNaming(), 'some_column',
+                'some_column', null,
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider dataJoinKeyColumnName
+     *
+     * @param NamingStrategy    $strategy
+     * @param string            $expected
+     * @param string            $joinedColumn
+     * @param string            $joinedTable
+     */
+    public function testJoinKeyColumnName(NamingStrategy $strategy, $expected, $joinedColumn, $joinedTable)
+    {
+        $this->assertEquals($expected, $strategy->joinKeyColumnName($joinedColumn, $joinedTable));
+    }
+
+    /**
+     * Data Provider for NamingStrategy#foreignKeyColumnName
+     *
+     * @return array
+     */
+    static public function dataForeignKeyColumnName()
+    {
+        return array(
+            array(self::defaultNaming(), 'someColumn',
+                'someColumn', null, null, null,
+            ),
+            array(self::defaultNaming(), 'SOME_COLUMN',
+                'SOME_COLUMN', null, null, null,
+            ),
+            array(self::defaultNaming(), 'some_column',
+                'some_column', null, null, null,
+            ),
+
+            array(self::defaultNaming(), 'someColumn',
+                null, null, 'someColumn', null,
+            ),
+            array(self::defaultNaming(), 'SOME_COLUMN',
+                null, null, 'SOME_COLUMN', null,
+            ),
+            array(self::defaultNaming(), 'some_column',
+                null, null, 'some_column', null,
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider dataForeignKeyColumnName
+     *
+     * @param NamingStrategy    $strategy
+     * @param string            $propertyName
+     * @param string            $propertyEntityName
+     * @param string            $propertyTableName
+     * @param string            $referencedColumnName
+     */
+    public function testForeignKeyColumnName(NamingStrategy $strategy, $expected, $propertyName, $propertyEntityName, $propertyTableName, $referencedColumnName)
+    {
+        $this->assertEquals($expected, $strategy->foreignKeyColumnName($propertyName, $propertyEntityName, $propertyTableName, $referencedColumnName));
+    }
+
+    /**
+     * Data Provider for NamingStrategy#logicalColumnName
+     *
+     * @return array
+     */
+    static public function dataLogicalColumnName()
+    {
+        return array(
+            array(self::defaultNaming(), 'someColumn',
+                'someColumn', null,
+            ),
+            array(self::defaultNaming(), 'SOME_COLUMN',
+                'SOME_COLUMN', null,
+            ),
+            array(self::defaultNaming(), 'some_column',
+                'some_column', null,
+            ),
+
+            array(self::defaultNaming(), 'someColumn',
+                null, 'someColumn',
+            ),
+            array(self::defaultNaming(), 'SOME_COLUMN',
+                null, 'SOME_COLUMN',
+            ),
+            array(self::defaultNaming(), 'some_column',
+                null, 'some_column',
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider dataLogicalColumnName
+     *
+     * @param NamingStrategy    $strategy
+     * @param string            $columnName
+     * @param string            $propertyName
+     */
+    public function testLogicalColumnName(NamingStrategy $strategy, $expected, $columnName, $propertyName)
+    {
+        $this->assertEquals($expected, $strategy->logicalColumnName($columnName, $propertyName));
+    }
+
+
+    /**
+     * Data Provider for NamingStrategy#logicalCollectionTableName
+     *
+     * @return array
+     */
+    static public function dataLogicalCollectionTableName()
+    {
+        return array(
+            array(self::defaultNaming(), 'SomeClassName_SomeAssocClassName',
+                null, 'SomeClassName', 'SomeAssocClassName', null
+            ),
+            array(self::defaultNaming(), 'SOME_CLASS_NAME_SOME_ASSOC_CLASS_NAME',
+                null, 'SOME_CLASS_NAME', 'SOME_ASSOC_CLASS_NAME', null
+            ),
+            array(self::defaultNaming(), 'some_class_name_some_assoc_class_name',
+                null, 'some_class_name', 'some_assoc_class_name', null
+            ),
+
+            array(self::defaultNaming(), 'SomeClassName_someProperty',
+                null, 'SomeClassName', null, 'someProperty',
+            ),
+            array(self::defaultNaming(), 'SOME_CLASS_NAME_SOME_PROPERTY',
+                null, 'SOME_CLASS_NAME', null, 'SOME_PROPERTY',
+            ),
+            array(self::defaultNaming(), 'some_class_name_some_property',
+                null, 'some_class_name', null, 'some_property',
+            ),
+
+        );
+    }
+
+    /**
+     * @dataProvider dataLogicalCollectionTableName
+     *
+     * @param NamingStrategy    $strategy
+     * @param string            $tableName
+     * @param string            $ownerEntityTable
+     * @param string            $associatedEntityTable
+     * @param string            $propertyName
+     */
+    public function testLogicalCollectionTableName(NamingStrategy $strategy, $expected, $tableName, $ownerEntityTable, $associatedEntityTable, $propertyName)
+    {
+        $this->assertEquals($expected, $strategy->logicalCollectionTableName($tableName, $ownerEntityTable, $associatedEntityTable, $propertyName));
+    }
+
+    /**
+     * Data Provider for NamingStrategy#logicalCollectionColumnName
+     *
+     * @return array
+     */
+    static public function dataLogicalCollectionColumnName()
+    {
+        return array(
+            array(self::defaultNaming(), 'someColumn',
+                'someColumn', null, null,
+            ),
+            array(self::defaultNaming(), 'SOME_COLUMN',
+                'SOME_COLUMN', null, null,
+            ),
+            array(self::defaultNaming(), 'some_column',
+                'some_column', null, null,
+            ),
+
+            array(self::defaultNaming(), 'someColumn',
+                'someColumn', 'some', 'Column',
+            ),
+            array(self::defaultNaming(), 'SOME_COLUMN',
+                'SOME_COLUMN', 'SOME', 'COLUMN',
+            ),
+            array(self::defaultNaming(), 'some_column',
+                'some_column', 'some', 'column',
+            ),
+
+        );
+    }
+
+    /**
+     * @dataProvider dataLogicalCollectionColumnName
+     *
+     * @param NamingStrategy    $strategy
+     * @param string            $columnName
+     * @param string            $propertyName
+     * @param string            $referencedColumn
+     */
+    public function testLogicalCollectionColumnName(NamingStrategy $strategy, $expected, $columnName, $propertyName, $referencedColumn)
+    {
+        $this->assertEquals($expected, $strategy->logicalCollectionColumnName($columnName, $propertyName, $referencedColumn));
+    }
+
 }
\ No newline at end of file

From 223c47069eb0f8cfc3d0f7c6cc96780295def8a6 Mon Sep 17 00:00:00 2001
From: Alexander <iam.asm89@gmail.com>
Date: Thu, 22 Dec 2011 00:19:35 +0100
Subject: [PATCH 25/59] Added tests for ManyToMany associations and lazy
 collection to CTI entity

---
 .../Models/Company/CompanyFlexContract.php    |  4 +-
 .../Tests/ORM/Functional/SQLFilterTest.php    | 86 ++++++++++++++++---
 .../Doctrine/Tests/OrmFunctionalTestCase.php  |  1 +
 3 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php b/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php
index 976506d7c..e32288897 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php
@@ -19,13 +19,13 @@ class CompanyFlexContract extends CompanyContract
     private $pricePerHour = 0;
 
     /**
-     * @ManyToMany(targetEntity="CompanyManager", inversedBy="managedContracts")
+     * @ManyToMany(targetEntity="CompanyManager", inversedBy="managedContracts", fetch="EXTRA_LAZY")
      * @JoinTable(name="company_contract_managers",
      *    joinColumns={@JoinColumn(name="contract_id", referencedColumnName="id", onDelete="CASCADE")},
      *    inverseJoinColumns={@JoinColumn(name="employee_id", referencedColumnName="id")}
      * )
      */
-    private $managers;
+    public $managers;
 
     public function calculatePrice()
     {
diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
index 6444877d0..403bf3a04 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
@@ -34,7 +34,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     private $userId, $userId2, $articleId, $articleId2;
     private $groupId, $groupId2;
-    private $managerId, $contractId1, $contractId2;
+    private $managerId, $managerId2, $contractId1, $contractId2;
 
     public function setUp()
     {
@@ -553,11 +553,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals(2, count($this->_em->createQuery("SELECT cm FROM Doctrine\Tests\Models\Company\CompanyManager cm")->getResult()));
 
         // Enable the filter
-        $conf = $this->_em->getConfiguration();
-        $conf->addFilter("person_name", "\Doctrine\Tests\ORM\Functional\CompanyPersonNameFilter");
-        $this->_em->getFilters()
-            ->enable("person_name")
-            ->setParameter("name", "Guilh%", DBALType::STRING);
+        $this->usePersonNameFilter('Guilh%');
 
         $managers = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyManager')->findAll();
         $this->assertEquals(1, count($managers));
@@ -573,11 +569,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals(3, count($this->_em->createQuery("SELECT cp FROM Doctrine\Tests\Models\Company\CompanyPerson cp")->getResult()));
 
         // Enable the filter
-        $conf = $this->_em->getConfiguration();
-        $conf->addFilter("person_name", "\Doctrine\Tests\ORM\Functional\CompanyPersonNameFilter");
-        $this->_em->getFilters()
-            ->enable("person_name")
-            ->setParameter("name", "Guilh%", DBALType::STRING);
+        $this->usePersonNameFilter('Guilh%');
 
         $persons = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyPerson')->findAll();
         $this->assertEquals(1, count($persons));
@@ -662,12 +654,21 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $manager->setDepartment('Doctrine');
         $manager->setTitle('Filterer');
 
+        $manager2 = new CompanyManager;
+        $manager2->setName('Benjamin');
+        $manager2->setSalary(1337);
+        $manager2->setDepartment('Doctrine');
+        $manager2->setTitle('Maintainer');
+
         $contract1->addManager($manager);
         $contract2->addManager($manager);
         $contract3->addManager($manager);
         $contract4->addManager($manager);
 
+        $contract1->addManager($manager2);
+
         $this->_em->persist($manager);
+        $this->_em->persist($manager2);
         $this->_em->persist($contract1);
         $this->_em->persist($contract2);
         $this->_em->persist($contract3);
@@ -676,6 +677,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->clear();
 
         $this->managerId = $manager->getId();
+        $this->managerId2 = $manager2->getId();
         $this->contractId1 = $contract1->getId();
         $this->contractId2 = $contract2->getId();
     }
@@ -740,6 +742,68 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertFalse($manager->managedContracts->isInitialized());
         $this->assertEquals(2, count($manager->managedContracts->slice(0, 10)));
     }
+
+    private function usePersonNameFilter($name)
+    {
+        // Enable the filter
+        $conf = $this->_em->getConfiguration();
+        $conf->addFilter("person_name", "\Doctrine\Tests\ORM\Functional\CompanyPersonNameFilter");
+        $this->_em->getFilters()
+            ->enable("person_name")
+            ->setParameter("name", $name, DBALType::STRING);
+    }
+
+    public function testManyToMany_ExtraLazyCountWithFilterOnCTI()
+    {
+        $this->loadCompanySingleTableInheritanceFixtureData();
+
+        $contract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyFlexUltraContract', $this->contractId1);
+
+        $this->assertFalse($contract->managers->isInitialized());
+        $this->assertEquals(2, count($contract->managers));
+
+        // Enable the filter
+        $this->usePersonNameFilter('Benjamin');
+
+        $this->assertFalse($contract->managers->isInitialized());
+        $this->assertEquals(1, count($contract->managers));
+    }
+
+    public function testManyToMany_ExtraLazyContainsWithFilterOnCTI()
+    {
+        $this->loadCompanySingleTableInheritanceFixtureData();
+
+        $contract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyFlexUltraContract', $this->contractId1);
+        $manager1 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId);
+        $manager2 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId2);
+
+        $this->assertFalse($contract->managers->isInitialized());
+        $this->assertTrue($contract->managers->contains($manager1));
+        $this->assertTrue($contract->managers->contains($manager2));
+
+        // Enable the filter
+        $this->usePersonNameFilter('Benjamin');
+
+        $this->assertFalse($contract->managers->isInitialized());
+        $this->assertFalse($contract->managers->contains($manager1));
+        $this->assertTrue($contract->managers->contains($manager2));
+    }
+
+    public function testManyToMany_ExtraLazySliceWithFilterOnCTI()
+    {
+        $this->loadCompanySingleTableInheritanceFixtureData();
+
+        $contract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyFlexUltraContract', $this->contractId1);
+
+        $this->assertFalse($contract->managers->isInitialized());
+        $this->assertEquals(2, count($contract->managers->slice(0, 10)));
+
+        // Enable the filter
+        $this->usePersonNameFilter('Benjamin');
+
+        $this->assertFalse($contract->managers->isInitialized());
+        $this->assertEquals(1, count($contract->managers->slice(0, 10)));
+    }
 }
 
 class MySoftDeleteFilter extends SQLFilter
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index ba54da95c..2d405e785 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -158,6 +158,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
 
         if (isset($this->_usedModelSets['company'])) {
             $conn->executeUpdate('DELETE FROM company_contract_employees');
+            $conn->executeUpdate('DELETE FROM company_contract_managers');
             $conn->executeUpdate('DELETE FROM company_contracts');
             $conn->executeUpdate('DELETE FROM company_persons_friends');
             $conn->executeUpdate('DELETE FROM company_managers');

From f49a4e9c40fbf3d0e7e3f13a078987ce490eef5a Mon Sep 17 00:00:00 2001
From: Alexander <iam.asm89@gmail.com>
Date: Thu, 22 Dec 2011 20:50:57 +0100
Subject: [PATCH 26/59] Added tests for OneToMany associations and lazy
 collection to STI entity

---
 .../ORM/Persisters/OneToManyPersister.php     |  3 +-
 .../Tests/Models/Company/CompanyContract.php  |  2 +-
 .../Tests/Models/Company/CompanyEmployee.php  |  5 ++
 .../Tests/ORM/Functional/SQLFilterTest.php    | 56 +++++++++++++++++++
 4 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/Persisters/OneToManyPersister.php b/lib/Doctrine/ORM/Persisters/OneToManyPersister.php
index c4efd8c2e..1a277613d 100644
--- a/lib/Doctrine/ORM/Persisters/OneToManyPersister.php
+++ b/lib/Doctrine/ORM/Persisters/OneToManyPersister.php
@@ -119,8 +119,9 @@ class OneToManyPersister extends AbstractCollectionPersister
                 : $id[$sourceClass->fieldNames[$joinColumn['referencedColumnName']]];
         }
 
+        $filterTargetClass = $this->_em->getClassMetadata($targetClass->rootEntityName);
         foreach ($this->_em->getFilters()->getEnabledFilters() as $filter) {
-            if ($filterExpr = $filter->addFilterConstraint($targetClass, 't')) {
+            if ($filterExpr = $filter->addFilterConstraint($filterTargetClass, 't')) {
                 $whereClauses[] = '(' . $filterExpr . ')';
             }
         }
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyContract.php b/tests/Doctrine/Tests/Models/Company/CompanyContract.php
index 70dd2fcb4..7787e96be 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyContract.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyContract.php
@@ -21,7 +21,7 @@ abstract class CompanyContract
     private $id;
 
     /**
-     * @ManyToOne(targetEntity="CompanyEmployee")
+     * @ManyToOne(targetEntity="CompanyEmployee", inversedBy="soldContracts")
      */
     private $salesPerson;
 
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyEmployee.php b/tests/Doctrine/Tests/Models/Company/CompanyEmployee.php
index a9235c321..9d153770e 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyEmployee.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyEmployee.php
@@ -28,6 +28,11 @@ class CompanyEmployee extends CompanyPerson
      */
     public $contracts;
 
+    /**
+     * @OneToMany(targetEntity="CompanyFlexUltraContract", mappedBy="salesPerson", fetch="EXTRA_LAZY")
+     */
+    public $soldContracts;
+
     public function getSalary() {
         return $this->salary;
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
index 403bf3a04..7d3affd0e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
@@ -667,6 +667,9 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $contract1->addManager($manager2);
 
+        $contract1->setSalesPerson($manager);
+        $contract2->setSalesPerson($manager);
+
         $this->_em->persist($manager);
         $this->_em->persist($manager2);
         $this->_em->persist($contract1);
@@ -804,6 +807,59 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertFalse($contract->managers->isInitialized());
         $this->assertEquals(1, count($contract->managers->slice(0, 10)));
     }
+
+    public function testOneToMany_ExtraLazyCountWithFilterOnSTI()
+    {
+        $this->loadCompanySingleTableInheritanceFixtureData();
+
+        $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId);
+
+        $this->assertFalse($manager->soldContracts->isInitialized());
+        $this->assertEquals(2, count($manager->soldContracts));
+
+        // Enable the filter
+        $this->useCompletedContractFilter();
+
+        $this->assertFalse($manager->soldContracts->isInitialized());
+        $this->assertEquals(1, count($manager->soldContracts));
+    }
+
+    public function testOneToMany_ExtraLazyContainsWithFilterOnSTI()
+    {
+        $this->loadCompanySingleTableInheritanceFixtureData();
+
+        $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId);
+        $contract1 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->contractId1);
+        $contract2 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->contractId2);
+
+        $this->assertFalse($manager->soldContracts->isInitialized());
+        $this->assertTrue($manager->soldContracts->contains($contract1));
+        $this->assertTrue($manager->soldContracts->contains($contract2));
+
+        // Enable the filter
+        $this->useCompletedContractFilter();
+
+        $this->assertFalse($manager->soldContracts->isInitialized());
+        $this->assertFalse($manager->soldContracts->contains($contract1));
+        $this->assertTrue($manager->soldContracts->contains($contract2));
+    }
+
+    public function testOneToMany_ExtraLazySliceWithFilterOnSTI()
+    {
+
+        $this->loadCompanySingleTableInheritanceFixtureData();
+
+        $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId);
+
+        $this->assertFalse($manager->soldContracts->isInitialized());
+        $this->assertEquals(2, count($manager->soldContracts->slice(0, 10)));
+
+        // Enable the filter
+        $this->useCompletedContractFilter();
+
+        $this->assertFalse($manager->soldContracts->isInitialized());
+        $this->assertEquals(1, count($manager->soldContracts->slice(0, 10)));
+    }
 }
 
 class MySoftDeleteFilter extends SQLFilter

From c3c174512a6732c86bf2bb85af9293a6eb8c5bc2 Mon Sep 17 00:00:00 2001
From: Alexander <iam.asm89@gmail.com>
Date: Thu, 22 Dec 2011 21:10:13 +0100
Subject: [PATCH 27/59] Added tests for OneToMany associations and lazy
 collection to CTI entity

---
 .../Tests/Models/Company/CompanyAuction.php   |   2 +-
 .../Models/Company/CompanyOrganization.php    |   6 +-
 .../Tests/ORM/Functional/SQLFilterTest.php    | 100 ++++++++++++++++++
 3 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/tests/Doctrine/Tests/Models/Company/CompanyAuction.php b/tests/Doctrine/Tests/Models/Company/CompanyAuction.php
index 5dc72e8c1..5743122bc 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyAuction.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyAuction.php
@@ -14,4 +14,4 @@ class CompanyAuction extends CompanyEvent {
     public function getData() {
         return $this->data;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyOrganization.php b/tests/Doctrine/Tests/Models/Company/CompanyOrganization.php
index 19463206b..ca9941062 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyOrganization.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyOrganization.php
@@ -11,9 +11,9 @@ class CompanyOrganization {
    private $id;
 
     /**
-     * @OneToMany(targetEntity="CompanyEvent", mappedBy="organization", cascade={"persist"})
+     * @OneToMany(targetEntity="CompanyEvent", mappedBy="organization", cascade={"persist"}, fetch="EXTRA_LAZY")
      */
-    private $events;
+    public $events;
 
     public function getId() {
         return $this->id;
@@ -41,4 +41,4 @@ class CompanyOrganization {
     public function setMainEvent($event) {
         $this->mainevent = $event;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
index 7d3affd0e..31ebb2d46 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
@@ -19,6 +19,8 @@ use Doctrine\Tests\Models\CMS\CmsComment;
 use Doctrine\Tests\Models\Company\CompanyPerson;
 use Doctrine\Tests\Models\Company\CompanyManager;
 use Doctrine\Tests\Models\Company\CompanyEmployee;
+use Doctrine\Tests\Models\Company\CompanyOrganization;
+use Doctrine\Tests\Models\Company\CompanyAuction;
 
 use Doctrine\Tests\Models\Company\CompanyFlexContract;
 use Doctrine\Tests\Models\Company\CompanyFlexUltraContract;
@@ -35,6 +37,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
     private $userId, $userId2, $articleId, $articleId2;
     private $groupId, $groupId2;
     private $managerId, $managerId2, $contractId1, $contractId2;
+    private $organizationId, $eventId1, $eventId2;
 
     public function setUp()
     {
@@ -860,6 +863,91 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertFalse($manager->soldContracts->isInitialized());
         $this->assertEquals(1, count($manager->soldContracts->slice(0, 10)));
     }
+    private function loadCompanyOrganizationEventJoinedSubclassFixtureData()
+    {
+        $organization = new CompanyOrganization;
+
+        $event1 = new CompanyAuction;
+        $event1->setData('foo');
+
+        $event2 = new CompanyAuction;
+        $event2->setData('bar');
+
+        $organization->addEvent($event1);
+        $organization->addEvent($event2);
+
+        $this->_em->persist($organization);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $this->organizationId = $organization->getId();
+        $this->eventId1 = $event1->getId();
+        $this->eventId2 = $event2->getId();
+    }
+
+    private function useCompanyEventIdFilter()
+    {
+        // Enable the filter
+        $conf = $this->_em->getConfiguration();
+        $conf->addFilter("event_id", "\Doctrine\Tests\ORM\Functional\CompanyEventFilter");
+        $this->_em->getFilters()
+            ->enable("event_id")
+            ->setParameter("id", $this->eventId2);
+    }
+
+
+    public function testOneToMany_ExtraLazyCountWithFilterOnCTI()
+    {
+        $this->loadCompanyOrganizationEventJoinedSubclassFixtureData();
+
+        $organization = $this->_em->find('Doctrine\Tests\Models\Company\CompanyOrganization', $this->organizationId);
+
+        $this->assertFalse($organization->events->isInitialized());
+        $this->assertEquals(2, count($organization->events));
+
+        // Enable the filter
+        $this->useCompanyEventIdFilter();
+
+        $this->assertFalse($organization->events->isInitialized());
+        $this->assertEquals(1, count($organization->events));
+    }
+
+    public function testOneToMany_ExtraLazyContainsWithFilterOnCTI()
+    {
+        $this->loadCompanyOrganizationEventJoinedSubclassFixtureData();
+
+        $organization = $this->_em->find('Doctrine\Tests\Models\Company\CompanyOrganization', $this->organizationId);
+
+        $event1 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyEvent', $this->eventId1);
+        $event2 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyEvent', $this->eventId2);
+
+        $this->assertFalse($organization->events->isInitialized());
+        $this->assertTrue($organization->events->contains($event1));
+        $this->assertTrue($organization->events->contains($event2));
+
+        // Enable the filter
+        $this->useCompanyEventIdFilter();
+
+        $this->assertFalse($organization->events->isInitialized());
+        $this->assertFalse($organization->events->contains($event1));
+        $this->assertTrue($organization->events->contains($event2));
+    }
+
+    public function testOneToMany_ExtraLazySliceWithFilterOnCTI()
+    {
+        $this->loadCompanyOrganizationEventJoinedSubclassFixtureData();
+
+        $organization = $this->_em->find('Doctrine\Tests\Models\Company\CompanyOrganization', $this->organizationId);
+
+        $this->assertFalse($organization->events->isInitialized());
+        $this->assertEquals(2, count($organization->events->slice(0, 10)));
+
+        // Enable the filter
+        $this->useCompanyEventIdFilter();
+
+        $this->assertFalse($organization->events->isInitialized());
+        $this->assertEquals(1, count($organization->events->slice(0, 10)));
+    }
 }
 
 class MySoftDeleteFilter extends SQLFilter
@@ -945,3 +1033,15 @@ class CompletedContractFilter extends SQLFilter
         return $targetTableAlias.'.completed = ' . $this->getParameter('completed');
     }
 }
+
+class CompanyEventFilter extends SQLFilter
+{
+    public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias, $targetTable = '')
+    {
+        if ($targetEntity->name != "Doctrine\Tests\Models\Company\CompanyEvent") {
+            return "";
+        }
+
+        return $targetTableAlias.'.id = ' . $this->getParameter('id');
+    }
+}

From 4cf5f70bea4c0be20df75a4a74286faadbaba33a Mon Sep 17 00:00:00 2001
From: Alexander <iam.asm89@gmail.com>
Date: Thu, 22 Dec 2011 23:21:56 +0100
Subject: [PATCH 28/59] Update test

---
 .../Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php
index 797c202f6..a1e6daca5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php
@@ -63,6 +63,6 @@ class CompanySchemaTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $sql = $this->_schemaTool->getDropSchemaSQL(array(
             $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyManager'),
         ));
-        $this->assertEquals(3, count($sql));
+        $this->assertEquals(4, count($sql));
     }
-}
\ No newline at end of file
+}

From 8368f0e4b9b11e916e632587f8b82f980b3af492 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Fri, 23 Dec 2011 11:03:28 -0200
Subject: [PATCH 29/59] change default namming strategy

---
 lib/Doctrine/ORM/DefaultNamingStrategy.php    |  59 +---
 lib/Doctrine/ORM/NamingStrategy.php           |  79 ++---
 .../Doctrine/Tests/ORM/NamingStrategyTest.php | 280 +++---------------
 3 files changed, 82 insertions(+), 336 deletions(-)

diff --git a/lib/Doctrine/ORM/DefaultNamingStrategy.php b/lib/Doctrine/ORM/DefaultNamingStrategy.php
index 7e712a3bb..f12db9a9f 100644
--- a/lib/Doctrine/ORM/DefaultNamingStrategy.php
+++ b/lib/Doctrine/ORM/DefaultNamingStrategy.php
@@ -30,12 +30,15 @@ namespace Doctrine\ORM;
  */
 class DefaultNamingStrategy implements NamingStrategy
 {
-
     /**
      * {@inheritdoc}
      */
     public function classToTableName($className)
     {
+        if (strpos($className, '\\') !== false) {
+            return substr($className, strrpos($className, '\\') + 1);
+        }
+
         return $className;
     }
 
@@ -50,64 +53,34 @@ class DefaultNamingStrategy implements NamingStrategy
     /**
      * {@inheritdoc}
      */
-    public function tableName($tableName)
+    public function referenceColumnName()
     {
-        return $tableName;
+        return 'id';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function columnName($columnName)
+    public function joinColumnName($propertyName)
     {
-        return $columnName;
+        return $propertyName . '_' . $this->referenceColumnName();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function collectionTableName($ownerEntity, $ownerEntityTable, $associatedEntity, $associatedEntityTable, $propertyName)
+    public function joinTableName($ownerEntity, $associatedEntity, $propertyName = null)
     {
-        return $propertyName;
+        return strtolower($this->classToTableName($ownerEntity) . '_' .
+                $this->classToTableName($associatedEntity));
     }
-
+    
     /**
      * {@inheritdoc}
      */
-    public function joinKeyColumnName($joinedColumn, $joinedTable)
+    public function joinKeyColumnName($propertyEntityName, $referencedColumnName = null, $propertyName = null)
     {
-        return $joinedColumn;
+        return strtolower($this->classToTableName($propertyEntityName) . '_' .
+                ($referencedColumnName ?: $this->referenceColumnName()));
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function foreignKeyColumnName($propertyName, $propertyEntityName, $propertyTableName, $referencedColumnName)
-    {
-        return $propertyName ?: $propertyTableName;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function logicalColumnName($columnName, $propertyName)
-    {
-        return $columnName ?: $propertyName;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function logicalCollectionTableName($tableName, $ownerEntityTable, $associatedEntityTable, $propertyName)
-    {
-        return $ownerEntityTable . '_' . ( $associatedEntityTable ?: $propertyName );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function logicalCollectionColumnName($columnName, $propertyName, $referencedColumn)
-    {
-        return $columnName ?: ($propertyName . '_' . $referencedColumn);
-    }
-}
+}
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/NamingStrategy.php b/lib/Doctrine/ORM/NamingStrategy.php
index ff72be46f..e91e334ad 100644
--- a/lib/Doctrine/ORM/NamingStrategy.php
+++ b/lib/Doctrine/ORM/NamingStrategy.php
@@ -40,82 +40,43 @@ interface NamingStrategy
     function classToTableName($className);
 
     /**
-     * Return a column name for a property path expression
+     * Return a column name for a property
      *
-     * @param   string  $propertyName   A property path
+     * @param   string  $propertyName   A property
      * @return  string                  A column name
      */
     function propertyToColumnName($propertyName);
 
     /**
-     * Alter the table name given in the mapping document
+     * Return the default reference column name
      *
-     * @param   string  tableName   A table name
-     * @return  string              A table name
-     */
-    function tableName($tableName);
-
-    /**
-     * Alter the column name given in the mapping document
-     * 
-     * @param   string $columnName  A column name
      * @return  string              A column name
      */
-    function columnName($columnName);
+    function referenceColumnName();
+
+     /**
+     * Return a join column name for a property
+     *
+     * @param   string $propertyName    A property
+     * @return  string                  A column name
+     */
+    function joinColumnName($propertyName);
 
     /**
-     * Return a collection table name ie an association having a join table
+     * Return a join table name
      *
      * @param string   $ownerEntity
-     * @param string   $ownerEntityTable        Owner side table name
      * @param string   $associatedEntity
-     * @param string   $associatedEntityTable   Reverse side table name if any
-     * @param string   $propertyName            Collection role
+     * @param string   $propertyName
      */
-    function collectionTableName($ownerEntity, $ownerEntityTable, $associatedEntity, $associatedEntityTable, $propertyName);
+    function joinTableName($ownerEntity, $associatedEntity, $propertyName = null);
 
-    /**
-     * Return the join key column name ie a FK column used in a JOINED strategy or for a secondary table
-     *
-     * @param string   $joinedColumn    Joined column name used to join with
-     * @param string   $joinedTable     Joined table name used to join with
-     */
-    function joinKeyColumnName($joinedColumn, $joinedTable);
-
-    /**
+     /**
      * Return the foreign key column name for the given parameters
      *
-     * @param string   $propertyName            The property name involved
      * @param string   $propertyEntityName
-     * @param string   $propertyTableName       The property table name involved (logical one)
-     * @param string   $referencedColumnName    The referenced column name involved (logical one)
+     * @param string   $referencedColumnName
+     * @param string   $propertyName
      */
-    function foreignKeyColumnName($propertyName, $propertyEntityName, $propertyTableName, $referencedColumnName);
-
-    /**
-     * Return the logical column name used to refer to a column in the metadata
-     *
-     * @param string   $columnName      Given column name if any
-     * @param string   $propertyName    Property name of this column
-     */
-    function logicalColumnName($columnName, $propertyName);
-
-    /**
-     * Returns the logical collection table name used to refer to a table in the mapping metadata
-     *
-     * @param string   $tableName               The metadata explicit name
-     * @param string   $ownerEntityTable        Owner table entity table name (logical one)
-     * @param string   $associatedEntityTable   Reverse side table name if any (logical one)
-     * @param string   $propertyName            Collection role
-     */
-    function logicalCollectionTableName($tableName, $ownerEntityTable, $associatedEntityTable, $propertyName);
-
-    /**
-     * Returns the logical foreign key column name used to refer to this column in the mapping metadata
-     *
-     * @param string   $columnName          Given column name in the metadata if any
-     * @param string   $propertyName        Property name
-     * @param string   $referencedColumn    Referenced column name in the join
-     */
-    function logicalCollectionColumnName($columnName, $propertyName, $referencedColumn);
-}
+    function joinKeyColumnName($propertyEntityName, $referencedColumnName = null, $propertyName = null);
+}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
index 08b8c1b51..f17459118 100644
--- a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
@@ -39,11 +39,11 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
             array(self::defaultNaming(), 'SomeClassName',
                 'SomeClassName'
             ),
-            array(self::defaultNaming(), 'SOME_CLASS_NAME',
-                'SOME_CLASS_NAME'
+            array(self::defaultNaming(), 'SomeClassName',
+                '\SomeClassName'
             ),
-            array(self::defaultNaming(), 'some_class_name',
-                'some_class_name'
+            array(self::defaultNaming(), 'Name',
+                '\Some\Class\Name'
             ),
         );
     }
@@ -51,7 +51,7 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     /**
      * @dataProvider dataClassToTableName
      */
-    public function testClassToTableName(NamingStrategy $strategy, $className, $expected)
+    public function testClassToTableName(NamingStrategy $strategy, $expected, $className)
     {
         $this->assertEquals($expected, $strategy->classToTableName($className));
     }
@@ -89,103 +89,94 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     }
 
     /**
-     * Data Provider for NamingStrategy#tableName
+     * Data Provider for NamingStrategy#referenceColumnName
      *
      * @return array
      */
-    static public function dataTableName()
+    static public function dataReferenceColumnName()
     {
         return array(
-            array(self::defaultNaming(), 'someTable',
-                'someTable'
-            ),
-            array(self::defaultNaming(), 'SOME_TABLE',
-                'SOME_TABLE'
-            ),
-            array(self::defaultNaming(), 'some_table',
-                'some_table'
-            ),
+            array(self::defaultNaming(), 'id'),
         );
     }
-    
+
     /**
-     * @dataProvider dataTableName
-     * 
+     * @dataProvider dataReferenceColumnName
+     *
      * @param NamingStrategy    $strategy
      * @param string            $expected
-     * @param string            $tableName
+     * @param string            $joinedColumn
+     * @param string            $joinedTable
      */
-    public function testTableName(NamingStrategy $strategy, $expected, $tableName)
+    public function testReferenceColumnName(NamingStrategy $strategy, $expected)
     {
-        $this->assertEquals($expected, $strategy->tableName($tableName));
+        $this->assertEquals($expected, $strategy->referenceColumnName());
     }
 
     /**
-     * Data Provider for NamingStrategy#columnName
+     * Data Provider for NamingStrategy#joinColumnName
      *
      * @return array
      */
-    static public function dataColumnName()
+    static public function dataJoinColumnName()
     {
         return array(
-            array(self::defaultNaming(), 'someColumn',
-                'someColumn'
+            array(self::defaultNaming(), 'someColumn_id',
+                'someColumn', null,
             ),
-            array(self::defaultNaming(), 'SOME_COLUMN',
-                'SOME_COLUMN'
+            array(self::defaultNaming(), 'somecolumn_id',
+                'somecolumn', null,
             ),
-            array(self::defaultNaming(), 'some_column',
-                'some_column'
+            array(self::defaultNaming(), 'some_column_id',
+                'some_column', null,
             ),
         );
     }
-    
+
     /**
-     * @dataProvider dataColumnName
-     * 
+     * @dataProvider dataJoinColumnName
+     *
      * @param NamingStrategy    $strategy
      * @param string            $expected
-     * @param string            $columnName
+     * @param string            $propertyName
      */
-    public function testColumnName(NamingStrategy $strategy, $expected, $columnName)
+    public function testJoinColumnName(NamingStrategy $strategy, $expected, $propertyName)
     {
-        $this->assertEquals($expected, $strategy->columnName($columnName));
+        $this->assertEquals($expected, $strategy->joinColumnName($propertyName));
     }
 
     /**
-     * Data Provider for NamingStrategy#collectionTableName
+     * Data Provider for NamingStrategy#joinTableName
      *
      * @return array
      */
-    static public function dataCollectionTableName()
+    static public function dataJoinTableName()
     {
         return array(
-            array(self::defaultNaming(), 'someColumn',
-                null, null, null, null, 'someColumn',
+            array(self::defaultNaming(), 'someclassname_classname',
+                'SomeClassName', 'Some\ClassName', null,
             ),
-            array(self::defaultNaming(), 'SOME_COLUMN',
-                null, null, null, null, 'SOME_COLUMN'
+            array(self::defaultNaming(), 'someclassname_classname',
+                '\SomeClassName', 'ClassName', null,
             ),
-            array(self::defaultNaming(), 'some_column',
-                null, null, null, null, 'some_column'
+            array(self::defaultNaming(), 'name_classname',
+                '\Some\Class\Name', 'ClassName', null,
             ),
         );
     }
 
     /**
-     * @dataProvider dataCollectionTableName
+     * @dataProvider dataJoinTableName
      *
      * @param NamingStrategy    $strategy
      * @param string            $expected
      * @param string            $ownerEntity
-     * @param string            $ownerEntityTable
      * @param string            $associatedEntity
-     * @param string            $associatedEntityTable
      * @param string            $propertyName
      */
-    public function testCollectionTableName(NamingStrategy $strategy, $expected, $ownerEntity, $ownerEntityTable, $associatedEntity, $associatedEntityTable, $propertyName)
+    public function testJoinTableName(NamingStrategy $strategy, $expected, $ownerEntity, $associatedEntity, $propertyName = null)
     {
-        $this->assertEquals($expected, $strategy->collectionTableName($ownerEntity, $ownerEntityTable, $associatedEntity, $associatedEntityTable, $propertyName));
+        $this->assertEquals($expected, $strategy->joinTableName($ownerEntity, $associatedEntity, $propertyName));
     }
 
     /**
@@ -196,14 +187,11 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     static public function dataJoinKeyColumnName()
     {
         return array(
-            array(self::defaultNaming(), 'someColumn',
-                'someColumn', null,
+            array(self::defaultNaming(), 'someclassname_id',
+                'SomeClassName', null, null,
             ),
-            array(self::defaultNaming(), 'SOME_COLUMN',
-                'SOME_COLUMN', null,
-            ),
-            array(self::defaultNaming(), 'some_column',
-                'some_column', null,
+            array(self::defaultNaming(), 'name_identifier',
+                '\Some\Class\Name', 'identifier', null,
             ),
         );
     }
@@ -213,188 +201,12 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
      *
      * @param NamingStrategy    $strategy
      * @param string            $expected
-     * @param string            $joinedColumn
-     * @param string            $joinedTable
-     */
-    public function testJoinKeyColumnName(NamingStrategy $strategy, $expected, $joinedColumn, $joinedTable)
-    {
-        $this->assertEquals($expected, $strategy->joinKeyColumnName($joinedColumn, $joinedTable));
-    }
-
-    /**
-     * Data Provider for NamingStrategy#foreignKeyColumnName
-     *
-     * @return array
-     */
-    static public function dataForeignKeyColumnName()
-    {
-        return array(
-            array(self::defaultNaming(), 'someColumn',
-                'someColumn', null, null, null,
-            ),
-            array(self::defaultNaming(), 'SOME_COLUMN',
-                'SOME_COLUMN', null, null, null,
-            ),
-            array(self::defaultNaming(), 'some_column',
-                'some_column', null, null, null,
-            ),
-
-            array(self::defaultNaming(), 'someColumn',
-                null, null, 'someColumn', null,
-            ),
-            array(self::defaultNaming(), 'SOME_COLUMN',
-                null, null, 'SOME_COLUMN', null,
-            ),
-            array(self::defaultNaming(), 'some_column',
-                null, null, 'some_column', null,
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider dataForeignKeyColumnName
-     *
-     * @param NamingStrategy    $strategy
-     * @param string            $propertyName
      * @param string            $propertyEntityName
-     * @param string            $propertyTableName
      * @param string            $referencedColumnName
-     */
-    public function testForeignKeyColumnName(NamingStrategy $strategy, $expected, $propertyName, $propertyEntityName, $propertyTableName, $referencedColumnName)
-    {
-        $this->assertEquals($expected, $strategy->foreignKeyColumnName($propertyName, $propertyEntityName, $propertyTableName, $referencedColumnName));
-    }
-
-    /**
-     * Data Provider for NamingStrategy#logicalColumnName
-     *
-     * @return array
-     */
-    static public function dataLogicalColumnName()
-    {
-        return array(
-            array(self::defaultNaming(), 'someColumn',
-                'someColumn', null,
-            ),
-            array(self::defaultNaming(), 'SOME_COLUMN',
-                'SOME_COLUMN', null,
-            ),
-            array(self::defaultNaming(), 'some_column',
-                'some_column', null,
-            ),
-
-            array(self::defaultNaming(), 'someColumn',
-                null, 'someColumn',
-            ),
-            array(self::defaultNaming(), 'SOME_COLUMN',
-                null, 'SOME_COLUMN',
-            ),
-            array(self::defaultNaming(), 'some_column',
-                null, 'some_column',
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider dataLogicalColumnName
-     *
-     * @param NamingStrategy    $strategy
-     * @param string            $columnName
      * @param string            $propertyName
      */
-    public function testLogicalColumnName(NamingStrategy $strategy, $expected, $columnName, $propertyName)
+    public function testJoinKeyColumnName(NamingStrategy $strategy, $expected, $propertyEntityName, $referencedColumnName = null, $propertyName = null)
     {
-        $this->assertEquals($expected, $strategy->logicalColumnName($columnName, $propertyName));
+        $this->assertEquals($expected, $strategy->joinKeyColumnName($propertyEntityName, $referencedColumnName, $propertyName));
     }
-
-
-    /**
-     * Data Provider for NamingStrategy#logicalCollectionTableName
-     *
-     * @return array
-     */
-    static public function dataLogicalCollectionTableName()
-    {
-        return array(
-            array(self::defaultNaming(), 'SomeClassName_SomeAssocClassName',
-                null, 'SomeClassName', 'SomeAssocClassName', null
-            ),
-            array(self::defaultNaming(), 'SOME_CLASS_NAME_SOME_ASSOC_CLASS_NAME',
-                null, 'SOME_CLASS_NAME', 'SOME_ASSOC_CLASS_NAME', null
-            ),
-            array(self::defaultNaming(), 'some_class_name_some_assoc_class_name',
-                null, 'some_class_name', 'some_assoc_class_name', null
-            ),
-
-            array(self::defaultNaming(), 'SomeClassName_someProperty',
-                null, 'SomeClassName', null, 'someProperty',
-            ),
-            array(self::defaultNaming(), 'SOME_CLASS_NAME_SOME_PROPERTY',
-                null, 'SOME_CLASS_NAME', null, 'SOME_PROPERTY',
-            ),
-            array(self::defaultNaming(), 'some_class_name_some_property',
-                null, 'some_class_name', null, 'some_property',
-            ),
-
-        );
-    }
-
-    /**
-     * @dataProvider dataLogicalCollectionTableName
-     *
-     * @param NamingStrategy    $strategy
-     * @param string            $tableName
-     * @param string            $ownerEntityTable
-     * @param string            $associatedEntityTable
-     * @param string            $propertyName
-     */
-    public function testLogicalCollectionTableName(NamingStrategy $strategy, $expected, $tableName, $ownerEntityTable, $associatedEntityTable, $propertyName)
-    {
-        $this->assertEquals($expected, $strategy->logicalCollectionTableName($tableName, $ownerEntityTable, $associatedEntityTable, $propertyName));
-    }
-
-    /**
-     * Data Provider for NamingStrategy#logicalCollectionColumnName
-     *
-     * @return array
-     */
-    static public function dataLogicalCollectionColumnName()
-    {
-        return array(
-            array(self::defaultNaming(), 'someColumn',
-                'someColumn', null, null,
-            ),
-            array(self::defaultNaming(), 'SOME_COLUMN',
-                'SOME_COLUMN', null, null,
-            ),
-            array(self::defaultNaming(), 'some_column',
-                'some_column', null, null,
-            ),
-
-            array(self::defaultNaming(), 'someColumn',
-                'someColumn', 'some', 'Column',
-            ),
-            array(self::defaultNaming(), 'SOME_COLUMN',
-                'SOME_COLUMN', 'SOME', 'COLUMN',
-            ),
-            array(self::defaultNaming(), 'some_column',
-                'some_column', 'some', 'column',
-            ),
-
-        );
-    }
-
-    /**
-     * @dataProvider dataLogicalCollectionColumnName
-     *
-     * @param NamingStrategy    $strategy
-     * @param string            $columnName
-     * @param string            $propertyName
-     * @param string            $referencedColumn
-     */
-    public function testLogicalCollectionColumnName(NamingStrategy $strategy, $expected, $columnName, $propertyName, $referencedColumn)
-    {
-        $this->assertEquals($expected, $strategy->logicalCollectionColumnName($columnName, $propertyName, $referencedColumn));
-    }
-
 }
\ No newline at end of file

From 537821418ea124c3ea82551d4431efc79d1f551f Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Fri, 23 Dec 2011 11:29:50 -0200
Subject: [PATCH 30/59] apply naming strategy on ClassMetadataInfo

---
 lib/Doctrine/ORM/DefaultNamingStrategy.php    | 10 ++--
 .../ORM/Mapping/ClassMetadataInfo.php         | 50 +++++++++----------
 lib/Doctrine/ORM/NamingStrategy.php           | 11 ++--
 3 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/lib/Doctrine/ORM/DefaultNamingStrategy.php b/lib/Doctrine/ORM/DefaultNamingStrategy.php
index f12db9a9f..4d5a5b943 100644
--- a/lib/Doctrine/ORM/DefaultNamingStrategy.php
+++ b/lib/Doctrine/ORM/DefaultNamingStrategy.php
@@ -69,18 +69,18 @@ class DefaultNamingStrategy implements NamingStrategy
     /**
      * {@inheritdoc}
      */
-    public function joinTableName($ownerEntity, $associatedEntity, $propertyName = null)
+    public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
     {
-        return strtolower($this->classToTableName($ownerEntity) . '_' .
-                $this->classToTableName($associatedEntity));
+        return strtolower($this->classToTableName($sourceEntity) . '_' .
+                $this->classToTableName($targetEntity));
     }
     
     /**
      * {@inheritdoc}
      */
-    public function joinKeyColumnName($propertyEntityName, $referencedColumnName = null, $propertyName = null)
+    public function joinKeyColumnName($entityName, $referencedColumnName = null)
     {
-        return strtolower($this->classToTableName($propertyEntityName) . '_' .
+        return strtolower($this->classToTableName($entityName) . '_' .
                 ($referencedColumnName ?: $this->referenceColumnName()));
     }
 }
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 6fbf8b3c6..fc1477fc8 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -494,16 +494,25 @@ class ClassMetadataInfo
      */
     public $isReadOnly = false;
 
+    /**
+     * NamingStrategy determining the default column and table names
+     *
+     * @var \Doctrine\ORM\NamingStrategy
+     */
+    protected $namingStrategy;
+
     /**
      * Initializes a new ClassMetadata instance that will hold the object-relational mapping
      * metadata of the class with the given name.
      *
      * @param string $entityName The name of the entity class the new instance is used for.
+     * @param NamingStrategy $namingStrategy
      */
-    public function __construct($entityName)
+    public function __construct($entityName, NamingStrategy $namingStrategy = null)
     {
         $this->name = $entityName;
         $this->rootEntityName = $entityName;
+        $this->namingStrategy = $namingStrategy ?: new \Doctrine\ORM\DefaultNamingStrategy();
     }
 
     /**
@@ -717,7 +726,7 @@ class ClassMetadataInfo
 
         // Complete fieldName and columnName mapping
         if ( ! isset($mapping['columnName'])) {
-            $mapping['columnName'] = $mapping['fieldName'];
+            $mapping['columnName'] = $this->namingStrategy->propertyToColumnName($mapping['fieldName']);
         } else {
             if ($mapping['columnName'][0] == '`') {
                 $mapping['columnName'] = trim($mapping['columnName'], '`');
@@ -886,8 +895,8 @@ class ClassMetadataInfo
             if ( ! isset($mapping['joinColumns']) || ! $mapping['joinColumns']) {
                 // Apply default join column
                 $mapping['joinColumns'] = array(array(
-                    'name' => $mapping['fieldName'] . '_id',
-                    'referencedColumnName' => 'id'
+                    'name' => $this->namingStrategy->joinColumnName($mapping['fieldName']),
+                    'referencedColumnName' => $this->namingStrategy->referenceColumnName()
                 ));
             }
 
@@ -901,10 +910,10 @@ class ClassMetadataInfo
                     }
                 }
                 if (empty($joinColumn['name'])) {
-                    $joinColumn['name'] = $mapping['fieldName'] . '_id';
+                    $joinColumn['name'] = $this->namingStrategy->joinColumnName($mapping['fieldName']);
                 }
                 if (empty($joinColumn['referencedColumnName'])) {
-                    $joinColumn['referencedColumnName'] = 'id';
+                    $joinColumn['referencedColumnName'] = $this->namingStrategy->referenceColumnName();
                 }
                 $mapping['sourceToTargetKeyColumns'][$joinColumn['name']] = $joinColumn['referencedColumnName'];
                 $mapping['joinColumnFieldNames'][$joinColumn['name']] = isset($joinColumn['fieldName'])
@@ -965,40 +974,29 @@ class ClassMetadataInfo
     {
         $mapping = $this->_validateAndCompleteAssociationMapping($mapping);
         if ($mapping['isOwningSide']) {
-            if (strpos($mapping['sourceEntity'], '\\') !== false) {
-                $sourceShortName = strtolower(substr($mapping['sourceEntity'], strrpos($mapping['sourceEntity'], '\\') + 1));
-            } else {
-                $sourceShortName = strtolower($mapping['sourceEntity']);
-            }
-            if (strpos($mapping['targetEntity'], '\\') !== false) {
-                $targetShortName = strtolower(substr($mapping['targetEntity'], strrpos($mapping['targetEntity'], '\\') + 1));
-            } else {
-                $targetShortName = strtolower($mapping['targetEntity']);
-            }
-
             // owning side MUST have a join table
             if ( ! isset($mapping['joinTable']['name'])) {
-                $mapping['joinTable']['name'] = $sourceShortName .'_' . $targetShortName;
+                $mapping['joinTable']['name'] = $this->namingStrategy->joinTableName($mapping['sourceEntity'], $mapping['targetEntity'], $mapping['fieldName']);
             }
             if ( ! isset($mapping['joinTable']['joinColumns'])) {
                 $mapping['joinTable']['joinColumns'] = array(array(
-                        'name' => $sourceShortName . '_id',
-                        'referencedColumnName' => 'id',
+                        'name' => $this->namingStrategy->joinKeyColumnName($mapping['sourceEntity']),
+                        'referencedColumnName' => $this->namingStrategy->referenceColumnName(),
                         'onDelete' => 'CASCADE'));
             }
             if ( ! isset($mapping['joinTable']['inverseJoinColumns'])) {
                 $mapping['joinTable']['inverseJoinColumns'] = array(array(
-                        'name' => $targetShortName . '_id',
-                        'referencedColumnName' => 'id',
+                        'name' => $this->namingStrategy->joinKeyColumnName($mapping['targetEntity']),
+                        'referencedColumnName' => $this->namingStrategy->referenceColumnName(),
                         'onDelete' => 'CASCADE'));
             }
 
             foreach ($mapping['joinTable']['joinColumns'] as &$joinColumn) {
                 if (empty($joinColumn['name'])) {
-                    $joinColumn['name'] = $sourceShortName . '_id';
+                    $joinColumn['name'] = $this->namingStrategy->joinKeyColumnName($mapping['sourceEntity'], $joinColumn['referencedColumnName']);
                 }
                 if (empty($joinColumn['referencedColumnName'])) {
-                    $joinColumn['referencedColumnName'] = 'id';
+                    $joinColumn['referencedColumnName'] = $this->namingStrategy->referenceColumnName();
                 }
                 if (isset($joinColumn['onDelete']) && strtolower($joinColumn['onDelete']) == 'cascade') {
                     $mapping['isOnDeleteCascade'] = true;
@@ -1009,10 +1007,10 @@ class ClassMetadataInfo
 
             foreach ($mapping['joinTable']['inverseJoinColumns'] as &$inverseJoinColumn) {
                 if (empty($inverseJoinColumn['name'])) {
-                    $inverseJoinColumn['name'] = $targetShortName . '_id';
+                    $inverseJoinColumn['name'] = $this->namingStrategy->joinKeyColumnName($mapping['targetEntity'], $inverseJoinColumn['referencedColumnName']);
                 }
                 if (empty($inverseJoinColumn['referencedColumnName'])) {
-                    $inverseJoinColumn['referencedColumnName'] = 'id';
+                    $inverseJoinColumn['referencedColumnName'] = $this->namingStrategy->referenceColumnName();
                 }
                 if (isset($inverseJoinColumn['onDelete']) && strtolower($inverseJoinColumn['onDelete']) == 'cascade') {
                     $mapping['isOnDeleteCascade'] = true;
diff --git a/lib/Doctrine/ORM/NamingStrategy.php b/lib/Doctrine/ORM/NamingStrategy.php
index e91e334ad..641f4d346 100644
--- a/lib/Doctrine/ORM/NamingStrategy.php
+++ b/lib/Doctrine/ORM/NamingStrategy.php
@@ -65,18 +65,17 @@ interface NamingStrategy
     /**
      * Return a join table name
      *
-     * @param string   $ownerEntity
-     * @param string   $associatedEntity
+     * @param string   $sourceEntity
+     * @param string   $targetEntity
      * @param string   $propertyName
      */
-    function joinTableName($ownerEntity, $associatedEntity, $propertyName = null);
+    function joinTableName($sourceEntity, $targetEntity, $propertyName = null);
 
      /**
      * Return the foreign key column name for the given parameters
      *
-     * @param string   $propertyEntityName
+     * @param string   $entityName
      * @param string   $referencedColumnName
-     * @param string   $propertyName
      */
-    function joinKeyColumnName($propertyEntityName, $referencedColumnName = null, $propertyName = null);
+    function joinKeyColumnName($entityName, $referencedColumnName = null);
 }
\ No newline at end of file

From 8b1f60c9f8b3efd2f36b357f21cdc085cb57bcc9 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Fri, 23 Dec 2011 12:16:36 -0200
Subject: [PATCH 31/59] add UnderscoreNamingStrategy

---
 lib/Doctrine/ORM/UnderscoreNamingStrategy.php | 133 ++++++++++++++++++
 .../Doctrine/Tests/ORM/NamingStrategyTest.php | 106 ++++++++++++--
 2 files changed, 227 insertions(+), 12 deletions(-)
 create mode 100644 lib/Doctrine/ORM/UnderscoreNamingStrategy.php

diff --git a/lib/Doctrine/ORM/UnderscoreNamingStrategy.php b/lib/Doctrine/ORM/UnderscoreNamingStrategy.php
new file mode 100644
index 000000000..409b4f0ee
--- /dev/null
+++ b/lib/Doctrine/ORM/UnderscoreNamingStrategy.php
@@ -0,0 +1,133 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM;
+use Doctrine\Common\Util\Inflector;
+
+/**
+ * The default NamingStrategy
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.3
+ * @author  Fabio B. Silva <fabio.bat.silva@gmail.com>
+ */
+class UnderscoreNamingStrategy implements NamingStrategy
+{
+    const CASE_LOWER = 'lower';
+    const CASE_UPPER = 'upper';
+
+    /**
+     * @var string
+     */
+    private $case;
+
+    /**
+     * @param string $case
+     */
+    public function __construct($case = self::CASE_LOWER)
+    {
+        $this->case = $case;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCase()
+    {
+        return $this->case;
+    }
+
+    /**
+     * @param string $case
+     */
+    public function setCase($case)
+    {
+        $this->case = $case;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function classToTableName($className)
+    {
+        if (strpos($className, '\\') !== false) {
+            $className = substr($className, strrpos($className, '\\') + 1);
+        }
+
+        return $this->underscore($className);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function propertyToColumnName($propertyName)
+    {
+        return $this->underscore($propertyName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function referenceColumnName()
+    {
+        return $this->case == self::CASE_UPPER ?  'ID' : 'id';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function joinColumnName($propertyName)
+    {
+        return $this->underscore($propertyName) . '_' . $this->referenceColumnName();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
+    {
+        return $this->classToTableName($sourceEntity) . '_' . $this->classToTableName($targetEntity);
+    }
+    
+    /**
+     * {@inheritdoc}
+     */
+    public function joinKeyColumnName($entityName, $referencedColumnName = null)
+    {
+        return $this->classToTableName($entityName) . '_' .
+                ($referencedColumnName ?: $this->referenceColumnName());
+    }
+    
+    /**
+     * @param   string $string
+     * @return  string
+     */
+    private function underscore($string)
+    {
+        $string = Inflector::tableize($string);
+
+        if ($this->case == self::CASE_UPPER) {
+            return strtoupper($string);
+        }
+        
+        return $string;
+    }
+}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
index f17459118..bf4ab7254 100644
--- a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests\ORM;
 
+use Doctrine\ORM\UnderscoreNamingStrategy;
 use Doctrine\ORM\DefaultNamingStrategy;
 use Doctrine\ORM\NamingStrategy;
 
@@ -12,20 +13,28 @@ require_once __DIR__ . '/../TestInit.php';
  */
 class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
 {
-    /**
-     * @var DefaultNamingStrategy
-     */
-    private static $defaultNamingStrategy;
-    
     /**
      * @return DefaultNamingStrategy
      */
     static private function defaultNaming()
     {
-        if (self::$defaultNamingStrategy == null) {
-           self::$defaultNamingStrategy = new DefaultNamingStrategy();
-        }
-        return self::$defaultNamingStrategy;
+        return new DefaultNamingStrategy();
+    }
+
+    /**
+     * @return UnderscoreNamingStrategy
+     */
+    static private function underscoreNamingLower()
+    {
+        return new UnderscoreNamingStrategy(UnderscoreNamingStrategy::CASE_LOWER);
+    }
+
+    /**
+     * @return UnderscoreNamingStrategy
+     */
+    static private function underscoreNamingUpper()
+    {
+        return new UnderscoreNamingStrategy(UnderscoreNamingStrategy::CASE_UPPER);
     }
 
     /**
@@ -36,6 +45,7 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     static public function dataClassToTableName()
     {
         return array(
+            // DefaultNamingStrategy
             array(self::defaultNaming(), 'SomeClassName',
                 'SomeClassName'
             ),
@@ -45,6 +55,20 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
             array(self::defaultNaming(), 'Name',
                 '\Some\Class\Name'
             ),
+
+            // UnderscoreNamingStrategy
+            array(self::underscoreNamingLower(), 'some_class_name',
+                '\Name\Space\SomeClassName'
+            ),
+            array(self::underscoreNamingLower(), 'name',
+                '\Some\Class\Name'
+            ),
+            array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME',
+                '\Name\Space\SomeClassName'
+            ),
+            array(self::underscoreNamingUpper(), 'NAME',
+                '\Some\Class\Name'
+            ),
         );
     }
 
@@ -64,6 +88,7 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     static public function dataPropertyToColumnName()
     {
         return array(
+            // DefaultNamingStrategy
             array(self::defaultNaming(), 'someProperty',
                 'someProperty'
             ),
@@ -73,6 +98,14 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
             array(self::defaultNaming(), 'some_property',
                 'some_property'
             ),
+
+            // UnderscoreNamingStrategy
+            array(self::underscoreNamingLower(), 'some_property',
+                'someProperty'
+            ),
+            array(self::underscoreNamingUpper(), 'SOME_PROPERTY',
+                'someProperty'
+            ),
         );
     }
     
@@ -96,7 +129,12 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     static public function dataReferenceColumnName()
     {
         return array(
+            // DefaultNamingStrategy
             array(self::defaultNaming(), 'id'),
+
+            // UnderscoreNamingStrategy
+            array(self::underscoreNamingLower(), 'id'),
+            array(self::underscoreNamingUpper(), 'ID'),
         );
     }
 
@@ -121,15 +159,21 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     static public function dataJoinColumnName()
     {
         return array(
+            // DefaultNamingStrategy
             array(self::defaultNaming(), 'someColumn_id',
                 'someColumn', null,
             ),
-            array(self::defaultNaming(), 'somecolumn_id',
-                'somecolumn', null,
-            ),
             array(self::defaultNaming(), 'some_column_id',
                 'some_column', null,
             ),
+
+            // UnderscoreNamingStrategy
+            array(self::underscoreNamingLower(), 'some_column_id',
+                'someColumn', null,
+            ),
+            array(self::underscoreNamingUpper(), 'SOME_COLUMN_ID',
+                'someColumn', null,
+            ),
         );
     }
 
@@ -153,6 +197,7 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     static public function dataJoinTableName()
     {
         return array(
+            // DefaultNamingStrategy
             array(self::defaultNaming(), 'someclassname_classname',
                 'SomeClassName', 'Some\ClassName', null,
             ),
@@ -162,6 +207,27 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
             array(self::defaultNaming(), 'name_classname',
                 '\Some\Class\Name', 'ClassName', null,
             ),
+
+            // UnderscoreNamingStrategy
+            array(self::underscoreNamingLower(), 'some_class_name_class_name',
+                'SomeClassName', 'Some\ClassName', null,
+            ),
+            array(self::underscoreNamingLower(), 'some_class_name_class_name',
+                '\SomeClassName', 'ClassName', null,
+            ),
+            array(self::underscoreNamingLower(), 'name_class_name',
+                '\Some\Class\Name', 'ClassName', null,
+            ),
+
+            array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME_CLASS_NAME',
+                'SomeClassName', 'Some\ClassName', null,
+            ),
+            array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME_CLASS_NAME',
+                '\SomeClassName', 'ClassName', null,
+            ),
+            array(self::underscoreNamingUpper(), 'NAME_CLASS_NAME',
+                '\Some\Class\Name', 'ClassName', null,
+            ),
         );
     }
 
@@ -187,12 +253,28 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     static public function dataJoinKeyColumnName()
     {
         return array(
+            // DefaultNamingStrategy
             array(self::defaultNaming(), 'someclassname_id',
                 'SomeClassName', null, null,
             ),
             array(self::defaultNaming(), 'name_identifier',
                 '\Some\Class\Name', 'identifier', null,
             ),
+
+            // UnderscoreNamingStrategy
+            array(self::underscoreNamingLower(), 'some_class_name_id',
+                'SomeClassName', null, null,
+            ),
+            array(self::underscoreNamingLower(), 'class_name_identifier',
+                '\Some\Class\ClassName', 'identifier', null,
+            ),
+
+            array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME_ID',
+                'SomeClassName', null, null,
+            ),
+            array(self::underscoreNamingUpper(), 'CLASS_NAME_IDENTIFIER',
+                '\Some\Class\ClassName', 'IDENTIFIER', null,
+            ),
         );
     }
 

From 83a94586531981804ae56d64ba9d6948d6afb64d Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Fri, 23 Dec 2011 12:28:09 -0200
Subject: [PATCH 32/59] apply naming strategy on ClassMetadata

---
 lib/Doctrine/ORM/Mapping/ClassMetadata.php     | 11 +++++++----
 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php |  4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index a5b983fbb..a2e50d536 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -21,7 +21,8 @@ namespace Doctrine\ORM\Mapping;
 
 use ReflectionClass, ReflectionProperty;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
-
+use Doctrine\ORM\DefaultNamingStrategy;
+use Doctrine\ORM\NamingStrategy;
 /**
  * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
  * of an entity and it's associations.
@@ -61,13 +62,15 @@ class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
      * metadata of the class with the given name.
      *
      * @param string $entityName The name of the entity class the new instance is used for.
+     * @param NamingStrategy $namingStrategy
      */
-    public function __construct($entityName)
+    public function __construct($entityName, NamingStrategy $namingStrategy = null)
     {
+        $namingStrategy  = $namingStrategy ?: new DefaultNamingStrategy();
         $this->reflClass = new ReflectionClass($entityName);
         $this->namespace = $this->reflClass->getNamespaceName();
-        $this->table['name'] = $this->reflClass->getShortName();
-        parent::__construct($this->reflClass->getName()); // do not use $entityName, possible case-problems
+        $this->table['name'] = $namingStrategy->classToTableName($this->reflClass->getShortName());
+        parent::__construct($this->reflClass->getName(),$namingStrategy); // do not use $entityName, possible case-problems
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index fc1477fc8..7a845e754 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -21,6 +21,8 @@ namespace Doctrine\ORM\Mapping;
 
 use Doctrine\DBAL\Types\Type;
 use ReflectionClass;
+use Doctrine\ORM\DefaultNamingStrategy;
+use Doctrine\ORM\NamingStrategy;
 
 /**
  * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
@@ -512,7 +514,7 @@ class ClassMetadataInfo
     {
         $this->name = $entityName;
         $this->rootEntityName = $entityName;
-        $this->namingStrategy = $namingStrategy ?: new \Doctrine\ORM\DefaultNamingStrategy();
+        $this->namingStrategy = $namingStrategy ?: new DefaultNamingStrategy();
     }
 
     /**

From da0a6fc619fc5cb949ed19321191934e80b3825b Mon Sep 17 00:00:00 2001
From: Adrien BRAULT <monsti@gmail.com>
Date: Fri, 23 Dec 2011 17:05:08 +0100
Subject: [PATCH 33/59] Fix some PHPDoc @return type.

---
 lib/Doctrine/ORM/Query/Expr.php   | 4 ++--
 lib/Doctrine/ORM/QueryBuilder.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Expr.php b/lib/Doctrine/ORM/Query/Expr.php
index dce4c6044..8967608e2 100644
--- a/lib/Doctrine/ORM/Query/Expr.php
+++ b/lib/Doctrine/ORM/Query/Expr.php
@@ -75,7 +75,7 @@ class Expr
      * Creates an ASCending order expression.
      *
      * @param $sort
-     * @return OrderBy
+     * @return Expr\OrderBy
      */
     public function asc($expr)
     {
@@ -86,7 +86,7 @@ class Expr
      * Creates a DESCending order expression.
      *
      * @param $sort
-     * @return OrderBy
+     * @return Expr\OrderBy
      */
     public function desc($expr)
     {
diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php
index 21143214b..c67506d98 100644
--- a/lib/Doctrine/ORM/QueryBuilder.php
+++ b/lib/Doctrine/ORM/QueryBuilder.php
@@ -119,7 +119,7 @@ class QueryBuilder
      * For more complex expression construction, consider storing the expression
      * builder object in a local variable.
      *
-     * @return Expr
+     * @return Query\Expr
      */
     public function expr()
     {

From eac34b6d6a2bb5d81d3722f819a35a6addee133b Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Fri, 23 Dec 2011 14:13:21 -0200
Subject: [PATCH 34/59] test ClassMetadata whit UnderscoreNamingStrategy

---
 lib/Doctrine/ORM/UnderscoreNamingStrategy.php |  5 +--
 .../Tests/ORM/Mapping/ClassMetadataTest.php   | 45 +++++++++++++++++++
 .../Doctrine/Tests/ORM/NamingStrategyTest.php |  6 +++
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/UnderscoreNamingStrategy.php b/lib/Doctrine/ORM/UnderscoreNamingStrategy.php
index 409b4f0ee..b00b15990 100644
--- a/lib/Doctrine/ORM/UnderscoreNamingStrategy.php
+++ b/lib/Doctrine/ORM/UnderscoreNamingStrategy.php
@@ -19,7 +19,6 @@
  */
 
 namespace Doctrine\ORM;
-use Doctrine\Common\Util\Inflector;
 
 /**
  * The default NamingStrategy
@@ -122,12 +121,12 @@ class UnderscoreNamingStrategy implements NamingStrategy
      */
     private function underscore($string)
     {
-        $string = Inflector::tableize($string);
+        $string = preg_replace('/(?<=[a-z])([A-Z])/', '_$1', $string);
 
         if ($this->case == self::CASE_UPPER) {
             return strtoupper($string);
         }
         
-        return $string;
+        return strtolower($string);
     }
 }
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index 7a4de4ca4..da591238d 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -293,6 +293,51 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals('cmsuser_id', $cm->associationMappings['user']['joinTable']['inverseJoinColumns'][0]['name']);
     }
 
+    /**
+     * @group DDC-559
+     */
+    public function testUnderscoreNamingStrategyDefaults()
+    {
+        $namingStrategy     = new \Doctrine\ORM\UnderscoreNamingStrategy(\Doctrine\ORM\UnderscoreNamingStrategy::CASE_UPPER);
+        $oneToOneMetadata   = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);
+        $manyToManyMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);
+
+        $oneToOneMetadata->mapOneToOne(array(
+            'fieldName'     => 'user',
+            'targetEntity'  => 'CmsUser'
+        ));
+
+        $manyToManyMetadata->mapManyToMany(array(
+            'fieldName'     => 'user',
+            'targetEntity'  => 'CmsUser'
+        ));
+        
+        $this->assertEquals(array('USER_ID'=>'ID'), $oneToOneMetadata->associationMappings['user']['sourceToTargetKeyColumns']);
+        $this->assertEquals(array('USER_ID'=>'USER_ID'), $oneToOneMetadata->associationMappings['user']['joinColumnFieldNames']);
+        $this->assertEquals(array('ID'=>'USER_ID'), $oneToOneMetadata->associationMappings['user']['targetToSourceKeyColumns']);
+
+        $this->assertEquals('USER_ID', $oneToOneMetadata->associationMappings['user']['joinColumns'][0]['name']);
+        $this->assertEquals('ID', $oneToOneMetadata->associationMappings['user']['joinColumns'][0]['referencedColumnName']);
+
+        
+        $this->assertEquals('CMS_ADDRESS_CMS_USER', $manyToManyMetadata->associationMappings['user']['joinTable']['name']);
+
+        $this->assertEquals(array('CMS_ADDRESS_ID','CMS_USER_ID'), $manyToManyMetadata->associationMappings['user']['joinTableColumns']);
+        $this->assertEquals(array('CMS_ADDRESS_ID'=>'ID'), $manyToManyMetadata->associationMappings['user']['relationToSourceKeyColumns']);
+        $this->assertEquals(array('CMS_USER_ID'=>'ID'), $manyToManyMetadata->associationMappings['user']['relationToTargetKeyColumns']);
+
+        $this->assertEquals('CMS_ADDRESS_ID', $manyToManyMetadata->associationMappings['user']['joinTable']['joinColumns'][0]['name']);
+        $this->assertEquals('CMS_USER_ID', $manyToManyMetadata->associationMappings['user']['joinTable']['inverseJoinColumns'][0]['name']);
+
+        $this->assertEquals('ID', $manyToManyMetadata->associationMappings['user']['joinTable']['joinColumns'][0]['referencedColumnName']);
+        $this->assertEquals('ID', $manyToManyMetadata->associationMappings['user']['joinTable']['inverseJoinColumns'][0]['referencedColumnName']);
+
+
+        $cm = new ClassMetadata('DoctrineGlobal_Article', $namingStrategy);
+        $cm->mapManyToMany(array('fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser'));
+        $this->assertEquals('DOCTRINE_GLOBAL_ARTICLE_CMS_USER', $cm->associationMappings['author']['joinTable']['name']);
+    }
+
     /**
      * @group DDC-886
      */
diff --git a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
index bf4ab7254..354ea67ff 100644
--- a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
@@ -106,6 +106,12 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
             array(self::underscoreNamingUpper(), 'SOME_PROPERTY',
                 'someProperty'
             ),
+            array(self::underscoreNamingUpper(), 'SOME_PROPERTY',
+                'some_property'
+            ),
+            array(self::underscoreNamingUpper(), 'SOME_PROPERTY',
+                'SOME_PROPERTY'
+            ),
         );
     }
     

From 8bdb7130738df5b7a9c5d8f73e3cbfb72149c909 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Fri, 23 Dec 2011 14:41:03 -0200
Subject: [PATCH 35/59] add support for NamingStrategy

---
 lib/Doctrine/ORM/Configuration.php            | 25 +++++++++++++++++++
 .../ORM/Mapping/ClassMetadataFactory.php      |  2 +-
 .../ORM/Mapping/AbstractMappingDriverTest.php | 23 +++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
index 83b4dc5dd..2b9fb5f7c 100644
--- a/lib/Doctrine/ORM/Configuration.php
+++ b/lib/Doctrine/ORM/Configuration.php
@@ -548,4 +548,29 @@ class Configuration extends \Doctrine\DBAL\Configuration
         return isset($this->_attributes['defaultRepositoryClassName']) ?
                 $this->_attributes['defaultRepositoryClassName'] : 'Doctrine\ORM\EntityRepository';
     }
+
+    /**
+     * Set naming strategy.
+     *
+     * @since 2.3
+     * @param NamingStrategy $namingStrategy
+     */
+    public function setNamingStrategy(NamingStrategy $namingStrategy)
+    {
+        $this->_attributes['namingStrategy'] = $namingStrategy;
+    }
+
+    /**
+     * Get naming strategy..
+     *
+     * @since 2.3
+     * @return NamingStrategy
+     */
+    public function getNamingStrategy()
+    {
+        if (!isset($this->_attributes['namingStrategy'])) {
+            $this->_attributes['namingStrategy'] = new DefaultNamingStrategy();
+        }
+        return $this->_attributes['namingStrategy'];
+    }
 }
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index bf802ecf9..9fd537d6a 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -385,7 +385,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
      */
     protected function newClassMetadataInstance($className)
     {
-        return new ClassMetadata($className);
+        return new ClassMetadata($className, $this->em->getConfiguration()->getNamingStrategy());
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
index 0042259e1..0ddcb5dfb 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
@@ -392,6 +392,29 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals("INT unsigned NOT NULL", $class->fieldMappings['id']['columnDefinition']);
         $this->assertEquals("VARCHAR(255) NOT NULL", $class->fieldMappings['value']['columnDefinition']);
     }
+
+    /**
+     * @group DDC-559
+     */
+    public function testNamingStrategy()
+    {
+        $driver     = $this->_loadDriver();
+        $em         = $this->_getTestEntityManager();
+        $factory    = new \Doctrine\ORM\Mapping\ClassMetadataFactory();
+        $em->getConfiguration()->setMetadataDriverImpl($driver);
+        $factory->setEntityManager($em);
+
+
+        $this->assertInstanceOf('Doctrine\ORM\DefaultNamingStrategy', $em->getConfiguration()->getNamingStrategy());
+        $em->getConfiguration()->setNamingStrategy(new \Doctrine\ORM\UnderscoreNamingStrategy('upper'));
+        $this->assertInstanceOf('Doctrine\ORM\UnderscoreNamingStrategy', $em->getConfiguration()->getNamingStrategy());
+
+        $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType');
+
+        $this->assertEquals('ID', $class->columnNames['id']);
+        $this->assertEquals('NAME', $class->columnNames['name']);
+        $this->assertEquals('DDC1476ENTITY_WITH_DEFAULT_FIELD_TYPE', $class->table['name']);
+    }
 }
 
 /**

From 223577d8b5adc2839e1b048f631850e0447ff719 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Fri, 23 Dec 2011 14:57:43 -0200
Subject: [PATCH 36/59] fix QueryDqlFunctionTest#testFunctionSubstring order

---
 .../ORM/Functional/QueryDqlFunctionTest.php   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
index d62c60a60..7f3180a6c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
@@ -167,20 +167,21 @@ class QueryDqlFunctionTest extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testFunctionSubstring()
     {
         $dql = "SELECT m, SUBSTRING(m.name, 1, 3) AS str1, SUBSTRING(m.name, 5) AS str2 ".
-                "FROM Doctrine\Tests\Models\Company\CompanyManager m";
+                "FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.name";
 
         $result = $this->_em->createQuery($dql)
                          ->getArrayResult();
 
         $this->assertEquals(4, count($result));
-        $this->assertEquals('Rom', $result[0]['str1']);
-        $this->assertEquals('Ben', $result[1]['str1']);
-        $this->assertEquals('Gui', $result[2]['str1']);
-        $this->assertEquals('Jon', $result[3]['str1']);
-        $this->assertEquals('n B.', $result[0]['str2']);
-        $this->assertEquals('amin E.', $result[1]['str2']);
-        $this->assertEquals('herme B.', $result[2]['str2']);
-        $this->assertEquals('than W.', $result[3]['str2']);
+        $this->assertEquals('Ben', $result[0]['str1']);
+        $this->assertEquals('Gui', $result[1]['str1']);
+        $this->assertEquals('Jon', $result[2]['str1']);
+        $this->assertEquals('Rom', $result[3]['str1']);
+        
+        $this->assertEquals('amin E.', $result[0]['str2']);
+        $this->assertEquals('herme B.', $result[1]['str2']);
+        $this->assertEquals('than W.', $result[2]['str2']);
+        $this->assertEquals('n B.', $result[3]['str2']);
     }
 
     public function testFunctionTrim()

From 1eddb53d6c244017601a487df836de870c7f761c Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Sat, 24 Dec 2011 11:45:51 -0200
Subject: [PATCH 37/59] fix CS and use php constants

---
 lib/Doctrine/ORM/Mapping/ClassMetadata.php    |  1 +
 lib/Doctrine/ORM/NamingStrategy.php           | 27 ++++++------
 lib/Doctrine/ORM/UnderscoreNamingStrategy.php | 26 ++++++------
 .../ORM/Mapping/AbstractMappingDriverTest.php |  2 +-
 .../Tests/ORM/Mapping/ClassMetadataTest.php   |  2 +-
 .../Doctrine/Tests/ORM/NamingStrategyTest.php | 42 +++++++++----------
 6 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index a2e50d536..916b94511 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -23,6 +23,7 @@ use ReflectionClass, ReflectionProperty;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
 use Doctrine\ORM\DefaultNamingStrategy;
 use Doctrine\ORM\NamingStrategy;
+
 /**
  * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
  * of an entity and it's associations.
diff --git a/lib/Doctrine/ORM/NamingStrategy.php b/lib/Doctrine/ORM/NamingStrategy.php
index 641f4d346..a0147e76a 100644
--- a/lib/Doctrine/ORM/NamingStrategy.php
+++ b/lib/Doctrine/ORM/NamingStrategy.php
@@ -30,52 +30,53 @@ namespace Doctrine\ORM;
  */
 interface NamingStrategy
 {
-
     /**
      * Return a table name for an entity class
      *
-     * @param   string  $className  The fully-qualified class name
-     * @return  string              A table name
+     * @param string $className The fully-qualified class name
+     * @return string A table name
      */
     function classToTableName($className);
 
     /**
      * Return a column name for a property
      *
-     * @param   string  $propertyName   A property
-     * @return  string                  A column name
+     * @param string $propertyName A property
+     * @return string A column name
      */
     function propertyToColumnName($propertyName);
 
     /**
      * Return the default reference column name
      *
-     * @return  string              A column name
+     * @return string A column name
      */
     function referenceColumnName();
 
      /**
      * Return a join column name for a property
      *
-     * @param   string $propertyName    A property
-     * @return  string                  A column name
+     * @param string $propertyName A property
+     * @return string A join column name
      */
     function joinColumnName($propertyName);
 
     /**
      * Return a join table name
      *
-     * @param string   $sourceEntity
-     * @param string   $targetEntity
-     * @param string   $propertyName
+     * @param string $sourceEntity The source entity
+     * @param string $targetEntity The target entity
+     * @param string $propertyName A property
+     * @return string A join table name
      */
     function joinTableName($sourceEntity, $targetEntity, $propertyName = null);
 
      /**
      * Return the foreign key column name for the given parameters
      *
-     * @param string   $entityName
-     * @param string   $referencedColumnName
+     * @param string $entityName A entity
+     * @param string $referencedColumnName A property
+     * @return string A join column name
      */
     function joinKeyColumnName($entityName, $referencedColumnName = null);
 }
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/UnderscoreNamingStrategy.php b/lib/Doctrine/ORM/UnderscoreNamingStrategy.php
index b00b15990..e9d60842a 100644
--- a/lib/Doctrine/ORM/UnderscoreNamingStrategy.php
+++ b/lib/Doctrine/ORM/UnderscoreNamingStrategy.php
@@ -30,24 +30,23 @@ namespace Doctrine\ORM;
  */
 class UnderscoreNamingStrategy implements NamingStrategy
 {
-    const CASE_LOWER = 'lower';
-    const CASE_UPPER = 'upper';
-
     /**
      * @var string
      */
     private $case;
 
     /**
-     * @param string $case
+     * Underscore naming strategy construct
+     *
+     * @param integer $case CASE_LOWER | CASE_UPPER
      */
-    public function __construct($case = self::CASE_LOWER)
+    public function __construct($case = CASE_LOWER)
     {
         $this->case = $case;
     }
 
     /**
-     * @return string
+     * @return integer
      */
     public function getCase()
     {
@@ -55,7 +54,10 @@ class UnderscoreNamingStrategy implements NamingStrategy
     }
 
     /**
-     * @param string $case
+     * Sets string case CASE_LOWER | CASE_UPPER
+     * Alphabetic characters converted to lowercase or uppercase
+     * 
+     * @param integer $case
      */
     public function setCase($case)
     {
@@ -87,7 +89,7 @@ class UnderscoreNamingStrategy implements NamingStrategy
      */
     public function referenceColumnName()
     {
-        return $this->case == self::CASE_UPPER ?  'ID' : 'id';
+        return $this->case === CASE_UPPER ?  'ID' : 'id';
     }
 
     /**
@@ -116,17 +118,17 @@ class UnderscoreNamingStrategy implements NamingStrategy
     }
     
     /**
-     * @param   string $string
-     * @return  string
+     * @param string $string
+     * @return string
      */
     private function underscore($string)
     {
         $string = preg_replace('/(?<=[a-z])([A-Z])/', '_$1', $string);
 
-        if ($this->case == self::CASE_UPPER) {
+        if ($this->case === CASE_UPPER) {
             return strtoupper($string);
         }
-        
+
         return strtolower($string);
     }
 }
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
index 0ddcb5dfb..491bee220 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
@@ -406,7 +406,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
 
 
         $this->assertInstanceOf('Doctrine\ORM\DefaultNamingStrategy', $em->getConfiguration()->getNamingStrategy());
-        $em->getConfiguration()->setNamingStrategy(new \Doctrine\ORM\UnderscoreNamingStrategy('upper'));
+        $em->getConfiguration()->setNamingStrategy(new \Doctrine\ORM\UnderscoreNamingStrategy(CASE_UPPER));
         $this->assertInstanceOf('Doctrine\ORM\UnderscoreNamingStrategy', $em->getConfiguration()->getNamingStrategy());
 
         $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType');
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index da591238d..a77b73508 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -298,7 +298,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
      */
     public function testUnderscoreNamingStrategyDefaults()
     {
-        $namingStrategy     = new \Doctrine\ORM\UnderscoreNamingStrategy(\Doctrine\ORM\UnderscoreNamingStrategy::CASE_UPPER);
+        $namingStrategy     = new \Doctrine\ORM\UnderscoreNamingStrategy(CASE_UPPER);
         $oneToOneMetadata   = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);
         $manyToManyMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);
 
diff --git a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
index 354ea67ff..ecaeeb845 100644
--- a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
@@ -26,7 +26,7 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
      */
     static private function underscoreNamingLower()
     {
-        return new UnderscoreNamingStrategy(UnderscoreNamingStrategy::CASE_LOWER);
+        return new UnderscoreNamingStrategy(CASE_LOWER);
     }
 
     /**
@@ -34,7 +34,7 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
      */
     static private function underscoreNamingUpper()
     {
-        return new UnderscoreNamingStrategy(UnderscoreNamingStrategy::CASE_UPPER);
+        return new UnderscoreNamingStrategy(CASE_UPPER);
     }
 
     /**
@@ -118,9 +118,9 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     /**
      * @dataProvider dataPropertyToColumnName
      *
-     * @param NamingStrategy    $strategy
-     * @param string            $expected
-     * @param string            $propertyName
+     * @param NamingStrategy $strategy
+     * @param string $expected
+     * @param string $propertyName
      */
     public function testPropertyToColumnName(NamingStrategy $strategy, $expected, $propertyName)
     {
@@ -147,10 +147,8 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     /**
      * @dataProvider dataReferenceColumnName
      *
-     * @param NamingStrategy    $strategy
-     * @param string            $expected
-     * @param string            $joinedColumn
-     * @param string            $joinedTable
+     * @param NamingStrategy $strategy
+     * @param string $expected
      */
     public function testReferenceColumnName(NamingStrategy $strategy, $expected)
     {
@@ -186,9 +184,9 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     /**
      * @dataProvider dataJoinColumnName
      *
-     * @param NamingStrategy    $strategy
-     * @param string            $expected
-     * @param string            $propertyName
+     * @param NamingStrategy $strategy
+     * @param string $expected
+     * @param string $propertyName
      */
     public function testJoinColumnName(NamingStrategy $strategy, $expected, $propertyName)
     {
@@ -240,11 +238,11 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     /**
      * @dataProvider dataJoinTableName
      *
-     * @param NamingStrategy    $strategy
-     * @param string            $expected
-     * @param string            $ownerEntity
-     * @param string            $associatedEntity
-     * @param string            $propertyName
+     * @param NamingStrategy $strategy
+     * @param string $expected
+     * @param string $ownerEntity
+     * @param string $associatedEntity
+     * @param string $propertyName
      */
     public function testJoinTableName(NamingStrategy $strategy, $expected, $ownerEntity, $associatedEntity, $propertyName = null)
     {
@@ -287,11 +285,11 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     /**
      * @dataProvider dataJoinKeyColumnName
      *
-     * @param NamingStrategy    $strategy
-     * @param string            $expected
-     * @param string            $propertyEntityName
-     * @param string            $referencedColumnName
-     * @param string            $propertyName
+     * @param NamingStrategy $strategy
+     * @param string $expected
+     * @param string $propertyEntityName
+     * @param string $referencedColumnName
+     * @param string $propertyName
      */
     public function testJoinKeyColumnName(NamingStrategy $strategy, $expected, $propertyEntityName, $referencedColumnName = null, $propertyName = null)
     {

From e3acf43dbc94fb1fd2ee24da833a59168e9b2a08 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Sat, 24 Dec 2011 12:01:25 -0200
Subject: [PATCH 38/59] move naming classes to Doctrine\ORM\Mapping

---
 lib/Doctrine/ORM/Configuration.php                     |  4 +++-
 lib/Doctrine/ORM/Mapping/ClassMetadata.php             |  2 --
 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php         |  2 --
 .../ORM/{ => Mapping}/DefaultNamingStrategy.php        |  2 +-
 lib/Doctrine/ORM/{ => Mapping}/NamingStrategy.php      |  2 +-
 .../ORM/{ => Mapping}/UnderscoreNamingStrategy.php     |  2 +-
 .../Tests/ORM/Mapping/AbstractMappingDriverTest.php    |  6 +++---
 tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php |  2 +-
 .../Tests/ORM/{ => Mapping}/NamingStrategyTest.php     | 10 +++++-----
 9 files changed, 15 insertions(+), 17 deletions(-)
 rename lib/Doctrine/ORM/{ => Mapping}/DefaultNamingStrategy.php (98%)
 rename lib/Doctrine/ORM/{ => Mapping}/NamingStrategy.php (98%)
 rename lib/Doctrine/ORM/{ => Mapping}/UnderscoreNamingStrategy.php (99%)
 rename tests/Doctrine/Tests/ORM/{ => Mapping}/NamingStrategyTest.php (97%)

diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
index 2b9fb5f7c..7a3f7fdec 100644
--- a/lib/Doctrine/ORM/Configuration.php
+++ b/lib/Doctrine/ORM/Configuration.php
@@ -24,7 +24,9 @@ use Doctrine\Common\Cache\Cache,
     Doctrine\Common\Annotations\AnnotationRegistry,
     Doctrine\Common\Annotations\AnnotationReader,
     Doctrine\ORM\Mapping\Driver\Driver,
-    Doctrine\ORM\Mapping\Driver\AnnotationDriver;
+    Doctrine\ORM\Mapping\Driver\AnnotationDriver,
+    Doctrine\ORM\Mapping\NamingStrategy,
+    Doctrine\ORM\Mapping\DefaultNamingStrategy;
 
 /**
  * Configuration container for all configuration options of Doctrine.
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index 916b94511..a5410c748 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -21,8 +21,6 @@ namespace Doctrine\ORM\Mapping;
 
 use ReflectionClass, ReflectionProperty;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
-use Doctrine\ORM\DefaultNamingStrategy;
-use Doctrine\ORM\NamingStrategy;
 
 /**
  * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 7a845e754..50b2fdb4b 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -21,8 +21,6 @@ namespace Doctrine\ORM\Mapping;
 
 use Doctrine\DBAL\Types\Type;
 use ReflectionClass;
-use Doctrine\ORM\DefaultNamingStrategy;
-use Doctrine\ORM\NamingStrategy;
 
 /**
  * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
diff --git a/lib/Doctrine/ORM/DefaultNamingStrategy.php b/lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
similarity index 98%
rename from lib/Doctrine/ORM/DefaultNamingStrategy.php
rename to lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
index 4d5a5b943..5bfe31577 100644
--- a/lib/Doctrine/ORM/DefaultNamingStrategy.php
+++ b/lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM;
+namespace Doctrine\ORM\Mapping;
 
 /**
  * The default NamingStrategy
diff --git a/lib/Doctrine/ORM/NamingStrategy.php b/lib/Doctrine/ORM/Mapping/NamingStrategy.php
similarity index 98%
rename from lib/Doctrine/ORM/NamingStrategy.php
rename to lib/Doctrine/ORM/Mapping/NamingStrategy.php
index a0147e76a..36dd1234a 100644
--- a/lib/Doctrine/ORM/NamingStrategy.php
+++ b/lib/Doctrine/ORM/Mapping/NamingStrategy.php
@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM;
+namespace Doctrine\ORM\Mapping;
 
 /**
  * A set of rules for determining the physical column and table names
diff --git a/lib/Doctrine/ORM/UnderscoreNamingStrategy.php b/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
similarity index 99%
rename from lib/Doctrine/ORM/UnderscoreNamingStrategy.php
rename to lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
index e9d60842a..4b2a9a9da 100644
--- a/lib/Doctrine/ORM/UnderscoreNamingStrategy.php
+++ b/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM;
+namespace Doctrine\ORM\Mapping;
 
 /**
  * The default NamingStrategy
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
index 491bee220..5ad1b65d2 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
@@ -405,9 +405,9 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $factory->setEntityManager($em);
 
 
-        $this->assertInstanceOf('Doctrine\ORM\DefaultNamingStrategy', $em->getConfiguration()->getNamingStrategy());
-        $em->getConfiguration()->setNamingStrategy(new \Doctrine\ORM\UnderscoreNamingStrategy(CASE_UPPER));
-        $this->assertInstanceOf('Doctrine\ORM\UnderscoreNamingStrategy', $em->getConfiguration()->getNamingStrategy());
+        $this->assertInstanceOf('Doctrine\ORM\Mapping\DefaultNamingStrategy', $em->getConfiguration()->getNamingStrategy());
+        $em->getConfiguration()->setNamingStrategy(new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy(CASE_UPPER));
+        $this->assertInstanceOf('Doctrine\ORM\Mapping\UnderscoreNamingStrategy', $em->getConfiguration()->getNamingStrategy());
 
         $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType');
 
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index a77b73508..8b8392efb 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -298,7 +298,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
      */
     public function testUnderscoreNamingStrategyDefaults()
     {
-        $namingStrategy     = new \Doctrine\ORM\UnderscoreNamingStrategy(CASE_UPPER);
+        $namingStrategy     = new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy(CASE_UPPER);
         $oneToOneMetadata   = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);
         $manyToManyMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);
 
diff --git a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
similarity index 97%
rename from tests/Doctrine/Tests/ORM/NamingStrategyTest.php
rename to tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
index ecaeeb845..0c56aa810 100644
--- a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Doctrine\Tests\ORM;
+namespace Doctrine\Tests\ORM\Mapping;
 
-use Doctrine\ORM\UnderscoreNamingStrategy;
-use Doctrine\ORM\DefaultNamingStrategy;
-use Doctrine\ORM\NamingStrategy;
+use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
+use Doctrine\ORM\Mapping\DefaultNamingStrategy;
+use Doctrine\ORM\Mapping\NamingStrategy;
 
-require_once __DIR__ . '/../TestInit.php';
+require_once __DIR__ . '/../../TestInit.php';
 
 /**
  * @group DDC-559

From 603f7a1664bfc4f619db1390b443873496a6ba9b Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Sat, 24 Dec 2011 12:34:49 -0200
Subject: [PATCH 39/59] fix indentation

---
 lib/Doctrine/ORM/Mapping/NamingStrategy.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/NamingStrategy.php b/lib/Doctrine/ORM/Mapping/NamingStrategy.php
index 36dd1234a..8a7cbb335 100644
--- a/lib/Doctrine/ORM/Mapping/NamingStrategy.php
+++ b/lib/Doctrine/ORM/Mapping/NamingStrategy.php
@@ -53,7 +53,7 @@ interface NamingStrategy
      */
     function referenceColumnName();
 
-     /**
+    /**
      * Return a join column name for a property
      *
      * @param string $propertyName A property
@@ -71,7 +71,7 @@ interface NamingStrategy
      */
     function joinTableName($sourceEntity, $targetEntity, $propertyName = null);
 
-     /**
+    /**
      * Return the foreign key column name for the given parameters
      *
      * @param string $entityName A entity

From ff4ed93707e420a94beade12652db77d7b5ca1b8 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Tue, 27 Dec 2011 09:53:09 -0200
Subject: [PATCH 40/59] fix typo

---
 lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php b/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
index 4b2a9a9da..44969d3d3 100644
--- a/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
+++ b/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
@@ -21,7 +21,8 @@
 namespace Doctrine\ORM\Mapping;
 
 /**
- * The default NamingStrategy
+ * Naming strategy implementing the underscore naming convention.
+ * Converts 'MyEntity' to 'my_entity' or 'MY_ENTITY'.
  *
  * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link    www.doctrine-project.org
@@ -31,7 +32,7 @@ namespace Doctrine\ORM\Mapping;
 class UnderscoreNamingStrategy implements NamingStrategy
 {
     /**
-     * @var string
+     * @var integer
      */
     private $case;
 

From bd49aa5d2c23be6e5d5f829bb9dce58deb28130c Mon Sep 17 00:00:00 2001
From: Adrien BRAULT <monsti@gmail.com>
Date: Fri, 23 Dec 2011 17:05:08 +0100
Subject: [PATCH 41/59] Fix some PHPDoc @return type.

---
 lib/Doctrine/ORM/Query/Expr.php   | 4 ++--
 lib/Doctrine/ORM/QueryBuilder.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Expr.php b/lib/Doctrine/ORM/Query/Expr.php
index dce4c6044..8967608e2 100644
--- a/lib/Doctrine/ORM/Query/Expr.php
+++ b/lib/Doctrine/ORM/Query/Expr.php
@@ -75,7 +75,7 @@ class Expr
      * Creates an ASCending order expression.
      *
      * @param $sort
-     * @return OrderBy
+     * @return Expr\OrderBy
      */
     public function asc($expr)
     {
@@ -86,7 +86,7 @@ class Expr
      * Creates a DESCending order expression.
      *
      * @param $sort
-     * @return OrderBy
+     * @return Expr\OrderBy
      */
     public function desc($expr)
     {
diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php
index 21143214b..c67506d98 100644
--- a/lib/Doctrine/ORM/QueryBuilder.php
+++ b/lib/Doctrine/ORM/QueryBuilder.php
@@ -119,7 +119,7 @@ class QueryBuilder
      * For more complex expression construction, consider storing the expression
      * builder object in a local variable.
      *
-     * @return Expr
+     * @return Query\Expr
      */
     public function expr()
     {

From 21cfe4ba9f88dacc346b4060d78d84bafe0f29d2 Mon Sep 17 00:00:00 2001
From: holtkamp <menno.holtkamp@gmail.com>
Date: Thu, 22 Dec 2011 09:38:55 -0200
Subject: [PATCH 42/59] Allow ExporterDrivers that implement the
 exportClassMetadata() function to return FALSE when no content is
 available/needs to be written to a file by the AbstractExporter, preventing
 empty files to be generated foreach processed ClassMetadataInfo instance.

---
 .../Tools/Export/Driver/AbstractExporter.php  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
index 14f654130..41ec6fdf6 100644
--- a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
+++ b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
@@ -111,16 +111,18 @@ abstract class AbstractExporter
         }
 
         foreach ($this->_metadata as $metadata) {
-            $output = $this->exportClassMetadata($metadata);
-            $path = $this->_generateOutputPath($metadata);
-            $dir = dirname($path);
-            if ( ! is_dir($dir)) {
-                mkdir($dir, 0777, true);
+            //In case output is returned, write it to a file, skip otherwise
+            if($output = $this->exportClassMetadata($metadata)){
+                $path = $this->_generateOutputPath($metadata);
+                $dir = dirname($path);
+                if ( ! is_dir($dir)) {
+                    mkdir($dir, 0777, true);
+                }
+                if (file_exists($path) && !$this->_overwriteExistingFiles) {
+                    throw ExportException::attemptOverwriteExistingFile($path);
+                }
+                file_put_contents($path, $output);
             }
-            if (file_exists($path) && !$this->_overwriteExistingFiles) {
-                throw ExportException::attemptOverwriteExistingFile($path);
-            }
-            file_put_contents($path, $output);
         }
     }
 

From 9d398afa569e2cc5dd4e35e8e7006b18afa14a32 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Wed, 28 Dec 2011 20:28:17 +0100
Subject: [PATCH 43/59] DDC-1360 - Bugfix in quoting mechanism inside
 ClassMetadataInfo

---
 .../ORM/Mapping/ClassMetadataInfo.php         |  2 +-
 .../ORM/Functional/Ticket/DDC1360Test.php     | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 50b2fdb4b..694b76d71 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -1376,7 +1376,7 @@ class ClassMetadataInfo
     {
         if (isset($table['name'])) {
             if ($table['name'][0] == '`') {
-                $this->table['name'] = trim($table['name'], '`');
+                $this->table['name'] = str_replace("`", "", $table['name']);
                 $this->table['quoted'] = true;
             } else {
                 $this->table['name'] = $table['name'];
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php
new file mode 100644
index 000000000..f95f77eb4
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * @group DDC-1360
+ */
+class DDC1360Test extends OrmFunctionalTestCase
+{
+    public function testSchemaDoubleQuotedCreate()
+    {
+        if ($this->_em->getConnection()->getDatabasePlatform()->getName() != "postgresql") {
+            $this->markTestSkipped("PostgreSQL only test.");
+        }
+
+        $sql = $this->_schemaTool->getCreateSchemaSQL(array(
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1360DoubleQuote')
+        ));
+
+        $this->assertEquals(array(
+            'CREATE TABLE "user"."user" (id INT NOT NULL, PRIMARY KEY(id))',
+            'CREATE SEQUENCE "user".user_id_seq INCREMENT BY 1 MINVALUE 1 START 1',
+        ), $sql);
+    }
+}
+
+/**
+ * @Entity @Table(name="`user`.`user`")
+ */
+class DDC1360DoubleQuote
+{
+    /** @Id @GeneratedValue @Column(type="integer") */
+    public $id;
+}
+

From a6deb51a0547efec163d9b57a1571af54accb2f1 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Wed, 28 Dec 2011 20:28:17 +0100
Subject: [PATCH 44/59] DDC-1360 - Bugfix in quoting mechanism inside
 ClassMetadataInfo

---
 .../ORM/Mapping/ClassMetadataInfo.php         |  2 +-
 .../ORM/Functional/Ticket/DDC1360Test.php     | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 6fbf8b3c6..56dd16385 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -1378,7 +1378,7 @@ class ClassMetadataInfo
     {
         if (isset($table['name'])) {
             if ($table['name'][0] == '`') {
-                $this->table['name'] = trim($table['name'], '`');
+                $this->table['name'] = str_replace("`", "", $table['name']);
                 $this->table['quoted'] = true;
             } else {
                 $this->table['name'] = $table['name'];
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php
new file mode 100644
index 000000000..f95f77eb4
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * @group DDC-1360
+ */
+class DDC1360Test extends OrmFunctionalTestCase
+{
+    public function testSchemaDoubleQuotedCreate()
+    {
+        if ($this->_em->getConnection()->getDatabasePlatform()->getName() != "postgresql") {
+            $this->markTestSkipped("PostgreSQL only test.");
+        }
+
+        $sql = $this->_schemaTool->getCreateSchemaSQL(array(
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1360DoubleQuote')
+        ));
+
+        $this->assertEquals(array(
+            'CREATE TABLE "user"."user" (id INT NOT NULL, PRIMARY KEY(id))',
+            'CREATE SEQUENCE "user".user_id_seq INCREMENT BY 1 MINVALUE 1 START 1',
+        ), $sql);
+    }
+}
+
+/**
+ * @Entity @Table(name="`user`.`user`")
+ */
+class DDC1360DoubleQuote
+{
+    /** @Id @GeneratedValue @Column(type="integer") */
+    public $id;
+}
+

From 82bea24426a99defb07a0c4f9c810c391cd09add Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kim=20Hems=C3=B8=20Rasmussen?= <kimhemsoe@gmail.com>
Date: Thu, 29 Dec 2011 02:05:54 +0100
Subject: [PATCH 45/59] Fixed DDC214 test.

---
 tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
index eae3d4b88..9b428c71e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
@@ -36,7 +36,8 @@ class DDC214Test extends \Doctrine\Tests\OrmFunctionalTestCase
             'Doctrine\Tests\Models\CMS\CmsPhonenumber',
             'Doctrine\Tests\Models\CMS\CmsAddress',
             'Doctrine\Tests\Models\CMS\CmsGroup',
-            'Doctrine\Tests\Models\CMS\CmsArticle'
+            'Doctrine\Tests\Models\CMS\CmsArticle',
+            'Doctrine\Tests\Models\CMS\CmsEmail',
         );
 
         $this->assertCreatedSchemaNeedsNoUpdates($this->classes);

From 4cc61bf2eeaee9212f105941256be35c5eaa0404 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Thu, 29 Dec 2011 14:30:29 -0200
Subject: [PATCH 46/59] fix DDC-1557

---
 lib/Doctrine/ORM/Query/Parser.php             | 12 ++++++++++++
 .../ORM/Query/SelectSqlGenerationTest.php     | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index 420083680..a6ad5bebe 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -2004,6 +2004,18 @@ class Parser
 
                         return new AST\SimpleSelectExpression($expression);
 
+                    case ($this->_isFunction()):
+                        // SUM(u.id) + COUNT(u.id)
+                        if ($this->_isMathOperator($this->_peekBeyondClosingParenthesis())) {
+                            return new AST\SimpleSelectExpression($this->ScalarExpression());
+                        }
+                        // COUNT(u.id)
+                        if ($this->_isAggregateFunction($this->_lexer->lookahead['type'])) {
+                            return new AST\SimpleSelectExpression($this->AggregateExpression());
+                        }
+                        // IDENTITY(u)
+                        return new AST\SimpleSelectExpression($this->FunctionDeclaration());
+
                     default:
                         // Do nothing
                 }
diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
index a079e6574..d54b8d97b 100644
--- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
@@ -1434,6 +1434,25 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
         );
     }
 
+    /**
+     * @group DDC-1557
+     */
+    public function testSupportsSubSqlFunction()
+    {
+        $this->assertSqlGeneration(
+            'SELECT u1 FROM Doctrine\Tests\Models\CMS\CmsUser u1 WHERE u1.name IN ( SELECT TRIM(u2.name) FROM Doctrine\Tests\Models\CMS\CmsUser u2 )',
+            'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE c0_.name IN (SELECT TRIM(c1_.name) AS sclr4 FROM cms_users c1_)'
+        );
+        $this->assertSqlGeneration(
+            'SELECT u1 FROM Doctrine\Tests\Models\CMS\CmsUser u1 WHERE u1.name IN ( SELECT TRIM(u2.name) FROM Doctrine\Tests\Models\CMS\CmsUser u2  WHERE LOWER(u2.name) LIKE \'%fabio%\')',
+            'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE c0_.name IN (SELECT TRIM(c1_.name) AS sclr4 FROM cms_users c1_ WHERE LOWER(c1_.name) LIKE \'%fabio%\')'
+        );
+        $this->assertSqlGeneration(
+            'SELECT u1 FROM Doctrine\Tests\Models\CMS\CmsUser u1 WHERE u1.email IN ( SELECT TRIM(IDENTITY(u2.email)) FROM Doctrine\Tests\Models\CMS\CmsUser u2 )',
+            'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE c0_.email_id IN (SELECT TRIM(c1_.email_id) AS sclr4 FROM cms_users c1_)'
+        );
+    }
+
     public function testCustomTypeValueSql()
     {
         if (DBALType::hasType('negative_to_positive')) {

From bf8924df14aaa2d658c3870940ee8190745c7f1f Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Thu, 29 Dec 2011 14:47:23 -0200
Subject: [PATCH 47/59] some tests

---
 .../Tests/ORM/Query/SelectSqlGenerationTest.php      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
index d54b8d97b..7b1064c6e 100644
--- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
@@ -1451,6 +1451,18 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             'SELECT u1 FROM Doctrine\Tests\Models\CMS\CmsUser u1 WHERE u1.email IN ( SELECT TRIM(IDENTITY(u2.email)) FROM Doctrine\Tests\Models\CMS\CmsUser u2 )',
             'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE c0_.email_id IN (SELECT TRIM(c1_.email_id) AS sclr4 FROM cms_users c1_)'
         );
+        $this->assertSqlGeneration(
+            'SELECT u1 FROM Doctrine\Tests\Models\CMS\CmsUser u1 WHERE u1.email IN ( SELECT IDENTITY(u2.email) FROM Doctrine\Tests\Models\CMS\CmsUser u2 )',
+            'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE c0_.email_id IN (SELECT c1_.email_id AS sclr4 FROM cms_users c1_)'
+        );
+        $this->assertSqlGeneration(
+            'SELECT u1 FROM Doctrine\Tests\Models\CMS\CmsUser u1 WHERE COUNT(u1.id) = ( SELECT SUM(u2.id) FROM Doctrine\Tests\Models\CMS\CmsUser u2 )',
+            'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE COUNT(c0_.id) = (SELECT SUM(c1_.id) AS dctrn__1 FROM cms_users c1_)'
+        );
+        $this->assertSqlGeneration(
+            'SELECT u1 FROM Doctrine\Tests\Models\CMS\CmsUser u1 WHERE COUNT(u1.id) <= ( SELECT SUM(u2.id) + COUNT(u2.email) FROM Doctrine\Tests\Models\CMS\CmsUser u2 )',
+            'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE COUNT(c0_.id) <= (SELECT SUM(c1_.id) + COUNT(c1_.email_id) AS sclr4 FROM cms_users c1_)'
+        );
     }
 
     public function testCustomTypeValueSql()

From ae4321b4e300b4f45194552a3c748ca1558ecce0 Mon Sep 17 00:00:00 2001
From: Miloslav Kmet <miloslav.kmet@gmail.com>
Date: Thu, 29 Dec 2011 15:39:32 +0100
Subject: [PATCH 48/59] [DDC-1572] Allow LIKE pattern to be a function or path
 expression

---
 lib/Doctrine/ORM/Query/Parser.php                 |  5 ++---
 lib/Doctrine/ORM/Query/SqlWalker.php              |  4 ++++
 .../Tests/ORM/Query/SelectSqlGenerationTest.php   | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index 420083680..4b7e18934 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -2813,7 +2813,7 @@ class Parser
     }
 
     /**
-     * LikeExpression ::= StringExpression ["NOT"] "LIKE" (string | input_parameter) ["ESCAPE" char]
+     * LikeExpression ::= StringExpression ["NOT"] "LIKE" StringPrimary ["ESCAPE" char]
      *
      * @return \Doctrine\ORM\Query\AST\LikeExpression
      */
@@ -2833,8 +2833,7 @@ class Parser
             $this->match(Lexer::T_INPUT_PARAMETER);
             $stringPattern = new AST\InputParameter($this->_lexer->token['value']);
         } else {
-            $this->match(Lexer::T_STRING);
-            $stringPattern = $this->_lexer->token['value'];
+            $stringPattern = $this->StringPrimary();
         }
 
         $escapeChar = null;
diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
index 0bc437a98..47263517c 100644
--- a/lib/Doctrine/ORM/Query/SqlWalker.php
+++ b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -1947,6 +1947,10 @@ class SqlWalker implements TreeWalker
             $dqlParamKey = $inputParam->name;
             $this->_parserResult->addParameterMapping($dqlParamKey, $this->_sqlParamIndex++);
             $sql .= '?';
+        } elseif ($likeExpr->stringPattern instanceof AST\Functions\FunctionNode ) {
+            $sql .= $this->walkFunction($likeExpr->stringPattern);
+        } elseif ($likeExpr->stringPattern instanceof AST\PathExpression) {
+            $sql .= $this->walkPathExpression($likeExpr->stringPattern);
         } else {
             $sql .= $this->_conn->quote($likeExpr->stringPattern);
         }
diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
index a079e6574..784d2a8c8 100644
--- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
@@ -822,6 +822,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
 
     /**
      * @group DDC-339
+     * @group DDC-1572
      */
     public function testStringFunctionLikeExpression()
     {
@@ -837,6 +838,20 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             "SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(UPPER(u.name), '_moo') LIKE :str",
             "SELECT c0_.name AS name0 FROM cms_users c0_ WHERE UPPER(c0_.name) || '_moo' LIKE ?"
         );
+
+        // DDC-1572
+        $this->assertSqlGeneration(
+            "SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE UPPER(u.name) LIKE UPPER(:str)",
+            "SELECT c0_.name AS name0 FROM cms_users c0_ WHERE UPPER(c0_.name) LIKE UPPER(?)"
+        );
+        $this->assertSqlGeneration(
+            "SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE UPPER(LOWER(u.name)) LIKE UPPER(LOWER(:str))",
+            "SELECT c0_.name AS name0 FROM cms_users c0_ WHERE UPPER(LOWER(c0_.name)) LIKE UPPER(LOWER(?))"
+        );
+        $this->assertSqlGeneration(
+            "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles a WITH a.topic LIKE u.name",
+            "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ LEFT JOIN cms_articles c1_ ON c0_.id = c1_.user_id AND (c1_.topic LIKE c0_.name)"
+        );
     }
 
     /**

From ab4482b61744596f879e84cd87b41217ad610382 Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Thu, 29 Dec 2011 17:05:44 -0200
Subject: [PATCH 49/59] update docblock

---
 lib/Doctrine/ORM/Query/Parser.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index a6ad5bebe..dfda6ee8a 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -1981,9 +1981,10 @@ class Parser
     }
 
     /**
-     * SimpleSelectExpression ::=
-     *      StateFieldPathExpression | IdentificationVariable |
-     *      ((AggregateExpression | "(" Subselect ")" | ScalarExpression) [["AS"] AliasResultVariable])
+     * SimpleSelectExpression ::= (
+     *      StateFieldPathExpression | IdentificationVariable | FunctionDeclaration |
+     *      AggregateExpression | "(" Subselect ")" | ScalarExpression
+     * ) [["AS"] AliasResultVariable]
      *
      * @return \Doctrine\ORM\Query\AST\SimpleSelectExpression
      */

From 12c3a42d8cc9193cf1fba55ca25e9088b428c53b Mon Sep 17 00:00:00 2001
From: Jan Dolecek <juzna.cz@gmail.com>
Date: Fri, 30 Dec 2011 18:40:19 +0100
Subject: [PATCH 50/59] fixed phpDoc and typos

---
 lib/Doctrine/ORM/AbstractQuery.php                       | 2 +-
 lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php | 9 +++++----
 lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php   | 4 ++--
 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php           | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php
index 3fe27f93b..d57e6335a 100644
--- a/lib/Doctrine/ORM/AbstractQuery.php
+++ b/lib/Doctrine/ORM/AbstractQuery.php
@@ -605,7 +605,7 @@ abstract class AbstractQuery
 
     /**
      * Set the result cache id to use to store the result set cache entry.
-     * If this is not explicitely set by the developer then a hash is automatically
+     * If this is not explicitly set by the developer then a hash is automatically
      * generated for you.
      *
      * @param string $id
diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
index a0a71922a..b58bfb933 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
@@ -36,22 +36,22 @@ use PDO,
  */
 abstract class AbstractHydrator
 {
-    /** @var ResultSetMapping The ResultSetMapping. */
+    /** @var \Doctrine\ORM\Query\ResultSetMapping The ResultSetMapping. */
     protected $_rsm;
 
     /** @var EntityManager The EntityManager instance. */
     protected $_em;
 
-    /** @var AbstractPlatform The dbms Platform instance */
+    /** @var \Doctrine\DBAL\Platforms\AbstractPlatform The dbms Platform instance */
     protected $_platform;
 
-    /** @var UnitOfWork The UnitOfWork of the associated EntityManager. */
+    /** @var \Doctrine\ORM\UnitOfWork The UnitOfWork of the associated EntityManager. */
     protected $_uow;
 
     /** @var array The cache used during row-by-row hydration. */
     protected $_cache = array();
 
-    /** @var Statement The statement that provides the data to hydrate. */
+    /** @var \Doctrine\DBAL\Driver\Statement The statement that provides the data to hydrate. */
     protected $_stmt;
 
     /** @var array The query hints. */
@@ -93,6 +93,7 @@ abstract class AbstractHydrator
      *
      * @param object $stmt
      * @param object $resultSetMapping
+     * @param array $hints
      * @return mixed
      */
     public function hydrateAll($stmt, $resultSetMapping, array $hints = array())
diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
index 838e9ef8c..5595727b0 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
@@ -208,8 +208,8 @@ class ObjectHydrator extends AbstractHydrator
     /**
      * Gets an entity instance.
      *
-     * @param $data The instance data.
-     * @param $dqlAlias The DQL alias of the entity's class.
+     * @param array $data The instance data.
+     * @param string $dqlAlias The DQL alias of the entity's class.
      * @return object The entity.
      */
     private function _getEntity(array $data, $dqlAlias)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 6fbf8b3c6..9e2447acd 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -422,7 +422,7 @@ class ClassMetadataInfo
     /**
      * READ-ONLY: The ID generator used for generating IDs for this class.
      *
-     * @var AbstractIdGenerator
+     * @var \Doctrine\ORM\Id\AbstractIdGenerator
      * @todo Remove!
      */
     public $idGenerator;

From 9a0d36ae869955ee0e0d554f1962b4eea7f36149 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 15:13:48 +0100
Subject: [PATCH 51/59] Fix Version

---
 lib/Doctrine/ORM/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php
index e8124cd45..135c546ac 100644
--- a/lib/Doctrine/ORM/Version.php
+++ b/lib/Doctrine/ORM/Version.php
@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.2.0-DEV';
+    const VERSION = '2.3.0-DEV';
 
     /**
      * Compares a Doctrine version with the current one.

From 9bdf9a99040637da541a933cbb5b5a2ab617c911 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 15:30:25 +0100
Subject: [PATCH 52/59] DCOM-93 - Adjust ClassMetadataFactory#getClassParents()
 to use reflection service.

---
 .../ORM/Mapping/ClassMetadataFactory.php      | 32 ++++++++++++++++++-
 lib/vendor/doctrine-common                    |  2 +-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index bf802ecf9..6471df0fd 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -24,6 +24,8 @@ use ReflectionException,
     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 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
     {
         // 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 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
 
         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
index 18d11e0a5..cc04744bc 160000
--- a/lib/vendor/doctrine-common
+++ b/lib/vendor/doctrine-common
@@ -1 +1 @@
-Subproject commit 18d11e0a54f8c4e726940a3753e3c2949dbf1c02
+Subproject commit cc04744bcf5a4743c46fae0487ac7a093a722856

From 80408ac34f9dcb0050d8eee13a54a406616e029c Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 15:36:36 +0100
Subject: [PATCH 53/59] DCOM-93 - Add empty initialize and wakeup methods.

---
 .../ORM/Mapping/ClassMetadataFactory.php      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 6471df0fd..fdf57dbac 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -268,6 +268,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
             }
 
             $class = $this->newClassMetadataInstance($className);
+            $this->initializeReflection($class, $this->getReflectionService());
 
             if ($parent) {
                 $class->setInheritanceType($parent->inheritanceType);
@@ -289,6 +290,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
             // Invoke driver
             try {
                 $this->driver->loadMetadataForClass($className, $class);
+                $this->wakeupReflection($class, $this->getReflectionService());
             } catch (ReflectionException $e) {
                 throw MappingException::reflectionFailure($className, $e);
             }
@@ -563,4 +565,26 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
     {
         $this->reflectionService = $reflectionService;
     }
+
+    /**
+     * Wakeup reflection after ClassMetadata gets unserialized from cache.
+     *
+     * @param ClassMetadata $class
+     * @param ReflectionService $reflService
+     * @return void
+     */
+    protected function wakeupReflection(ClassMetadataInfo $class, ReflectionService $reflService)
+    {
+    }
+
+    /**
+     * Initialize Reflection after ClassMetadata was constructed.
+     *
+     * @param ClassMetadata $class
+     * @param ReflectionSErvice $reflService
+     * @return void
+     */
+    protected function initializeReflection(ClassMetadataInfo $class, ReflectionService $reflService)
+    {
+    }
 }

From ea2d4e4282438e60a7807087e314e940be080255 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 15:46:20 +0100
Subject: [PATCH 54/59] DCOM-93 - Add ClassMetadataFactory#wakeupReflection
 implementation

---
 .../ORM/Mapping/ClassMetadataFactory.php        | 17 +++++++++++++++++
 .../Tools/DisconnectedClassMetadataFactory.php  |  7 ++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index fdf57dbac..07d6344ca 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -172,6 +172,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
 
             if ($this->cacheDriver) {
                 if (($cached = $this->cacheDriver->fetch("$realClassName\$CLASSMETADATA")) !== false) {
+                    $this->wakeupReflection($cached, $this->getReflectionService());
                     $this->loadedMetadata[$realClassName] = $cached;
                 } else {
                     foreach ($this->loadMetadata($realClassName) as $loadedClassName) {
@@ -575,6 +576,22 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
      */
     protected function wakeupReflection(ClassMetadataInfo $class, ReflectionService $reflService)
     {
+        // Restore ReflectionClass and properties
+        $class->reflClass = $reflService->getClass($class->name);
+
+        foreach ($class->fieldMappings as $field => $mapping) {
+            $reflField = isset($mapping['declared'])
+                ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+                : $reflService->getAccessibleProperty($class->name, $field);
+            $class->reflFields[$field] = $reflField;
+        }
+
+        foreach ($class->associationMappings as $field => $mapping) {
+            $reflField = isset($mapping['declared'])
+                ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+                : $reflService->getAccessibleProperty($class->name, $field);
+            $class->reflFields[$field] = $reflField;
+        }
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php b/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
index f98c8bfae..c9534a76e 100644
--- a/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
@@ -70,4 +70,9 @@ class DisconnectedClassMetadataFactory extends ClassMetadataFactory
     {
         return array();
     }
-}
\ No newline at end of file
+
+    public function getReflectionService()
+    {
+        return new \Doctrine\Common\Persistence\Mapping\StaticReflectionService;
+    }
+}

From 1cecc9c4292a471d6d2028e5576e8021053d49ef Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 15:57:32 +0100
Subject: [PATCH 55/59] DCOM-93 - Factor out __wakeup into a delegate-method
 from ClassMetadataFactory#wakeupReflection to
 ClassMetadataInfo#wakeupReflection

---
 lib/Doctrine/ORM/Mapping/ClassMetadata.php    | 22 +++++++-------
 .../ORM/Mapping/ClassMetadataFactory.php      | 17 +----------
 .../ORM/Mapping/ClassMetadataInfo.php         | 30 +++++++++++++++++++
 .../Mapping/BasicInheritanceMappingTest.php   |  3 +-
 .../Tests/ORM/Mapping/ClassMetadataTest.php   |  1 +
 5 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index a5b983fbb..e20dd578e 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -327,32 +327,34 @@ class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
     /**
      * Restores some state that can not be serialized/unserialized.
      *
+     * @param ReflectionService $reflService
      * @return void
      */
-    public function __wakeup()
+    public function wakeupReflection($reflService)
     {
         // Restore ReflectionClass and properties
-        $this->reflClass = new ReflectionClass($this->name);
+        $this->reflClass = $reflService->getClass($this->name);
 
         foreach ($this->fieldMappings as $field => $mapping) {
             $reflField = isset($mapping['declared'])
-                ? new ReflectionProperty($mapping['declared'], $field)
-                : $this->reflClass->getProperty($field);
-
-            $reflField->setAccessible(true);
+                ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+                : $reflService->getAccessibleProperty($this->name, $field);
             $this->reflFields[$field] = $reflField;
         }
 
         foreach ($this->associationMappings as $field => $mapping) {
             $reflField = isset($mapping['declared'])
-                ? new ReflectionProperty($mapping['declared'], $field)
-                : $this->reflClass->getProperty($field);
-
-            $reflField->setAccessible(true);
+                ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+                : $reflService->getAccessibleProperty($this->name, $field);
             $this->reflFields[$field] = $reflField;
         }
     }
 
+    public function initializeReflection($reflService)
+    {
+
+    }
+
     /**
      * Creates a new instance of the mapped class, without invoking the constructor.
      *
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 07d6344ca..c204f016c 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -576,22 +576,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
      */
     protected function wakeupReflection(ClassMetadataInfo $class, ReflectionService $reflService)
     {
-        // Restore ReflectionClass and properties
-        $class->reflClass = $reflService->getClass($class->name);
-
-        foreach ($class->fieldMappings as $field => $mapping) {
-            $reflField = isset($mapping['declared'])
-                ? $reflService->getAccessibleProperty($mapping['declared'], $field)
-                : $reflService->getAccessibleProperty($class->name, $field);
-            $class->reflFields[$field] = $reflField;
-        }
-
-        foreach ($class->associationMappings as $field => $mapping) {
-            $reflField = isset($mapping['declared'])
-                ? $reflService->getAccessibleProperty($mapping['declared'], $field)
-                : $reflService->getAccessibleProperty($class->name, $field);
-            $class->reflFields[$field] = $reflField;
-        }
+        $class->wakeupReflection($reflService);
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 56dd16385..82c1adff2 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -506,6 +506,36 @@ class ClassMetadataInfo
         $this->rootEntityName = $entityName;
     }
 
+    /**
+     * Restores some state that can not be serialized/unserialized.
+     *
+     * @param ReflectionService $reflService
+     * @return void
+     */
+    public function wakeupReflection($reflService)
+    {
+        // Restore ReflectionClass and properties
+        $this->reflClass = $reflService->getClass($this->name);
+
+        foreach ($this->fieldMappings as $field => $mapping) {
+            $this->reflFields[$field] = isset($mapping['declared'])
+                ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+                : $reflService->getAccessibleProperty($this->name, $field);
+        }
+
+        foreach ($this->associationMappings as $field => $mapping) {
+            $this->reflFields[$field] = isset($mapping['declared'])
+                ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+                : $reflService->getAccessibleProperty($this->name, $field);
+        }
+    }
+
+    public function initializeReflection($reflService)
+    {
+
+    }
+
+
     /**
      * Gets the ReflectionClass instance of the mapped class.
      *
diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
index 0c739e9f8..ff7f04048 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
@@ -91,6 +91,7 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
         $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\EntitySubClass2');
 
         $class2 = unserialize(serialize($class));
+        $class2->wakeupReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
         $this->assertTrue(isset($class2->reflFields['mapped1']));
         $this->assertTrue(isset($class2->reflFields['mapped2']));
@@ -315,4 +316,4 @@ class MediumSuperclassEntity extends MediumSuperclassBase
 class SubclassWithRepository extends \Doctrine\Tests\Models\DDC869\DDC869Payment
 {
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index 7a4de4ca4..88af7f2ae 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -36,6 +36,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
 
         $serialized = serialize($cm);
         $cm = unserialize($serialized);
+        $cm->wakeupReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
         // Check state
         $this->assertTrue(count($cm->getReflectionProperties()) > 0);

From c7d8c9f34e92cad269d47a6e37deeb8fbf1f1b67 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 17:06:22 +0100
Subject: [PATCH 56/59] DCOM-93 - Factor out ClassMetadata constructor into
 delegate method initializeReflection

---
 lib/Doctrine/ORM/Mapping/ClassMetadata.php    | 44 +++------------
 .../ORM/Mapping/ClassMetadataFactory.php      |  1 +
 .../ORM/Mapping/AbstractMappingDriverTest.php |  1 +
 .../ORM/Mapping/ClassMetadataBuilderTest.php  |  1 +
 .../ORM/Mapping/ClassMetadataFactoryTest.php  | 18 +++---
 .../Tests/ORM/Mapping/ClassMetadataTest.php   | 56 +++++++++++++++++++
 .../ORM/Mapping/XmlMappingDriverTest.php      |  3 +-
 .../ORM/Proxy/ProxyClassGeneratorTest.php     |  2 +
 8 files changed, 81 insertions(+), 45 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index e20dd578e..07c65fd47 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -62,12 +62,15 @@ class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
      *
      * @param string $entityName The name of the entity class the new instance is used for.
      */
-    public function __construct($entityName)
+    public function initializeReflection($reflService)
     {
-        $this->reflClass = new ReflectionClass($entityName);
-        $this->namespace = $this->reflClass->getNamespaceName();
-        $this->table['name'] = $this->reflClass->getShortName();
-        parent::__construct($this->reflClass->getName()); // do not use $entityName, possible case-problems
+        $this->reflClass = $reflService->getClass($this->name);
+        $this->namespace = $reflService->getClassNamespace($this->name);
+        $this->table['name'] = $reflService->getClassShortName($this->name);
+
+        if ($this->reflClass) {
+            $this->name = $this->rootEntityName = $this->reflClass->getName();
+        }
     }
 
     /**
@@ -324,37 +327,6 @@ class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
         return $serialized;
     }
 
-    /**
-     * Restores some state that can not be serialized/unserialized.
-     *
-     * @param ReflectionService $reflService
-     * @return void
-     */
-    public function wakeupReflection($reflService)
-    {
-        // Restore ReflectionClass and properties
-        $this->reflClass = $reflService->getClass($this->name);
-
-        foreach ($this->fieldMappings as $field => $mapping) {
-            $reflField = isset($mapping['declared'])
-                ? $reflService->getAccessibleProperty($mapping['declared'], $field)
-                : $reflService->getAccessibleProperty($this->name, $field);
-            $this->reflFields[$field] = $reflField;
-        }
-
-        foreach ($this->associationMappings as $field => $mapping) {
-            $reflField = isset($mapping['declared'])
-                ? $reflService->getAccessibleProperty($mapping['declared'], $field)
-                : $reflService->getAccessibleProperty($this->name, $field);
-            $this->reflFields[$field] = $reflField;
-        }
-    }
-
-    public function initializeReflection($reflService)
-    {
-
-    }
-
     /**
      * Creates a new instance of the mapped class, without invoking the constructor.
      *
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index c204f016c..4590b9ee3 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -588,5 +588,6 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
      */
     protected function initializeReflection(ClassMetadataInfo $class, ReflectionService $reflService)
     {
+        $class->initializeReflection($reflService);
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
index 0042259e1..6d14c2ac7 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
@@ -18,6 +18,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $mappingDriver = $this->_loadDriver();
 
         $class = new ClassMetadata($entityClassName);
+        $class->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $mappingDriver->loadMetadataForClass($entityClassName, $class);
 
         return $class;
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php
index 38cecd5cc..888db0d81 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php
@@ -40,6 +40,7 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase
     public function setUp()
     {
         $this->cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $this->cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $this->builder = new ClassMetadataBuilder($this->cm);
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
index 223ef8582..cd1e4f3ff 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -27,6 +27,7 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
 
         // Self-made metadata
         $cm1 = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1');
+        $cm1->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $cm1->setPrimaryTable(array('name' => '`group`'));
         // Add a mapped field
         $cm1->mapField(array('fieldName' => 'name', 'type' => 'varchar'));
@@ -43,9 +44,9 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
         $cm1->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO);
 
         // SUT
-        $cmf = new ClassMetadataFactoryTestSubject();
+        $cmf = new \Doctrine\ORM\Mapping\ClassMetadataFactory();
         $cmf->setEntityManager($entityManager);
-        $cmf->setMetadataForClass('Doctrine\Tests\ORM\Mapping\TestEntity1', $cm1);
+        $cmf->setMetadataFor('Doctrine\Tests\ORM\Mapping\TestEntity1', $cm1);
 
         // Prechecks
         $this->assertEquals(array(), $cm1->parentClasses);
@@ -53,15 +54,16 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
         $this->assertTrue($cm1->hasField('name'));
         $this->assertEquals(2, count($cm1->associationMappings));
         $this->assertEquals(ClassMetadata::GENERATOR_TYPE_AUTO, $cm1->generatorType);
+        $this->assertEquals('group', $cm1->table['name']);
 
         // Go
-        $cm1 = $cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\TestEntity1');
+        $cmMap1 = $cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\TestEntity1');
 
-        $this->assertEquals('group', $cm1->table['name']);
-        $this->assertTrue($cm1->table['quoted']);
-        $this->assertEquals(array(), $cm1->parentClasses);
-        $this->assertTrue($cm1->hasField('name'));
-        $this->assertEquals(ClassMetadata::GENERATOR_TYPE_SEQUENCE, $cm1->generatorType);
+        $this->assertSame($cm1, $cmMap1);
+        $this->assertEquals('group', $cmMap1->table['name']);
+        $this->assertTrue($cmMap1->table['quoted']);
+        $this->assertEquals(array(), $cmMap1->parentClasses);
+        $this->assertTrue($cmMap1->hasField('name'));
     }
 
     public function testHasGetMetadata_NamespaceSeperatorIsNotNormalized()
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index 88af7f2ae..f663522a6 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -13,6 +13,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testClassMetadataInstanceSerialization()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
         // Test initial state
         $this->assertTrue(count($cm->getReflectionProperties()) == 0);
@@ -61,6 +62,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testFieldIsNullable()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
         // Explicit Nullable
         $cm->mapField(array('fieldName' => 'status', 'nullable' => true, 'type' => 'string', 'length' => 50));
@@ -83,6 +85,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
 
         $cm = new ClassMetadata('DoctrineGlobal_Article');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $cm->mapManyToMany(array(
             'fieldName' => 'author',
             'targetEntity' => 'DoctrineGlobal_User',
@@ -99,6 +102,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testMapManyToManyJoinTableDefaults()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $cm->mapManyToMany(
             array(
             'fieldName' => 'groups',
@@ -118,6 +122,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testSerializeManyToManyJoinTableCascade()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $cm->mapManyToMany(
             array(
             'fieldName' => 'groups',
@@ -139,6 +144,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
 
         $cm = new ClassMetadata('DoctrineGlobal_User');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $cm->setDiscriminatorMap(array('descr' => 'DoctrineGlobal_Article', 'foo' => 'DoctrineGlobal_User'));
 
         $this->assertEquals("DoctrineGlobal_Article", $cm->discriminatorMap['descr']);
@@ -153,6 +159,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
 
         $cm = new ClassMetadata('DoctrineGlobal_User');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $cm->setSubclasses(array('DoctrineGlobal_Article'));
 
         $this->assertEquals("DoctrineGlobal_Article", $cm->subClasses[0]);
@@ -168,6 +175,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $field['type'] = 'string';
 
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
         $cm->setVersionMapping($field);
@@ -176,6 +184,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testGetSingleIdentifierFieldName_MultipleIdentifierEntity_ThrowsException()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $cm->isIdentifierComposite  = true;
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -185,6 +194,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testDuplicateAssociationMappingException()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $a1 = array('fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo');
         $a2 = array('fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo');
 
@@ -196,6 +207,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testDuplicateColumnName_ThrowsMappingException()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -205,6 +218,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testDuplicateColumnName_DiscriminatorColumn_ThrowsMappingException()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -214,6 +229,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testDuplicateColumnName_DiscriminatorColumn2_ThrowsMappingException()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $cm->setDiscriminatorColumn(array('name' => 'name'));
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -223,6 +240,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testDuplicateFieldAndAssocationMapping1_ThrowsException()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -232,6 +251,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testDuplicateFieldAndAssocationMapping2_ThrowsException()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $cm->mapOneToOne(array('fieldName' => 'name', 'targetEntity' => 'CmsUser'));
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -244,6 +265,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testGetTemporaryTableNameSchema()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $cm->setTableName('foo.bar');
 
         $this->assertEquals('foo_bar_id_tmp', $cm->getTemporaryIdTableName());
@@ -252,6 +275,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testDefaultTableName()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
         // When table's name is not given
         $primaryTable = array();
@@ -261,6 +285,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals('CmsUser', $cm->table['name']);
 
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         // When joinTable's name is not given
         $cm->mapManyToMany(array(
             'fieldName' => 'user',
@@ -274,6 +299,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testDefaultJoinColumnName()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         // this is really dirty, but it's the simpliest way to test whether
         // joinColumn's name will be automatically set to user_id
         $cm->mapOneToOne(array(
@@ -283,6 +310,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals('user_id', $cm->associationMappings['user']['joinColumns'][0]['name']);
 
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $cm->mapManyToMany(array(
             'fieldName' => 'user',
             'targetEntity' => 'CmsUser',
@@ -300,6 +328,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testSetMultipleIdentifierSetsComposite()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $cm->mapField(array('fieldName' => 'name'));
         $cm->mapField(array('fieldName' => 'username'));
 
@@ -313,6 +343,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testMappingNotFound()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "No mapping found for field 'foo' on class 'Doctrine\Tests\Models\CMS\CmsUser'.");
         $cm->getFieldMapping('foo');
@@ -324,6 +355,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testJoinTableMappingDefaults()
     {
         $cm = new ClassMetadata('DoctrineGlobal_Article');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $cm->mapManyToMany(array('fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser'));
 
         $this->assertEquals('doctrineglobal_article_cmsuser', $cm->associationMappings['author']['joinTable']['name']);
@@ -335,6 +368,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testMapIdentifierAssociation()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $cm->mapOneToOne(array(
             'fieldName' => 'article',
             'id' => true,
@@ -352,6 +387,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testOrphanRemovalIdentifierAssociation()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'The orphan removal option is not allowed on an association that');
         $cm->mapOneToOne(array(
@@ -369,6 +405,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testInverseIdentifierAssocation()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'An inverse association is not allowed to be identifier in');
         $cm->mapOneToOne(array(
@@ -386,6 +424,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testIdentifierAssocationManyToMany()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'Many-to-many or one-to-many associations are not allowed to be identifier in');
         $cm->mapManyToMany(array(
@@ -404,12 +444,16 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException',
             "The field or association mapping misses the 'fieldName' attribute in entity 'Doctrine\Tests\Models\CMS\CmsUser'.");
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $cm->mapField(array('fieldName' => ''));
     }
 
     public function testRetrievalOfNamedQueries()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
 
         $this->assertEquals(0, count($cm->getNamedQueries()));
 
@@ -424,6 +468,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testExistanceOfNamedQuery()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
 
         $cm->addNamedQuery(array(
             'name'  => 'all',
@@ -437,6 +483,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testRetrieveOfNamedQuery()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
 
         $cm->addNamedQuery(array(
             'name'  => 'userById',
@@ -449,6 +497,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testNamingCollisionNamedQueryShouldThrowException()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
 
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
 
@@ -470,6 +520,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     {
         $user = new \Doctrine\Tests\Models\CMS\CmsUser();
         $cm = new ClassMetadata('DOCTRINE\TESTS\MODELS\CMS\CMSUSER');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name);
     }
 
@@ -479,6 +531,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testLifecycleCallbackNotFound()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
 
         $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');
@@ -490,6 +544,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     public function testTargetEntityNotFound()
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
 
         $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'));
diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
index e04543db0..6a852bc69 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
@@ -21,6 +21,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
         $mappingDriver = $this->_loadDriver();
 
         $class = new ClassMetadata($className);
+        $class->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $mappingDriver->loadMetadataForClass($className, $class);
 
         $expectedMap = array(
@@ -92,4 +93,4 @@ class CTI
 
 class CTIFoo extends CTI {}
 class CTIBar extends CTI {}
-class CTIBaz extends CTI {}
\ No newline at end of file
+class CTIBaz extends CTI {}
diff --git a/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php b/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
index 39bdcfe5a..a45ca2c1f 100644
--- a/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
@@ -127,6 +127,7 @@ class ProxyClassGeneratorTest extends \Doctrine\Tests\OrmTestCase
         $className = "\DoctrineOrmTestEntity";
         $proxyName = "DoctrineOrmTestEntityProxy";
         $classMetadata = new \Doctrine\ORM\Mapping\ClassMetadata($className);
+        $classMetadata->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $classMetadata->mapField(array('fieldName' => 'id', 'type' => 'integer'));
         $classMetadata->setIdentifier(array('id'));
 
@@ -143,6 +144,7 @@ class ProxyClassGeneratorTest extends \Doctrine\Tests\OrmTestCase
         $className = "\Doctrine\Tests\ORM\Proxy\SleepClass";
         $proxyName = "DoctrineTestsORMProxySleepClassProxy";
         $classMetadata = new \Doctrine\ORM\Mapping\ClassMetadata($className);
+        $classMetadata->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $classMetadata->mapField(array('fieldName' => 'id', 'type' => 'integer'));
         $classMetadata->setIdentifier(array('id'));
 

From 76e4f5a80bf8faa6e00ec4746c34f2e4bfd4215e Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 21:32:18 +0100
Subject: [PATCH 57/59] DCOM-93 - Removed reflection dependency from
 ClassMetadata completly, moving all the code into ClassMetadataInfo for BC
 reasons.

---
 lib/Doctrine/ORM/Mapping/ClassMetadata.php    | 315 +-----------------
 .../ORM/Mapping/ClassMetadataFactory.php      |  14 +-
 .../ORM/Mapping/ClassMetadataInfo.php         | 292 +++++++++++++++-
 .../DisconnectedClassMetadataFactory.php      |  33 --
 .../ORM/Functional/Ticket/DDC168Test.php      |   2 +-
 .../ORM/Mapping/AnnotationDriverTest.php      |   2 +
 .../Tests/ORM/Mapping/ClassMetadataTest.php   |   8 +-
 .../Tests/ORM/Tools/EntityGeneratorTest.php   |   6 +-
 8 files changed, 308 insertions(+), 364 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index 07c65fd47..70b8f9e40 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -20,7 +20,6 @@
 namespace Doctrine\ORM\Mapping;
 
 use ReflectionClass, ReflectionProperty;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
 
 /**
  * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
@@ -40,318 +39,6 @@ use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
  * @author Jonathan H. Wage <jonwage@gmail.com>
  * @since 2.0
  */
-class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
+class ClassMetadata extends ClassMetadataInfo
 {
-    /**
-     * The ReflectionProperty instances of the mapped class.
-     *
-     * @var array
-     */
-    public $reflFields = array();
-
-    /**
-     * The prototype from which new instances of the mapped class are created.
-     *
-     * @var object
-     */
-    private $_prototype;
-
-    /**
-     * Initializes a new ClassMetadata instance that will hold the object-relational mapping
-     * metadata of the class with the given name.
-     *
-     * @param string $entityName The name of the entity class the new instance is used for.
-     */
-    public function initializeReflection($reflService)
-    {
-        $this->reflClass = $reflService->getClass($this->name);
-        $this->namespace = $reflService->getClassNamespace($this->name);
-        $this->table['name'] = $reflService->getClassShortName($this->name);
-
-        if ($this->reflClass) {
-            $this->name = $this->rootEntityName = $this->reflClass->getName();
-        }
-    }
-
-    /**
-     * Gets the ReflectionPropertys of the mapped class.
-     *
-     * @return array An array of ReflectionProperty instances.
-     */
-    public function getReflectionProperties()
-    {
-        return $this->reflFields;
-    }
-
-    /**
-     * Gets a ReflectionProperty for a specific field of the mapped class.
-     *
-     * @param string $name
-     * @return ReflectionProperty
-     */
-    public function getReflectionProperty($name)
-    {
-        return $this->reflFields[$name];
-    }
-
-    /**
-     * Gets the ReflectionProperty for the single identifier field.
-     *
-     * @return ReflectionProperty
-     * @throws BadMethodCallException If the class has a composite identifier.
-     */
-    public function getSingleIdReflectionProperty()
-    {
-        if ($this->isIdentifierComposite) {
-            throw new \BadMethodCallException("Class " . $this->name . " has a composite identifier.");
-        }
-        return $this->reflFields[$this->identifier[0]];
-    }
-
-    /**
-     * Validates & completes the given field mapping.
-     *
-     * @param array $mapping  The field mapping to validated & complete.
-     * @return array  The validated and completed field mapping.
-     *
-     * @throws MappingException
-     */
-    protected function _validateAndCompleteFieldMapping(array &$mapping)
-    {
-        parent::_validateAndCompleteFieldMapping($mapping);
-
-        // Store ReflectionProperty of mapped field
-        $refProp = $this->reflClass->getProperty($mapping['fieldName']);
-        $refProp->setAccessible(true);
-        $this->reflFields[$mapping['fieldName']] = $refProp;
-    }
-
-    /**
-     * Validates & completes the basic mapping information that is common to all
-     * association mappings (one-to-one, many-ot-one, one-to-many, many-to-many).
-     *
-     * @param array $mapping The mapping.
-     * @return array The updated mapping.
-     * @throws MappingException If something is wrong with the mapping.
-     */
-    protected function _validateAndCompleteAssociationMapping(array $mapping)
-    {
-        $mapping = parent::_validateAndCompleteAssociationMapping($mapping);
-
-        if ( ! \Doctrine\Common\ClassLoader::classExists($mapping['targetEntity']) ) {
-            throw MappingException::invalidTargetEntityClass($mapping['targetEntity'], $this->name, $mapping['fieldName']);
-        }
-
-        return $mapping;
-    }
-
-    /**
-     * Extracts the identifier values of an entity of this class.
-     *
-     * For composite identifiers, the identifier values are returned as an array
-     * with the same order as the field order in {@link identifier}.
-     *
-     * @param object $entity
-     * @return array
-     */
-    public function getIdentifierValues($entity)
-    {
-        if ($this->isIdentifierComposite) {
-            $id = array();
-
-            foreach ($this->identifier as $idField) {
-                $value = $this->reflFields[$idField]->getValue($entity);
-
-                if ($value !== null) {
-                    $id[$idField] = $value;
-                }
-            }
-
-            return $id;
-        }
-
-        $value = $this->reflFields[$this->identifier[0]]->getValue($entity);
-
-        if ($value !== null) {
-            return array($this->identifier[0] => $value);
-        }
-
-        return array();
-    }
-
-    /**
-     * Populates the entity identifier of an entity.
-     *
-     * @param object $entity
-     * @param mixed $id
-     * @todo Rename to assignIdentifier()
-     */
-    public function setIdentifierValues($entity, array $id)
-    {
-        foreach ($id as $idField => $idValue) {
-            $this->reflFields[$idField]->setValue($entity, $idValue);
-        }
-    }
-
-    /**
-     * Sets the specified field to the specified value on the given entity.
-     *
-     * @param object $entity
-     * @param string $field
-     * @param mixed $value
-     */
-    public function setFieldValue($entity, $field, $value)
-    {
-        $this->reflFields[$field]->setValue($entity, $value);
-    }
-
-    /**
-     * Gets the specified field's value off the given entity.
-     *
-     * @param object $entity
-     * @param string $field
-     */
-    public function getFieldValue($entity, $field)
-    {
-        return $this->reflFields[$field]->getValue($entity);
-    }
-
-    /**
-     * Stores the association mapping.
-     *
-     * @param AssociationMapping $assocMapping
-     */
-    protected function _storeAssociationMapping(array $assocMapping)
-    {
-        parent::_storeAssociationMapping($assocMapping);
-
-        // Store ReflectionProperty of mapped field
-        $sourceFieldName = $assocMapping['fieldName'];
-
-        $refProp = $this->reflClass->getProperty($sourceFieldName);
-        $refProp->setAccessible(true);
-        $this->reflFields[$sourceFieldName] = $refProp;
-    }
-
-    /**
-     * Creates a string representation of this instance.
-     *
-     * @return string The string representation of this instance.
-     * @todo Construct meaningful string representation.
-     */
-    public function __toString()
-    {
-        return __CLASS__ . '@' . spl_object_hash($this);
-    }
-
-    /**
-     * Determines which fields get serialized.
-     *
-     * It is only serialized what is necessary for best unserialization performance.
-     * That means any metadata properties that are not set or empty or simply have
-     * their default value are NOT serialized.
-     *
-     * Parts that are also NOT serialized because they can not be properly unserialized:
-     *      - reflClass (ReflectionClass)
-     *      - reflFields (ReflectionProperty array)
-     *
-     * @return array The names of all the fields that should be serialized.
-     */
-    public function __sleep()
-    {
-        // This metadata is always serialized/cached.
-        $serialized = array(
-            'associationMappings',
-            'columnNames', //TODO: Not really needed. Can use fieldMappings[$fieldName]['columnName']
-            'fieldMappings',
-            'fieldNames',
-            'identifier',
-            'isIdentifierComposite', // TODO: REMOVE
-            'name',
-            'namespace', // TODO: REMOVE
-            'table',
-            'rootEntityName',
-            'idGenerator', //TODO: Does not really need to be serialized. Could be moved to runtime.
-        );
-
-        // The rest of the metadata is only serialized if necessary.
-        if ($this->changeTrackingPolicy != self::CHANGETRACKING_DEFERRED_IMPLICIT) {
-            $serialized[] = 'changeTrackingPolicy';
-        }
-
-        if ($this->customRepositoryClassName) {
-            $serialized[] = 'customRepositoryClassName';
-        }
-
-        if ($this->inheritanceType != self::INHERITANCE_TYPE_NONE) {
-            $serialized[] = 'inheritanceType';
-            $serialized[] = 'discriminatorColumn';
-            $serialized[] = 'discriminatorValue';
-            $serialized[] = 'discriminatorMap';
-            $serialized[] = 'parentClasses';
-            $serialized[] = 'subClasses';
-        }
-
-        if ($this->generatorType != self::GENERATOR_TYPE_NONE) {
-            $serialized[] = 'generatorType';
-            if ($this->generatorType == self::GENERATOR_TYPE_SEQUENCE) {
-                $serialized[] = 'sequenceGeneratorDefinition';
-            }
-        }
-
-        if ($this->isMappedSuperclass) {
-            $serialized[] = 'isMappedSuperclass';
-        }
-
-        if ($this->containsForeignIdentifier) {
-            $serialized[] = 'containsForeignIdentifier';
-        }
-
-        if ($this->isVersioned) {
-            $serialized[] = 'isVersioned';
-            $serialized[] = 'versionField';
-        }
-
-        if ($this->lifecycleCallbacks) {
-            $serialized[] = 'lifecycleCallbacks';
-        }
-
-        if ($this->namedQueries) {
-            $serialized[] = 'namedQueries';
-        }
-
-        if ($this->isReadOnly) {
-            $serialized[] = 'isReadOnly';
-        }
-
-        return $serialized;
-    }
-
-    /**
-     * Creates a new instance of the mapped class, without invoking the constructor.
-     *
-     * @return object
-     */
-    public function newInstance()
-    {
-        if ($this->_prototype === null) {
-            $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
-        }
-
-        return clone $this->_prototype;
-    }
-
-    /**
-     * @param string $callback
-     * @param string $event
-     */
-    public function addLifecycleCallback($callback, $event)
-    {
-        if ( !$this->reflClass->hasMethod($callback) ||
-             ($this->reflClass->getMethod($callback)->getModifiers() & \ReflectionMethod::IS_PUBLIC) == 0) {
-            throw MappingException::lifecycleCallbackMethodNotFound($this->name, $callback);
-        }
-
-        return parent::addLifecycleCallback($callback, $event);
-    }
 }
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 4590b9ee3..0d93b18c9 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -359,11 +359,15 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
      */
     protected function validateRuntimeMetadata($class, $parent)
     {
-        // Verify & complete identifier mapping
-        if ( ! $class->identifier && ! $class->isMappedSuperclass) {
-            throw MappingException::identifierRequired($class->name);
+        if ( ! $class->reflClass ) {
+            // only validate if there is a reflection class instance
+            return;
         }
 
+        $class->validateIdentifier();
+        $class->validateAssocations();
+        $class->validateLifecycleCallbacks($this->getReflectionService());
+
         // verify inheritance
         if (!$class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
             if (!$parent) {
@@ -381,10 +385,6 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
             // second condition is necessary for mapped superclasses in the middle of an inheritance hierachy
             throw MappingException::noInheritanceOnMappedSuperClass($class->name);
         }
-
-        if ($class->usesIdGenerator() && $class->isIdentifierComposite) {
-            throw MappingException::compositeKeyAssignedIdGeneratorRequired($class->name);
-        }
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 82c1adff2..08ce40a64 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -21,6 +21,7 @@ namespace Doctrine\ORM\Mapping;
 
 use Doctrine\DBAL\Types\Type;
 use ReflectionClass;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 
 /**
  * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
@@ -40,7 +41,7 @@ use ReflectionClass;
  * @author Jonathan H. Wage <jonwage@gmail.com>
  * @since 2.0
  */
-class ClassMetadataInfo
+class ClassMetadataInfo implements ClassMetadata
 {
     /* The inheritance mapping types */
     /**
@@ -494,6 +495,20 @@ class ClassMetadataInfo
      */
     public $isReadOnly = false;
 
+    /**
+     * The ReflectionProperty instances of the mapped class.
+     *
+     * @var array
+     */
+    public $reflFields = array();
+
+    /**
+     * The prototype from which new instances of the mapped class are created.
+     *
+     * @var object
+     */
+    private $_prototype;
+
     /**
      * Initializes a new ClassMetadata instance that will hold the object-relational mapping
      * metadata of the class with the given name.
@@ -506,6 +521,219 @@ class ClassMetadataInfo
         $this->rootEntityName = $entityName;
     }
 
+    /**
+     * Gets the ReflectionPropertys of the mapped class.
+     *
+     * @return array An array of ReflectionProperty instances.
+     */
+    public function getReflectionProperties()
+    {
+        return $this->reflFields;
+    }
+
+    /**
+     * Gets a ReflectionProperty for a specific field of the mapped class.
+     *
+     * @param string $name
+     * @return ReflectionProperty
+     */
+    public function getReflectionProperty($name)
+    {
+        return $this->reflFields[$name];
+    }
+
+    /**
+     * Gets the ReflectionProperty for the single identifier field.
+     *
+     * @return ReflectionProperty
+     * @throws BadMethodCallException If the class has a composite identifier.
+     */
+    public function getSingleIdReflectionProperty()
+    {
+        if ($this->isIdentifierComposite) {
+            throw new \BadMethodCallException("Class " . $this->name . " has a composite identifier.");
+        }
+        return $this->reflFields[$this->identifier[0]];
+    }
+
+    /**
+     * Extracts the identifier values of an entity of this class.
+     *
+     * For composite identifiers, the identifier values are returned as an array
+     * with the same order as the field order in {@link identifier}.
+     *
+     * @param object $entity
+     * @return array
+     */
+    public function getIdentifierValues($entity)
+    {
+        if ($this->isIdentifierComposite) {
+            $id = array();
+
+            foreach ($this->identifier as $idField) {
+                $value = $this->reflFields[$idField]->getValue($entity);
+
+                if ($value !== null) {
+                    $id[$idField] = $value;
+                }
+            }
+
+            return $id;
+        }
+
+        $value = $this->reflFields[$this->identifier[0]]->getValue($entity);
+
+        if ($value !== null) {
+            return array($this->identifier[0] => $value);
+        }
+
+        return array();
+    }
+
+    /**
+     * Populates the entity identifier of an entity.
+     *
+     * @param object $entity
+     * @param mixed $id
+     * @todo Rename to assignIdentifier()
+     */
+    public function setIdentifierValues($entity, array $id)
+    {
+        foreach ($id as $idField => $idValue) {
+            $this->reflFields[$idField]->setValue($entity, $idValue);
+        }
+    }
+
+    /**
+     * Sets the specified field to the specified value on the given entity.
+     *
+     * @param object $entity
+     * @param string $field
+     * @param mixed $value
+     */
+    public function setFieldValue($entity, $field, $value)
+    {
+        $this->reflFields[$field]->setValue($entity, $value);
+    }
+
+    /**
+     * Gets the specified field's value off the given entity.
+     *
+     * @param object $entity
+     * @param string $field
+     */
+    public function getFieldValue($entity, $field)
+    {
+        return $this->reflFields[$field]->getValue($entity);
+    }
+
+    /**
+     * Creates a string representation of this instance.
+     *
+     * @return string The string representation of this instance.
+     * @todo Construct meaningful string representation.
+     */
+    public function __toString()
+    {
+        return __CLASS__ . '@' . spl_object_hash($this);
+    }
+
+    /**
+     * Determines which fields get serialized.
+     *
+     * It is only serialized what is necessary for best unserialization performance.
+     * That means any metadata properties that are not set or empty or simply have
+     * their default value are NOT serialized.
+     *
+     * Parts that are also NOT serialized because they can not be properly unserialized:
+     *      - reflClass (ReflectionClass)
+     *      - reflFields (ReflectionProperty array)
+     *
+     * @return array The names of all the fields that should be serialized.
+     */
+    public function __sleep()
+    {
+        // This metadata is always serialized/cached.
+        $serialized = array(
+            'associationMappings',
+            'columnNames', //TODO: Not really needed. Can use fieldMappings[$fieldName]['columnName']
+            'fieldMappings',
+            'fieldNames',
+            'identifier',
+            'isIdentifierComposite', // TODO: REMOVE
+            'name',
+            'namespace', // TODO: REMOVE
+            'table',
+            'rootEntityName',
+            'idGenerator', //TODO: Does not really need to be serialized. Could be moved to runtime.
+        );
+
+        // The rest of the metadata is only serialized if necessary.
+        if ($this->changeTrackingPolicy != self::CHANGETRACKING_DEFERRED_IMPLICIT) {
+            $serialized[] = 'changeTrackingPolicy';
+        }
+
+        if ($this->customRepositoryClassName) {
+            $serialized[] = 'customRepositoryClassName';
+        }
+
+        if ($this->inheritanceType != self::INHERITANCE_TYPE_NONE) {
+            $serialized[] = 'inheritanceType';
+            $serialized[] = 'discriminatorColumn';
+            $serialized[] = 'discriminatorValue';
+            $serialized[] = 'discriminatorMap';
+            $serialized[] = 'parentClasses';
+            $serialized[] = 'subClasses';
+        }
+
+        if ($this->generatorType != self::GENERATOR_TYPE_NONE) {
+            $serialized[] = 'generatorType';
+            if ($this->generatorType == self::GENERATOR_TYPE_SEQUENCE) {
+                $serialized[] = 'sequenceGeneratorDefinition';
+            }
+        }
+
+        if ($this->isMappedSuperclass) {
+            $serialized[] = 'isMappedSuperclass';
+        }
+
+        if ($this->containsForeignIdentifier) {
+            $serialized[] = 'containsForeignIdentifier';
+        }
+
+        if ($this->isVersioned) {
+            $serialized[] = 'isVersioned';
+            $serialized[] = 'versionField';
+        }
+
+        if ($this->lifecycleCallbacks) {
+            $serialized[] = 'lifecycleCallbacks';
+        }
+
+        if ($this->namedQueries) {
+            $serialized[] = 'namedQueries';
+        }
+
+        if ($this->isReadOnly) {
+            $serialized[] = 'isReadOnly';
+        }
+
+        return $serialized;
+    }
+
+    /**
+     * Creates a new instance of the mapped class, without invoking the constructor.
+     *
+     * @return object
+     */
+    public function newInstance()
+    {
+        if ($this->_prototype === null) {
+            $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
+        }
+
+        return clone $this->_prototype;
+    }
     /**
      * Restores some state that can not be serialized/unserialized.
      *
@@ -530,11 +758,70 @@ class ClassMetadataInfo
         }
     }
 
+    /**
+     * Initializes a new ClassMetadata instance that will hold the object-relational mapping
+     * metadata of the class with the given name.
+     *
+     * @param string $entityName The name of the entity class the new instance is used for.
+     */
     public function initializeReflection($reflService)
     {
+        $this->reflClass = $reflService->getClass($this->name);
+        $this->namespace = $reflService->getClassNamespace($this->name);
+        $this->table['name'] = $reflService->getClassShortName($this->name);
 
+        if ($this->reflClass) {
+            $this->name = $this->rootEntityName = $this->reflClass->getName();
+        }
     }
 
+    /**
+     * Validate Identifier
+     *
+     * @return void
+     */
+    public function validateIdentifier()
+    {
+        // Verify & complete identifier mapping
+        if ( ! $this->identifier && ! $this->isMappedSuperclass) {
+            throw MappingException::identifierRequired($this->name);
+        }
+
+        if ($this->usesIdGenerator() && $this->isIdentifierComposite) {
+            throw MappingException::compositeKeyAssignedIdGeneratorRequired($this->name);
+        }
+    }
+
+    /**
+     * Validate association targets actually exist.
+     *
+     * @return void
+     */
+    public function validateAssocations()
+    {
+        foreach ($this->associationMappings as $field => $mapping) {
+            if ( ! \Doctrine\Common\ClassLoader::classExists($mapping['targetEntity']) ) {
+                throw MappingException::invalidTargetEntityClass($mapping['targetEntity'], $this->name, $mapping['fieldName']);
+            }
+        }
+    }
+
+    /**
+     * Validate lifecycle callbacks
+     *
+     * @param ReflectionService $reflService
+     * @return void
+     */
+    public function validateLifecycleCallbacks($reflService)
+    {
+        foreach ($this->lifecycleCallbacks as $event => $callbacks) {
+            foreach ($callbacks as $callbackFuncName) {
+                if ( ! $reflService->hasPublicMethod($this->name, $callbackFuncName)) {
+                    throw MappingException::lifecycleCallbackMethodNotFound($this->name, $callbackFuncName);
+                }
+            }
+        }
+    }
 
     /**
      * Gets the ReflectionClass instance of the mapped class.
@@ -543,9 +830,6 @@ class ClassMetadataInfo
      */
     public function getReflectionClass()
     {
-        if ( ! $this->reflClass) {
-            $this->reflClass = new ReflectionClass($this->name);
-        }
         return $this->reflClass;
     }
 
diff --git a/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php b/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
index c9534a76e..2603c22f9 100644
--- a/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
@@ -38,39 +38,6 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo;
  */
 class DisconnectedClassMetadataFactory extends ClassMetadataFactory
 {
-    /**
-     * @override
-     */
-    protected function newClassMetadataInstance($className)
-    {
-        $metadata = new ClassMetadataInfo($className);
-        if (strpos($className, "\\") !== false) {
-            $metadata->namespace = strrev(substr( strrev($className), strpos(strrev($className), "\\")+1 ));
-        } else {
-            $metadata->namespace = "";
-        }
-        return $metadata;
-    }
-
-    /**
-     * Validate runtime metadata is correctly defined.
-     *
-     * @param ClassMetadata $class
-     * @param ClassMetadata $parent
-     */
-    protected function validateRuntimeMetadata($class, $parent)
-    {
-        // validate nothing
-    }
-
-    /**
-     * @override
-     */
-    protected function getParentClasses($name)
-    {
-        return array();
-    }
-
     public function getReflectionService()
     {
         return new \Doctrine\Common\Persistence\Mapping\StaticReflectionService;
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php
index 25b63a8dc..0b5378040 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php
@@ -61,4 +61,4 @@ class DDC168Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $theEmployee);
         $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $theEmployee->getSpouse());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
index dae4cd27a..4d7715ebb 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
@@ -15,6 +15,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
     public function testLoadMetadataForNonEntityThrowsException()
     {
         $cm = new ClassMetadata('stdClass');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $reader = new \Doctrine\Common\Annotations\AnnotationReader(new \Doctrine\Common\Cache\ArrayCache());
         $annotationDriver = new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader);
 
@@ -28,6 +29,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
     public function testColumnWithMissingTypeDefaultsToString()
     {
         $cm = new ClassMetadata('Doctrine\Tests\ORM\Mapping\ColumnWithoutType');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
         $annotationDriver = $this->_loadDriver();
 
         $annotationDriver->loadMetadataForClass('Doctrine\Tests\ORM\Mapping\InvalidColumn', $cm);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index f663522a6..d100f6f5c 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -532,10 +532,10 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
-
+        $cm->addLifecycleCallback('notfound', 'postLoad');
 
         $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');
+        $cm->validateLifecycleCallbacks(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
     }
 
     /**
@@ -545,9 +545,9 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
-
+        $cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'UnknownClass'));
 
         $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'));
+        $cm->validateAssocations();
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
index faf20afb1..4b02a94d1 100644
--- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
@@ -167,6 +167,8 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
         $book = $this->newInstance($metadata);
 
         $cm = new \Doctrine\ORM\Mapping\ClassMetadata($metadata->name);
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $driver = $this->createAnnotationDriver();
         $driver->loadMetadataForClass($cm->name, $cm);
 
@@ -189,6 +191,8 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
         $book = $this->newInstance($metadata);
 
         $cm = new \Doctrine\ORM\Mapping\ClassMetadata($metadata->name);
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
         $driver->loadMetadataForClass($cm->name, $cm);
 
         $this->assertEquals($cm->columnNames, $metadata->columnNames);
@@ -249,4 +253,4 @@ class
 }
 
 class EntityGeneratorAuthor {}
-class EntityGeneratorComment {}
\ No newline at end of file
+class EntityGeneratorComment {}

From a07fc515c751a2135e98852851a5af76619c290d Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 3 Jan 2012 18:41:48 +0100
Subject: [PATCH 58/59] DCOM-93 - Fix docblocks

---
 lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 0d93b18c9..c371e47a6 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -77,7 +77,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
     private $initialized = false;
 
     /**
-     * @var ReflectionException
+     * @var ReflectionService
      */
     private $reflectionService;
 
@@ -570,7 +570,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
     /**
      * Wakeup reflection after ClassMetadata gets unserialized from cache.
      *
-     * @param ClassMetadata $class
+     * @param ClassMetadataInfo $class
      * @param ReflectionService $reflService
      * @return void
      */
@@ -582,8 +582,8 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
     /**
      * Initialize Reflection after ClassMetadata was constructed.
      *
-     * @param ClassMetadata $class
-     * @param ReflectionSErvice $reflService
+     * @param ClassMetadataInfo $class
+     * @param ReflectionService $reflService
      * @return void
      */
     protected function initializeReflection(ClassMetadataInfo $class, ReflectionService $reflService)

From ef8703e3e93f57a551e0957cd95aabf298e6151c Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 3 Jan 2012 19:01:53 +0100
Subject: [PATCH 59/59] DCOM-93 - Allow to check testsuite with any
 constructor-less cache implementation

---
 tests/Doctrine/Tests/OrmFunctionalTestCase.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index ba54da95c..5515e904b 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -294,7 +294,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
         // the actual database platform used during execution has effect on some
         // metadata mapping behaviors (like the choice of the ID generation).
         if (is_null(self::$_metadataCacheImpl)) {
-            self::$_metadataCacheImpl = new \Doctrine\Common\Cache\ArrayCache;
+            if (isset($GLOBALS['DOCTRINE_CACHE_IMPL'])) {
+                self::$_metadataCacheImpl = new $GLOBALS['DOCTRINE_CACHE_IMPL'];
+            } else {
+                self::$_metadataCacheImpl = new \Doctrine\Common\Cache\ArrayCache;
+            }
         }
 
         if (is_null(self::$_queryCacheImpl)) {