Merge pull request #3140 from zoltanbalint/elastic-combined-filters

soyuka · web-flow · commit d29b8add7e1d · 2019-10-04T14:22:08.000+02:00
Allow multiple elasticsearch queries to be set
diff --git a/src/Bridge/Elasticsearch/DataProvider/Filter/AbstractSearchFilter.php b/src/Bridge/Elasticsearch/DataProvider/Filter/AbstractSearchFilter.php
@@ -83,7 +83,7 @@ public function apply(array $clauseBody, string $resourceClass, ?string $operati
             return $clauseBody;
         }
 
-        return array_merge($clauseBody, [
+        return array_merge_recursive($clauseBody, [
             'bool' => [
                 'must' => $searches,
             ],

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function apply(array $clauseBody, string $resourceClass, ?string $operati`
`83`	`83`	`return $clauseBody;`
`84`	`84`	`}`
`85`	`85`
`86`		`- return array_merge($clauseBody, [`
	`86`	`+ return array_merge_recursive($clauseBody, [`
`87`	`87`	`'bool' => [`
`88`	`88`	`'must' => $searches,`
`89`	`89`	`],`