Merge branch 'master' of https://github.com/babenkoivan/scout-elasticsearch-driver into babenkoivan-master

Author: san4io

README.md

@@ -51,7 +51,7 @@ The package has been tested in the following configuration:
 
 * PHP version >= 7.0
 * Laravel Framework version >= 5.5
-* Elasticsearch version >= 5.5
+* Elasticsearch version >= 6
 
 ## Installation
 

composer.json

@@ -21,7 +21,7 @@
         }
     ],
     "require": {
-        "elasticsearch/elasticsearch": "^5.1",
+        "elasticsearch/elasticsearch": "^6.0",
         "laravel/scout": "^3.0"
     },
     "autoload": {

src/Builders/FilterBuilder.php

@@ -44,7 +44,7 @@ public function where($field, $value)
                 $this->wheres['must'][] = ['range' => [$field => ['gt' => $value]]];
                 break;
 
-            case '<';
+            case '<':
                 $this->wheres['must'][] = ['range' => [$field => ['lt' => $value]]];
                 break;
 
@@ -114,6 +114,17 @@ public function whereRegexp($field, $value, $flags = 'ALL')
         return $this;
     }
 
+    public function when($value, callable $callback, callable $default = null)
+    {
+        if ($value) {
+            return $callback($this);
+        } elseif ($default) {
+            return $default($this);
+        }
+
+        return $this;
+    }
+
     /**
      * https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-query.html
      * @param string $field
@@ -182,4 +193,4 @@ public function with($relations)
 
         return $this;
     }
-}
+}

src/Builders/SearchBuilder.php

@@ -19,4 +19,4 @@ public function rule($rule)
 
         return $this;
     }
-}
+}