Revert "implement getDocumentId (#733)"

This reverts commit 1bd5744. This change is a BC break and should have gone into the 2.0 branch only.
doctrine · Feb 9, 2017 · 2fe2c55 · 2fe2c55
1 parent a3ac1d3
commit 2fe2c55
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,6 @@ Changelog
 -----
 
 * **2017-01-31** [Bugfix] Don't override ID generator when persisting children
-* **2017-01-15** [Feature] `DocumentManager::getDocumentId()` to get the id of a managed document
 
 1.4.0
 -----

diff --git a/lib/Doctrine/ODM/PHPCR/Decorator/DocumentManagerDecorator.php b/lib/Doctrine/ODM/PHPCR/Decorator/DocumentManagerDecorator.php
@@ -452,12 +452,4 @@ public function getNodeForDocument($document)
     {
         return $this->wrapped->getNodeForDocument($document);
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDocumentId($document)
-    {
-        return $this->wrapped->getDocumentId($document);
-    }
 }
diff --git a/lib/Doctrine/ODM/PHPCR/DocumentManager.php b/lib/Doctrine/ODM/PHPCR/DocumentManager.php
@@ -925,12 +925,4 @@ public function getNodeForDocument($document)
 
         return $this->session->getNode($path);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDocumentId($document)
-    {
-        return $this->unitOfWork->getDocumentId($document);
-    }
 }
diff --git a/lib/Doctrine/ODM/PHPCR/DocumentManagerInterface.php b/lib/Doctrine/ODM/PHPCR/DocumentManagerInterface.php
@@ -525,15 +525,4 @@ public function close();
      * @throws PHPCRException                if $document is not managed
      */
     public function getNodeForDocument($document);
-
-    /**
-     * Get the document identifier phpcr-odm is using.
-     *
-     * @param object $document A managed document
-     *
-     * @return string
-     *
-     * @throws PHPCRException if $document is not managed
-     */
-    public function getDocumentId($document);
 }
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Decorator/DocumentManagerDecoratorTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Decorator/DocumentManagerDecoratorTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ODM\PHPCR\Decorator;
 
-use Doctrine\ODM\PHPCR\Decorator\DocumentManagerDecorator;
-use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\Tests\ODM\PHPCR\PHPCRTestCase;
 
 /**
@@ -21,15 +19,11 @@ public function testCheckIfAllPublicMethodsAreDecorated()
         $dmiMethods = array_diff($dmiMethods, array('__construct'));
         sort($dmiMethods);
 
-        $dmdMethods = get_class_methods('\Doctrine\Tests\ODM\PHPCR\Decorator\OwnDocumentManager');
+        $dmdMethods = get_class_methods('Doctrine\ODM\PHPCR\\Decorator\DocumentManagerDecorator');
         $dmdMethods = array_diff($dmdMethods, array('__construct'));
         sort($dmdMethods);
 
         $this->assertEquals($dmMethods, $dmiMethods);
         $this->assertEquals($dmMethods, $dmdMethods);
     }
 }
-
-class OwnDocumentManager extends DocumentManagerDecorator
-{
-}
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/DocumentManagerTest.php b/tests/Doctrine/Tests/ODM/PHPCR/DocumentManagerTest.php
@@ -4,7 +4,6 @@
 
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
-use Doctrine\ODM\PHPCR\PHPCRException;
 use PHPCR\SessionInterface;
 use PHPCR\Transaction\UserTransactionInterface;
 use PHPCR\UnsupportedRepositoryOperationException;
@@ -48,7 +47,7 @@ public function testFindTranslation()
 
         $this->assertNull($nonExistent);
     }
-
+    
     /**
      * @covers Doctrine\ODM\PHPCR\DocumentManager::create
      * @covers Doctrine\ODM\PHPCR\DocumentManager::getConfiguration
@@ -166,34 +165,6 @@ public function testCreateQueryBuilder()
         $qb = $dm->createQueryBuilder();
         $this->assertInstanceOf('Doctrine\ODM\PHPCR\Query\Builder\QueryBuilder', $qb);
     }
-
-    public function testGetDocumentIdReturnsValueOfUnitOfWork()
-    {
-        $session = $this->getMockBuilder('PHPCR\SessionInterface')->getMock();
-
-        $dm = DocumentManager::create($session);
-
-        $obj = new \stdClass;
-        $uow = $dm->getUnitOfWork();
-
-        $reflectionProperty = new \ReflectionProperty($uow, 'documentIds');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($uow, array(spl_object_hash($obj) => '/foo'));
-        $reflectionProperty->setAccessible(false);
-
-        $this->assertEquals('/foo', $dm->getDocumentId($obj));
-    }
-
-    /**
-     * @expectedException \Doctrine\ODM\PHPCR\PHPCRException
-     */
-    public function testGetDocumentIdForNonManagedDocumentsReturnsNull()
-    {
-        $session = $this->getMockBuilder('PHPCR\SessionInterface')->getMock();
-        $dm = DocumentManager::create($session);
-        $obj = new \stdClass;
-        $dm->getDocumentId($obj);
-    }
 }
 
 class DocumentManagerGetClassMetadata extends DocumentManager