RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/#5689-avoid-object-hash-conflicts-due-to-merge-operations-2.5' into 2.5

Browse Source 
Close #5689
This commit is contained in:
Marco Pivetta 2016-09-10 20:22:23 +02:00
commit b7bfbb6adb
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -3422,8 +3422,6 @@ class UnitOfWork implements PropertyChangedListener
); );
$managedCol->setOwner($managedCopy, $assoc2); $managedCol->setOwner($managedCopy, $assoc2);
$prop->setValue($managedCopy, $managedCol); $prop->setValue($managedCopy, $managedCol);
$this->originalEntityData[spl_object_hash($entity)][$name] = $managedCol;
} }
if ($assoc2['isCascadeMerge']) { if ($assoc2['isCascadeMerge']) {

30
tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
View File

@ -12,6 +12,8 @@ use Doctrine\Tests\Mocks\DriverMock;
use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\Tests\Mocks\EntityManagerMock;
use Doctrine\Tests\Mocks\EntityPersisterMock; use Doctrine\Tests\Mocks\EntityPersisterMock;
use Doctrine\Tests\Mocks\UnitOfWorkMock; use Doctrine\Tests\Mocks\UnitOfWorkMock;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\Forum\ForumAvatar; use Doctrine\Tests\Models\Forum\ForumAvatar;
use Doctrine\Tests\Models\Forum\ForumUser; use Doctrine\Tests\Models\Forum\ForumUser;
use Doctrine\Tests\Models\GeoNames\City; use Doctrine\Tests\Models\GeoNames\City;
@ -362,6 +364,34 @@ class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase
[new ArrayCollection()], [new ArrayCollection()],
]; ];
} }
/**
* @group 5689
* @group 1465
*/
public function testObjectHashesOfMergedEntitiesAreNotUsedInOriginalEntityDataMap()
{
$user = new CmsUser();
$user->name = 'ocramius';
$mergedUser = $this->_unitOfWork->merge($user);
self::assertSame([], $this->_unitOfWork->getOriginalEntityData($user), 'No original data was stored');
self::assertSame([], $this->_unitOfWork->getOriginalEntityData($mergedUser), 'No original data was stored');
$user = null;
$mergedUser = null;
// force garbage collection of $user (frees the used object hashes, which may be recycled)
gc_collect_cycles();
$newUser = new CmsUser();
$newUser->name = 'ocramius';
$this->_unitOfWork->persist($newUser);
self::assertSame([], $this->_unitOfWork->getOriginalEntityData($newUser), 'No original data was stored');
}
} }
/** /**