Merge branch 'hotfix/#1346-post-insert-big-integer-cast-avoidance'

Close #1346
doctrine · Mar 23, 2015 · 22d6990 · 22d6990
2 parents 34168d7 + 4c119c4
commit 22d6990
Show file tree

Hide file tree

Showing 6 changed files with 441 additions and 8 deletions.
diff --git a/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php
@@ -35,10 +35,10 @@
 class ReadWriteCachedEntityPersister extends AbstractEntityPersister
 {
     /**
-     * @param \Doctrine\ORM\Persister\Entity\EntityPersister $persister The entity persister to cache.
-     * @param \Doctrine\ORM\Cache\ConcurrentRegion           $region    The entity cache region.
-     * @param \Doctrine\ORM\EntityManagerInterface           $em        The entity manager.
-     * @param \Doctrine\ORM\Mapping\ClassMetadata            $class     The entity metadata.
+     * @param \Doctrine\ORM\Persisters\Entity\EntityPersister $persister The entity persister to cache.
+     * @param \Doctrine\ORM\Cache\ConcurrentRegion            $region    The entity cache region.
+     * @param \Doctrine\ORM\EntityManagerInterface            $em        The entity manager.
+     * @param \Doctrine\ORM\Mapping\ClassMetadata             $class     The entity metadata.
      */
     public function __construct(EntityPersister $persister, ConcurrentRegion $region, EntityManagerInterface $em, ClassMetadata $class)
     {

diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
@@ -285,7 +285,10 @@ public function executeInserts()
                 $id = array(
                     $this->class->identifier[0] => $generatedId
                 );
-                $postInsertIds[$generatedId] = $entity;
+                $postInsertIds[] = array(
+                    'generatedId' => $generatedId,
+                    'entity' => $entity,
+                );
             } else {
                 $id = $this->class->getIdentifierValues($entity);
             }

diff --git a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php
@@ -180,7 +180,10 @@ public function executeInserts()
                 $id = array(
                     $this->class->identifier[0] => $generatedId
                 );
-                $postInsertIds[$generatedId] = $entity;
+                $postInsertIds[] = array(
+                    'generatedId' => $generatedId,
+                    'entity' => $entity,
+                );
             } else {
                 $id = $this->em->getUnitOfWork()->getEntityIdentifier($entity);
             }

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1019,7 +1019,9 @@ private function executeInserts($class)
 
         if ($postInsertIds) {
             // Persister returned post-insert IDs
-            foreach ($postInsertIds as $id => $entity) {
+            foreach ($postInsertIds as $postInsertId) {
+                $id      = $postInsertId['generatedId'];
+                $entity  = $postInsertId['entity'];
                 $oid     = spl_object_hash($entity);
                 $idField = $class->identifier[0];
 

diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php
@@ -55,7 +55,10 @@ public function addInsert($entity)
         if ( ! is_null($this->mockIdGeneratorType) && $this->mockIdGeneratorType == \Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_IDENTITY
                 || $this->class->isIdGeneratorIdentity()) {
             $id = $this->identityColumnValueCounter++;
-            $this->postInsertIds[$id] = $entity;
+            $this->postInsertIds[] = array(
+                'generatedId' => $id,
+                'entity' => $entity,
+            );
             return $id;
         }
         return null;