references by uuid

composer.json

@@ -21,7 +21,8 @@
         "phpcr/phpcr-implementation": "^2.1.0",
         "phpcr/phpcr-utils": "^1.2.8",
         "doctrine/instantiator": "^1.0.1",
-        "symfony/console": "^2.3|^3.0"
+        "symfony/console": "^2.3|^3.0",
+        "jackalope/jackalope-doctrine-dbal": "~1.0"
     },
     "require-dev": {
         "symfony/yaml": "^2.3|^3.0",

lib/Doctrine/ODM/PHPCR/DocumentManager.php

@@ -917,13 +917,11 @@ public function initializeObject($document)
      */
     public function getNodeForDocument($document)
     {
-        if (!is_object($document)) {
-            throw new InvalidArgumentException('Parameter $document needs to be an object, '.gettype($document).' given');
+        if (!$identifier = $this->unitOfWork->getDocumentId($document)) {
+            throw new InvalidArgumentException('This document is not managed by this manager.');
         }
 
-        $path = $this->unitOfWork->getDocumentId($document);
-
-        return $this->session->getNode($path);
+        return $this->unitOfWork->getNodeByPathOrUuid($identifier);
     }
 
     /**

lib/Doctrine/ODM/PHPCR/UnitOfWork.php

@@ -34,6 +34,7 @@
 use Doctrine\ODM\PHPCR\Exception\RuntimeException;
 use Doctrine\ODM\PHPCR\Id\AssignedIdGenerator;
 use Doctrine\ODM\PHPCR\Id\IdException;
+use Doctrine\ODM\PHPCR\Mapping\Annotations\Id;
 use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
 use Doctrine\ODM\PHPCR\Mapping\MappingException;
 use Doctrine\ODM\PHPCR\Id\IdGenerator;
@@ -674,7 +675,7 @@ public function getOrCreateProxy($targetId, $className, $locale = null)
         $metadata      = $this->dm->getClassMetadata($className);
         $proxyDocument = $this->dm->getProxyFactory()->getProxy($className, array($metadata->identifier => $targetId));
 
-        // register the document under its own id
+        // register the document under its own id/uuid
         $this->registerDocument($proxyDocument, $targetId);
 
         if ($locale) {
@@ -692,7 +693,12 @@ public function getOrCreateProxy($targetId, $className, $locale = null)
      */
     public function refreshDocumentForProxy($className, Proxy $document)
     {
-        $node = $this->session->getNode($this->determineDocumentId($document));
+        $pathOrUuid = $this->determineDocumentId($document);
+        $node = $this->getNodeByPathOrUuid($pathOrUuid);
+        if (UUIDHelper::isUUID($pathOrUuid)) {
+            $this->unregisterDocument($document);
+            $this->registerDocument($document, $node->getPath());
+        }
 
         $hints = array('refresh' => true, 'fallback' => true);
 
@@ -3063,18 +3069,25 @@ private function unregisterDocument($document)
 
     /**
      * @param object $document
-     * @param string $id       The document id to look for.
+     * @param string $pathOrUuid       The document id to look for.
      *
      * @return string generated object hash
      */
-    public function registerDocument($document, $id)
+    public function registerDocument($document, $pathOrUuid)
     {
         $oid = spl_object_hash($document);
-        $this->documentIds[$oid] = $id;
-        $this->identityMap[$id] = $document;
+        $this->documentIds[$oid] = $pathOrUuid;
+        $this->identityMap[$pathOrUuid] = $document;
 
         // frozen nodes need another state so they are managed but not included for updates
-        $frozen = $this->session->nodeExists($id) && $this->session->getNode($id)->isNodeType('nt:frozenNode');
+        try {
+            $node = $this->getNodeByPathOrUuid($pathOrUuid);
+            $frozen = $node instanceof  NodeInterface ? $node->isNodeType('nt:frozenNode') : false;
+        } catch (ItemNotFoundException $e) {
+            $frozen = false;
+        } catch (PathNotFoundException $e) {
+            $frozen = false;
+        }
 
         $this->setDocumentState($oid, $frozen ? self::STATE_FROZEN : self::STATE_MANAGED);
 
@@ -3112,6 +3125,20 @@ public function getDocumentById($id)
         return false;
     }
 
+    /**
+     * Creates a node from a given path or an uuid
+     *
+     * @param $pathOrUuid
+     *
+     * @return NodeInterface
+     */
+    public function getNodeByPathOrUuid($pathOrUuid)
+    {
+        return UUIDHelper::isUUID($pathOrUuid)
+            ? $this->session->getNodeByIdentifier($pathOrUuid)
+            : $this->session->getNode($pathOrUuid);
+    }
+
     /**
      * Get the object ID for the given document
      *

tests/Doctrine/Tests/ODM/PHPCR/UnitOfWorkTest.php

@@ -8,6 +8,7 @@
 use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
 use Jackalope\Factory;
 use Jackalope\Node;
+use PHPCR\Util\UUIDHelper;
 
 /**
  * TODO: remove Jackalope dependency
@@ -56,7 +57,7 @@ public function setUp()
         $this->session = $this->getMockBuilder('Jackalope\Session')
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $this->objectManager = $this->getMockBuilder('Jackalope\ObjectManager')
             ->disableOriginalConstructor()
             ->getMock();
@@ -74,54 +75,66 @@ public function setUp()
         $cmf->setMetadataFor($this->type, $metadata);
     }
 
-    protected function createNode($id, $username, $primaryType = 'rep:root')
+    protected function createNode($id, $username, $primaryType = 'rep:root', $uuid = null)
     {
         $repository = $this->getMockBuilder('Jackalope\Repository')->disableOriginalConstructor()->getMock();
         $this->session->expects($this->any())
             ->method('getRepository')
             ->with()
             ->will($this->returnValue($repository));
-        
+
         $type = $this->getMockBuilder('Jackalope\NodeType\NodeType')->disableOriginalConstructor()->getMock();
         $type->expects($this->any())
             ->method('getName')
             ->with()
             ->will($this->returnValue($primaryType));
-        
+
         $ntm = $this->getMockBuilder('Jackalope\NodeType\NodeTypeManager')->disableOriginalConstructor()->getMock();
         $ntm->expects($this->any())
             ->method('getNodeType')
             ->with()
             ->will($this->returnValue($type));
-        
+
         $workspace = $this->getMockBuilder('Jackalope\Workspace')->disableOriginalConstructor()->getMock();
         $workspace->expects($this->any())
             ->method('getNodeTypeManager')
             ->with()
             ->will($this->returnValue($ntm));
-        
+
         $this->session->expects($this->any())
             ->method('getWorkspace')
             ->with()
             ->will($this->returnValue($workspace));
-        
+
         $this->session->expects($this->any())
                ->method('nodeExists')
             ->with($id)
             ->will($this->returnValue(true));
-        
+
         $nodeData = array(
             "jcr:primaryType" => $primaryType,
             "jcr:system" => array(),
             'username' => $username,
         );
+        if (null !== $uuid) {
+            $nodeData['jcr:uuid'] = $uuid;
+        }
+
         $node = new Node($this->factory, $nodeData, $id, $this->session, $this->objectManager);
-        
+
         $this->session->expects($this->any())
             ->method('getNode')
             ->with($id)
             ->will($this->returnValue($node));
-
+
+        if (null !== $uuid) {
+            $this->session->expects($this->any())
+                ->method('getNodeByIdentifier')
+                ->with($uuid)
+                ->will($this->returnValue($node));
+        }
+
+
         return $node;
     }
 
@@ -247,6 +260,27 @@ public function testComputeSingleDocumentChangeSetForRemovedDocument()
         // Should not throw "InvalidArgumentException: Document has to be managed for single computation"
         $this->uow->computeSingleDocumentChangeSet($object);
     }
+
+    public function testGetOrCreateProxy()
+    {
+        $user = $this->uow->getOrCreateDocument($this->type, $this->createNode('/somepath', 'foo'));
+        $this->uow->clear();
+        $userAsReference = $this->uow->getOrCreateProxy($user->id, get_class($user));
+
+        $this->assertEquals(2, $this->uow->getDocumentState($userAsReference));
+        $this->assertEquals($userAsReference, $this->uow->getDocumentById($userAsReference->id));
+    }
+
+    public function testGetOrCreateProxyWithUuid()
+    {
+        $uuid = UUIDHelper::generateUUID();
+        $user = $this->uow->getOrCreateDocument($this->type, $this->createNode('/somepath', 'foo', 'rep:root', $uuid));
+        $this->uow->clear();
+        $userAsReference = $this->uow->getOrCreateProxy($uuid, get_class($user));
+
+        $this->assertEquals(2, $this->uow->getDocumentState($userAsReference));
+        $this->assertEquals($userAsReference, $this->uow->getDocumentById($uuid));
+    }
 }
 
 class UoWUser