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

Fixes PersistentCollection::matching() when collection is not initialized and there are NEW entities in the collection

Browse Source
This commit is contained in:
Stefano Rodriguez 2012-09-07 03:29:45 +02:00
parent 4b3ecfe674
commit bb8dd6cb11
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ use Closure;
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @author Roman Borschel <roman@code-factory.org> * @author Roman Borschel <roman@code-factory.org>
* @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com> * @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
* @author Stefano Rodriguez <stefano.rodriguez@fubles.com>
* @todo Design for inheritance to allow custom implementations? * @todo Design for inheritance to allow custom implementations?
*/ */
final class PersistentCollection implements Collection, Selectable final class PersistentCollection implements Collection, Selectable
@ -812,6 +813,13 @@ final class PersistentCollection implements Collection, Selectable
throw new \RuntimeException("Matching Criteria on PersistentCollection only works on OneToMany assocations at the moment."); throw new \RuntimeException("Matching Criteria on PersistentCollection only works on OneToMany assocations at the moment.");
} }
// If there are NEW objects we have to check if any of them matches the criteria
$newObjects = array();
if ($this->isDirty) {
$newObjects = $this->coll->matching($criteria)->toArray();
}
$targetClass = $this->em->getClassMetadata(get_class($this->owner)); $targetClass = $this->em->getClassMetadata(get_class($this->owner));
$id = $targetClass->getSingleIdReflectionProperty()->getValue($this->owner); $id = $targetClass->getSingleIdReflectionProperty()->getValue($this->owner);
@ -824,7 +832,7 @@ final class PersistentCollection implements Collection, Selectable
$persister = $this->em->getUnitOfWork()->getEntityPersister($this->association['targetEntity']); $persister = $this->em->getUnitOfWork()->getEntityPersister($this->association['targetEntity']);
return new ArrayCollection($persister->loadCriteria($criteria)); return new ArrayCollection(array_merge($persister->loadCriteria($criteria), $newObjects));
} }
} }