Merge branch 'master' into remove_duplicate_original_data

Conflicts: lib/Doctrine/ODM/PHPCR/UnitOfWork.php
doctrine · Mar 12, 2012 · 84c8742 · 84c8742
2 parents bc42a8f + 07a4d54
commit 84c8742
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
@@ -529,7 +529,7 @@ private function cascadeScheduleInsert($class, $document, &$visited)
             }
         }
 
-        $id = $class->getIdentifierValue($document);
+        $id = $this->getDocumentId($document);
         foreach ($class->childMappings as $childName => $mapping) {
             $child = $class->reflFields[$childName]->getValue($document);
             if ($child !== null && $this->getDocumentState($child) === self::STATE_NEW) {
@@ -1377,8 +1377,7 @@ private function executeMoves($documents)
 
             list($document, $targetPath) = $value;
 
-            $class = $this->dm->getClassMetadata(get_class($document));
-            $path = $class->getIdentifierValue($document);
+            $path = $this->getDocumentId($document);
             if ($path === $targetPath) {
                 continue;
             }
@@ -1744,7 +1743,7 @@ public function getDocumentId($document)
         if (empty($this->documentIds[$oid])) {
             $msg = 'Document is not managed and has no id';
             if (is_object($document)) {
-                $msg.= ': '.self::objToStr($document, $this->dm);
+                $msg.= ': '.self::objToStr($document);
             }
             throw new PHPCRException($msg);
         }
@@ -1983,10 +1982,8 @@ private static function objToStr($obj, DocumentManager $dm = null)
 
         if ($dm) {
             try {
-                $metadata = $dm->getClassMetadata(get_class($obj));
-                if ($metadata->getIdentifierValue($obj)) {
-                    $string .= ' ('.$metadata->getIdentifierValue($obj).')';
-                }
+                $id = $dm->getUnitOfWork()->getDocumentId($obj);
+                $string .= " ($id)";
             } catch (\Exception $e) {
             }
         }

diff --git a/tests/Doctrine/Tests/ODM/PHPCR/UnitOfWorkTest.php b/tests/Doctrine/Tests/ODM/PHPCR/UnitOfWorkTest.php
@@ -115,6 +115,8 @@ public function testScheduleInsertCancelsScheduleRemove()
         $object->username = "bar";
         $object->id = '/somepath';
 
+        $this->uow->scheduleInsert($object);
+
         $this->uow->scheduleRemove($object);
 
         $method = new \ReflectionMethod($this->uow, 'getDocumentState');