From bb8dd6cb1168b8e3d18caed935365a1fe41044f4 Mon Sep 17 00:00:00 2001 From: Stefano Rodriguez Date: Fri, 7 Sep 2012 03:29:45 +0200 Subject: [PATCH] Fixes PersistentCollection::matching() when collection is not initialized and there are NEW entities in the collection --- lib/Doctrine/ORM/PersistentCollection.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php index 30b0e01e7..ec973408d 100644 --- a/lib/Doctrine/ORM/PersistentCollection.php +++ b/lib/Doctrine/ORM/PersistentCollection.php @@ -42,6 +42,7 @@ use Closure; * @author Konsta Vesterinen * @author Roman Borschel * @author Giorgio Sironi + * @author Stefano Rodriguez * @todo Design for inheritance to allow custom implementations? */ 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."); } + // 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)); $id = $targetClass->getSingleIdReflectionProperty()->getValue($this->owner); @@ -824,7 +832,7 @@ final class PersistentCollection implements Collection, Selectable $persister = $this->em->getUnitOfWork()->getEntityPersister($this->association['targetEntity']); - return new ArrayCollection($persister->loadCriteria($criteria)); + return new ArrayCollection(array_merge($persister->loadCriteria($criteria), $newObjects)); } }