Move to Elasticsearch 5

Author: Torann

composer.json

@@ -4,6 +4,7 @@
   "description": "Unified search for Laravel models using Elasticsearch.",
   "keywords": [
     "elasticsearch",
+    "elasticsearch 5",
     "eloquent",
     "laravel",
     "unified search",
@@ -22,7 +23,7 @@
     "illuminate/support": "~5.2",
     "illuminate/database": "~5.2",
     "illuminate/config": "~5.2",
-    "elasticsearch/elasticsearch": ">2.0 <2.2"
+    "elasticsearch/elasticsearch": "~5.0"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.2|~5.0",

src/Hunter.php

@@ -437,11 +437,25 @@ public function getSearchParams($term, array $options = [])
         // Check for must filters
         if ($filter_musts = Arr::get($options, 'filter_musts')) {
             foreach(array_filter($filter_musts) as $filter=>$value) {
-                $params['body']['filter']['bool']['must'][] = [
-                    'term' => [
-                        $filter => $value,
-                    ],
-                ];
+
+                // TODO: This sucks...fix it. Version 2 made it so that
+                //       all tags had to be present, not just some of them
+                if (is_array($value)) {
+                    foreach($value as $k=>$v) {
+                        $params['body']['query']['bool']['must'][] = [
+                            'term' => [
+                                $filter => $v,
+                            ],
+                        ];
+                    }
+                }
+                else {
+                    $params['body']['query']['bool']['must'][] = [
+                        'term' => [
+                            $filter => $value,
+                        ],
+                    ];
+                }
             }
         }