RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 06:03:15 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Better fix for #2478.

Browse Source
This commit is contained in:
romanb 2009-09-06 15:25:23 +00:00
parent e0012f0750
commit 846e0bfd3b
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
View File

@ -138,18 +138,30 @@ class ObjectHydrator extends AbstractHydrator
$class = $this->_ce[get_class($entity)];
$relation = $class->associationMappings[$name];
$pColl = new PersistentCollection(
$this->_em,
$this->_ce[$relation->targetEntityName],
new ArrayCollection
);
$value = $class->reflFields[$name]->getValue($entity);
if ($value === null) {
$value = new ArrayCollection;
}
$pColl->setOwner($entity, $relation);
$class->reflFields[$name]->setValue($entity, $pColl);
$this->_uow->setOriginalEntityProperty($oid, $name, $pColl);
$this->_initializedCollections[$oid . $name] = $pColl;
if ($value instanceof ArrayCollection) {
$value = new PersistentCollection(
$this->_em,
$this->_ce[$relation->targetEntityName],
$value
);
$value->setOwner($entity, $relation);
} else {
// Is already PersistentCollection.
$value->clear();
$value->setDirty(false);
$value->setInitialized(true);
}
return $pColl;
$class->reflFields[$name]->setValue($entity, $value);
$this->_uow->setOriginalEntityProperty($oid, $name, $value);
$this->_initializedCollections[$oid . $name] = $value;
return $value;
}
/**