RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DDC-729'

Browse Source
This commit is contained in:
Benjamin Eberlei 2010-08-08 16:08:43 +02:00
commit 37a1a35b75
3 changed files with 103 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1426,13 +1426,17 @@ class UnitOfWork implements PropertyChangedListener
continue;
}
$coll = new PersistentCollection($this->em,
$this->em->getClassMetadata($assoc2->targetEntityName),
new ArrayCollection
);
$coll->setOwner($managedCopy, $assoc2);
$coll->setInitialized($assoc2->isCascadeMerge);
$prop->setValue($managedCopy, $coll);
$managedCol = $prop->getValue($managedCopy);
if (!$managedCol) {
$managedCol = new PersistentCollection($this->em,
$this->em->getClassMetadata($assoc2->targetEntityName),
new ArrayCollection
);
$managedCol->setOwner($managedCopy, $assoc2);
$prop->setValue($managedCopy, $managedCol);
$this->originalEntityData[$oid][$name] = $managedCol;
}
$managedCol->setInitialized($assoc2->isCascadeMerge);
}
}
if ($class->isChangeTrackingNotify()) {

12
tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php
View File

@ -235,6 +235,18 @@ class ManyToManyBasicAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCa
$this->assertEquals(0, count($newUser->getGroups()));
}
public function testDereferenceCollectionDelete()
{
$user = $this->addCmsUserGblancoWithGroups(2);
$user->groups = null;
$this->_em->flush();
$this->_em->clear();
$newUser = $this->_em->find(get_class($user), $user->getId());
$this->assertEquals(0, count($newUser->getGroups()));
}
/**
* @param int $groupCount
* @return CmsUser

80
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php Normal file
View File

@ -0,0 +1,80 @@
<?php
namespace Doctrine\Tests\ORM\Functional\Ticket;
require_once __DIR__ . '/../../../TestInit.php';
class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase
{
public function setUp()
{
parent::setUp();
try {
$schemaTool = new \Doctrine\ORM\Tools\SchemaTool($this->_em);
$schemaTool->createSchema(array(
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC729A'),
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC729B'),
));
} catch(\Exception $e) {
}
}
public function testMergeManyToMany()
{
$a = new DDC729A();
$b = new DDC729B();
$a->related[] = $b;
$this->_em->persist($a);
$this->_em->persist($b);
$this->_em->flush();
$this->_em->clear();
$aId = $a->id;
$a = new DDC729A();
$a->id = $aId;
$this->assertType('Doctrine\Common\Collections\ArrayCollection', $a->related);
$a = $this->_em->merge($a);
$this->assertType('Doctrine\ORM\PersistentCollection', $a->related);
$this->assertFalse($a->related->isInitialized(), "Collection should not be marked initialized.");
$this->assertFalse($a->related->isDirty(), "Collection should not be marked as dirty.");
$this->_em->flush();
$this->_em->clear();
$a = $this->_em->find(__NAMESPACE__ . '\DDC729A', $aId);
$this->assertEquals(1, count($a->related));
}
}
/**
* @Entity
*/
class DDC729A
{
/** @Id @GeneratedValue @Column(type="integer") */
public $id;
/** @ManyToMany(targetEntity="DDC729B") */
public $related;
public function __construct()
{
$this->related = new \Doctrine\Common\Collections\ArrayCollection();
}
}
/**
* @Entity
*/
class DDC729B
{
/** @Id @GeneratedValue @Column(type="integer") */
public $id;
}