Support Scout 5

For now just complying with the updated interface and not taking advantage of any changes.

Author: pmatseykanets

composer.json

@@ -11,20 +11,23 @@
     ],
     "homepage": "https://github.com/pmatseykanets/laravel-scout-postgres",
     "license": "MIT",
+    "support": {
+        "issues": "https://github.com/pmatseykanets/laravel-scout-postgres/issues",
+        "source": "https://github.com/pmatseykanets/laravel-scout-postgres"
+    },
     "authors": [
         {
             "name": "Peter Matseykanets",
             "email": "pmatseykanets@gmail.com",
             "homepage": "https://github.com/pmatseykanets",
-            "role": "Developer"
         }
     ],
     "require": {
         "php": ">=7.0",
-        "illuminate/contracts": "~5.4",
-        "illuminate/database": "~5.4",
-        "illuminate/support": "~5.4",
-        "laravel/scout": "~4.0"
+        "illuminate/contracts": "~5.4|~5.5|~5.6",
+        "illuminate/database": "~5.4|~5.5|~5.6",
+        "illuminate/support": "~5.4|~5.5|~5.6",
+        "laravel/scout": "~5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0",

src/PostgresEngine.php

@@ -312,11 +312,12 @@ public function mapIds($results)
     /**
      * Map the given results to instances of the given model.
      *
-     * @param  mixed $results
-     * @param  \Illuminate\Database\Eloquent\Model $model
-     * @return \Illuminate\Support\Collection
+     * @param  \Laravel\Scout\Builder  $builder
+     * @param  mixed  $results
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @return \Illuminate\Database\Eloquent\Collection
      */
-    public function map($results, $model)
+    public function map(Builder $builder, $results, $model)
     {
         if (empty($results)) {
             return Collection::make();

tests/PostgresEngineTest.php

@@ -205,7 +205,10 @@ public function test_maps_results_to_models()
         $model->shouldReceive('get')->once()->andReturn(Collection::make([new TestModel()]));
 
         $results = $engine->map(
-            json_decode('[{"id": 1, "tsrank": 0.33, "total_count": 1}]'), $model);
+            new Builder(new TestModel, 'foo'),
+            json_decode('[{"id": 1, "tsrank": 0.33, "total_count": 1}]'),
+            $model
+        );
 
         $this->assertCount(1, $results);
     }
@@ -224,7 +227,10 @@ public function test_map_filters_out_no_longer_existing_models()
         $model->shouldReceive('get')->once()->andReturn(Collection::make([$expectedModel]));
 
         $models = $engine->map(
-            json_decode('[{"id": 1, "tsrank": 0.33, "total_count": 2}, {"id": 2, "tsrank": 0.31, "total_count": 2}]'), $model);
+            new Builder(new TestModel, 'foo'),
+            json_decode('[{"id": 1, "tsrank": 0.33, "total_count": 2}, {"id": 2, "tsrank": 0.31, "total_count": 2}]'),
+            $model
+        );
 
         $this->assertCount(1, $models);
         $this->assertEquals(2, $models->first()->id);