From a39b6869ca760d40edb98b5af3c9034ce426eaa7 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sat, 17 Jan 2015 06:07:36 +0100
Subject: [PATCH] #1178 - mapping between criteria parameters and types when
 fetching on one-to-many with additional criterions

---
 lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
index 35be15752..33854b3e2 100644
--- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
+++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
@@ -1892,10 +1892,11 @@ class BasicEntityPersister implements EntityPersister
         list($params, $types) = $this->expandParameters($criteria);
 
         if (null !== $extraConditions) {
-            $sql                         .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions);
-            list($criteriaParams, $types) = $this->expandCriteriaParameters($extraConditions);
+            $sql                                 .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions);
+            list($criteriaParams, $criteriaTypes) = $this->expandCriteriaParameters($extraConditions);
 
             $params = array_merge($params, $criteriaParams);
+            $types  = array_merge($types, $criteriaTypes);
         }
 
         if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {