Scout 8.x & elastic search 6.x.

Author: olsgreen

.travis.yml

@@ -4,6 +4,8 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 sudo: false
 

README.md

@@ -3,15 +3,15 @@
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
 [![Build Status](https://travis-ci.com/boxed-code/laravel-scout-elasticsearch.svg?branch=master)](https://travis-ci.com/boxed-code/laravel-scout-elasticsearch)
 
-A basic [elastic](https://www.elastic.co/products/elasticsearch) search backed driver [for Laravel Scout](https://laravel.com/docs/5.8/scout). 
+A basic [elastic](https://www.elastic.co/products/elasticsearch) search backed driver [for Laravel Scout](https://laravel.com/docs/6.0/scout). 
 
 This driver has a simple configuration, requiring you to set the hostname of your elasticsearch node.
 
 Note that this driver uses a separate index for each model type as elasticsearch mapping types have been deprecated in elasticsearch 6.0 and will be removed in 8.0, for more information see https://bit.ly/2TZVZvq.
 
 By default, the driver uses the `simple_query_string` full text parser with `and` as the default operator. More information on the functionality & syntax of this query format can be found [here](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-simple-query-string-query.html).
 
-**Requires Scout ^5.0, ^6.0 or ^7.0, Laravel >=5.4 & PHP >=7.0**. Based on the original work of [ErickTamayo](https://github.com/ErickTamayo/laravel-scout-elastic)
+**Requires Scout ^7.0 or ^8.0, Laravel >=5.4 & PHP >=7.0**. Based on the original work of [ErickTamayo](https://github.com/ErickTamayo/laravel-scout-elastic)
 
 ## Contents
 

composer.json

@@ -11,12 +11,12 @@
     ],
     "require": {
         "php": ">=7.0",
-        "laravel/scout": "^5.0|^6.0|^7.0",
-        "elasticsearch/elasticsearch": "^5.0"
+        "laravel/scout": "^7.0|^8.0",
+        "elasticsearch/elasticsearch": "^5.0|^6.0"
     },
      "require-dev": {
         "mockery/mockery": "~1.0",
-        "phpunit/phpunit": "~6.0"
+        "phpunit/phpunit": "~7.5"
     },
     "autoload": {
         "psr-4": {
@@ -25,11 +25,11 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests"
+            "Tests\\": ",tests"
         }
     },
     "suggest": {
-        "elasticsearch/elasticsearch": "Required to use the Elasticsearch engine (^5.0)."
+        "elasticsearch/elasticsearch": "Required to use, the Elasticsearch engine (^5.0)."
     },
     "extra": {
         "laravel": {

phpunit.xml.dist

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

tests/ElasticsearchEngineTest.php

@@ -30,7 +30,7 @@ public function test_update_adds_objects_to_index()
         ]);
 
         $engine = new ElasticsearchEngine($client);
-        $engine->update(Collection::make([new TestModel]));
+        $this->assertNull($engine->update(Collection::make([new TestModel])));
     }
 
     public function test_delete_removes_objects_to_index()
@@ -49,7 +49,7 @@ public function test_delete_removes_objects_to_index()
         ]);
 
         $engine = new ElasticsearchEngine($client);
-        $engine->delete(Collection::make([new TestModel]));
+        $this->assertNull($engine->delete(Collection::make([new TestModel])));
     }
 
     public function test_search_sends_correct_parameters_to_elasticsearch()
@@ -74,14 +74,14 @@ public function test_search_sends_correct_parameters_to_elasticsearch()
                     ['id' => 'desc']
                 ]
             ]
-        ]);
+        ])->andReturn($return = [1, 2, 3]);
 
         $engine = new ElasticsearchEngine($client);
         $builder = new \Laravel\Scout\Builder(new TestModel, 'zonda');
         $builder->where('foo', 1);
         $builder->where('bar', [1, 3]);
         $builder->orderBy('id', 'desc');
-        $engine->search($builder);
+        $this->assertSame($return, $engine->search($builder));
     }
 
     public function test_builder_callback_can_manipulate_search_parameters_to_elasticsearch()