Removed ticket that was breaking the build. DDC-2524 is a circular de…

…pendency that is impossible to be fixed with our current codebase.
doctrine · Aug 3, 2013 · e0fd377 · e0fd377
1 parent 36e7e3c
commit e0fd377
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 152 deletions.
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1071,13 +1071,12 @@ private function getCommitOrder(array $entityChangeSet = null)
         $newNodes = array();
 
         foreach ($entityChangeSet as $entity) {
-            $className = $this->em->getClassMetadata(get_class($entity))->name;
+            $class = $this->em->getClassMetadata(get_class($entity));
 
-            if ($calc->hasClass($className)) {
+            if ($calc->hasClass($class->name)) {
                 continue;
             }
 
-            $class = $this->em->getClassMetadata($className);
             $calc->addClass($class);
 
             $newNodes[] = $class;
@@ -2875,7 +2874,7 @@ public function getSingleIdentifierValue($entity)
 
         return isset($values[$class->identifier[0]]) ? $values[$class->identifier[0]] : null;
     }
- 
+
     /**
      * Tries to find an entity with the given identifier in the identity map of
      * this UnitOfWork.

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2524Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2524Test.php