Merge pull request #1547 from Slamdunk/hotfix/closure-em

[Tree] Closure cannot handle different EntityManagers

Author: l3pp4rd

lib/Gedmo/Tree/Strategy/ORM/Closure.php

@@ -170,7 +170,7 @@ public function onFlushEnd($em, AdapterInterface $ea)
      */
     public function processPrePersist($em, $node)
     {
-        $this->pendingChildNodeInserts[spl_object_hash($node)] = $node;
+        $this->pendingChildNodeInserts[spl_object_hash($em)][spl_object_hash($node)] = $node;
     }
 
     /**
@@ -237,8 +237,9 @@ public function processPostRemove($em, $entity, AdapterInterface $ea)
     public function processPostPersist($em, $entity, AdapterInterface $ea)
     {
         $uow = $em->getUnitOfWork();
+        $emHash = spl_object_hash($em);
 
-        while ($node = array_shift($this->pendingChildNodeInserts)) {
+        while ($node = array_shift($this->pendingChildNodeInserts[$emHash])) {
             $meta = $em->getClassMetadata(get_class($node));
             $config = $this->listener->getConfiguration($em, $meta->name);
 
@@ -256,7 +257,7 @@ public function processPostPersist($em, $entity, AdapterInterface $ea)
 
             $referenceMapping = $em->getClassMetadata($config['closure'])->getAssociationMapping('ancestor');
             $referenceId = $referenceMapping['sourceToTargetKeyColumns'][$ancestorColumnName];
-            
+
             $entries = array(
                 array(
                     $ancestorColumnName => $nodeId,
@@ -348,7 +349,7 @@ protected function setLevelFieldOnPendingNodes(ObjectManager $em)
             $sql .= 'GROUP BY c.descendant';
 
             $levelsAssoc = $em->getConnection()->executeQuery($sql, array(array_keys($this->pendingNodesLevelProcess)), array($type))->fetchAll(\PDO::FETCH_NUM);
-            
+
             //create key pair array with resultset
             $levels = array();
             foreach( $levelsAssoc as $level )

tests/Gedmo/Tree/ClosureTreeTest.php

@@ -3,6 +3,7 @@
 namespace Gedmo\Tree;
 
 use Doctrine\Common\EventManager;
+use Gedmo\Tree\TreeListener;
 use Tool\BaseTestCaseORM;
 use Tree\Fixture\Closure\Category;
 use Tree\Fixture\Closure\News;
@@ -351,4 +352,30 @@ public function testCascadePersistTree()
 
         $this->assertCount(1, $closure);
     }
+
+    public function testPersistOnRightEmInstance()
+    {
+        $evm = new EventManager();
+        $evm->addEventSubscriber(new TreeListener());
+
+        $emOne = $this->getMockSqliteEntityManager($evm);
+        $emTwo = $this->getMockSqliteEntityManager($evm);
+
+        $categoryOne = new Category();
+        $categoryOne->setTitle('Politics');
+
+        $categoryTwo = new Category();
+        $categoryTwo->setTitle('Politics');
+
+        // Persist and Flush on different times !
+        $emOne->persist($categoryOne);
+
+        $emTwo->persist($categoryTwo);
+        $emTwo->flush();
+
+        $emOne->flush();
+
+        $this->assertNotNull($categoryOne->getId());
+        $this->assertNotNull($categoryTwo->getId());
+    }
 }