fix doctrine parameters

Author: zk2

src/DBALQueryBuilder.php

@@ -32,6 +32,15 @@ class DBALQueryBuilder extends AbstractQueryBuilder implements QueryBuilderInter
      * @var array
      */
     protected $parametersTypes = [];
+    /**
+     * @var array
+     */
+    protected $originalParameters;
+
+    /**
+     * @var array
+     */
+    protected $originalParametersTypes = [];
 
     /**
      * @param QueryBuilder $queryBuilder
@@ -40,6 +49,8 @@ public function __construct(QueryBuilder $queryBuilder)
     {
         parent::__construct($queryBuilder);
         $this->parameters = [];
+        $this->originalParameters = $this->queryBuilder->getParameters();
+        $this->originalParametersTypes = $this->queryBuilder->getParameterTypes();
     }
 
     /**
@@ -57,7 +68,10 @@ public function buildWhere(ContainerInterface $container)
         if ($this->condition = $this->trimAndOr($condition)) {
             $this->queryBuilder->andWhere($this->condition);
             if (count($this->parameters)) {
-                $this->queryBuilder->setParameters($this->parameters, $this->parametersTypes);
+                $this->queryBuilder->setParameters(
+                    array_merge($this->originalParameters, $this->parameters),
+                    array_merge($this->originalParametersTypes, $this->parametersTypes)
+                );
             }
         }
 

src/ORMQueryBuilder.php

@@ -33,6 +33,10 @@ class ORMQueryBuilder extends AbstractQueryBuilder implements QueryBuilderInterf
      * @var ArrayCollection|Parameter[]
      */
     protected $parameters;
+    /**
+     * @var array
+     */
+    protected $originalParameters;
 
     /**
      * ORMQueryBuilder constructor.
@@ -45,6 +49,8 @@ public function __construct(QueryBuilder $queryBuilder)
     {
         parent::__construct($queryBuilder);
         $this->parameters = new ArrayCollection();
+        $this->originalParameters = $this->queryBuilder->getParameters();
+        $this->originalParametersTypes = $this->queryBuilder->getParameterTypes();
     }
 
     /**
@@ -60,8 +66,8 @@ public function buildWhere(ContainerInterface $container)
         $condition = $this->doBuildWhere($container);
         if ($this->condition = $this->trimAndOr($condition)) {
             $this->queryBuilder->andWhere($this->condition);
-            if ($this->parameters->count()) {
-                $this->queryBuilder->setParameters($this->parameters);
+            foreach ($this->parameters as $parameter) {
+                $this->queryBuilder->getParameters()->add($parameter);
             }
         }