Merge pull request #4 from curiosity26/develop

Criteria must be an expression and not an array
curiosity26 · Nov 13, 2018 · 6612967 · 6612967
2 parents b02fd38 + 78ea8b0
commit 6612967
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Helper/AclHelperAgent.php b/Helper/AclHelperAgent.php
@@ -88,11 +88,13 @@ public function findBy(
         ;
 
         if (!empty($criteria)) {
-            $predicates = [];
+            $predicates = $builder->expr()->andX();
             foreach ($criteria as $field => $criterion) {
-                $predicates[] = is_array($criterion)
+                $predicates->add(
+                    is_array($criterion)
                     ? $builder->expr()->in("e,$field", ":$field")
-                    : $builder->expr()->eq("e.$field", ":$field");
+                    : $builder->expr()->eq("e.$field", ":$field")
+                );
                 $builder->setParameter(":$field", $criterion);
             }