RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] resolved hydrateAdd() recursivity

Browse source
This commit is contained in:
piccoloprincipe 2009-07-28 12:30:35 +00:00
parent c073f1d113
commit 82c416686e
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Doctrine/ORM/PersistentCollection.php
View file

@ -203,13 +203,10 @@ final class PersistentCollection extends \Doctrine\Common\Collections\Collection
* *
* @param mixed $element The element to add. * @param mixed $element The element to add.
*/ */
public function hydrateAdd($element) public function hydrateAdd($element, $setBackRef = true)
{ {
if (parent::contains($element)) {
return;
}
parent::add($element); parent::add($element);
if ($this->_backRefFieldName) { if ($this->_backRefFieldName and $setBackRef) {
// Set back reference to owner // Set back reference to owner
if ($this->_association->isOneToMany()) { if ($this->_association->isOneToMany()) {
// OneToMany // OneToMany
@ -219,7 +216,7 @@ final class PersistentCollection extends \Doctrine\Common\Collections\Collection
// ManyToMany // ManyToMany
$otherCollection = $this->_typeClass->reflFields[$this->_backRefFieldName] $otherCollection = $this->_typeClass->reflFields[$this->_backRefFieldName]
->getValue($element); ->getValue($element);
$otherCollection->hydrateAdd($this->_owner); $otherCollection->hydrateAdd($this->_owner, false);
} }
} }
} }
@ -242,6 +239,7 @@ final class PersistentCollection extends \Doctrine\Common\Collections\Collection
private function _initialize() private function _initialize()
{ {
if (!$this->_initialized) { if (!$this->_initialized) {
parent::clear();
$this->_association->load($this->_owner, $this, $this->_em); $this->_association->load($this->_owner, $this, $this->_em);
$this->_initialized = true; $this->_initialized = true;
} }

2
tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php
View file

@ -134,7 +134,7 @@ class ManyToManyBidirectionalAssociationTest extends AbstractManyToManyAssociati
$categories = $firstProduct->getCategories(); $categories = $firstProduct->getCategories();
$firstCategoryProducts = $categories[0]->getProducts(); $firstCategoryProducts = $categories[0]->getProducts();
$secondCategoryProducts = $categories[1]->getProducts(); $secondCategoryProducts = $categories[1]->getProducts();
$this->assertEquals(2, count($firstCategoryProducts)); $this->assertEquals(2, count($firstCategoryProducts));
$this->assertEquals(2, count($secondCategoryProducts)); $this->assertEquals(2, count($secondCategoryProducts));