Merge pull request #2 from jhoff/bump_scout_5.0

Update to scout 5.0
boxed-code · Oct 12, 2018 · a3e5240 · a3e5240
2 parents 62d0c1b + cddb81f
commit a3e5240
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=7.0",
-        "laravel/scout": "^4.0"
+        "laravel/scout": "^5.0"
     },
      "require-dev": {
         "fzaninotto/faker": "~1.4",

diff --git a/src/DatabaseEngine.php b/src/DatabaseEngine.php
@@ -11,14 +11,14 @@ class DatabaseEngine extends Engine
 {
     /**
      * Database connection.
-     * 
+     *
      * @var \Illuminate\Database\DatabaseManager
      */
     protected $database;
 
     /**
      * Spin up a new instance of the engine.
-     * 
+     *
      * @param DatabaseManager $database
      */
     public function __construct(DatabaseManager $database)
@@ -28,7 +28,7 @@ public function __construct(DatabaseManager $database)
 
     /**
      * Get a base query builder.
-     * 
+     *
      * @return \Illuminate\Database\Query\Builder
      */
     protected function query()
@@ -53,15 +53,15 @@ public function update($models)
                 }
 
                 return [
-                    'objectID' => $model->getKey(), 
-                    'index' => $model->searchableAs(), 
+                    'objectID' => $model->getKey(),
+                    'index' => $model->searchableAs(),
                     'entry' => json_encode($array),
                 ];
             })
             ->filter()
             ->each(function($record) {
                 $attributes = [
-                    'index' => $record['index'], 
+                    'index' => $record['index'],
                     'objectID' => $record['objectID']
                 ];
                 $this->query()->updateOrInsert($attributes, $record);
@@ -73,7 +73,7 @@ public function update($models)
      *
      * @param  \Illuminate\Database\Eloquent\Collection  $models
      * @return void
-     */    
+     */
     public function delete($models)
     {
         $index = $models->first()->searchableAs();
@@ -120,7 +120,7 @@ protected function performSearch(Builder $builder, array $options = [])
                 }
             });
     }
-    
+
     /**
      * Perform the given search on the engine.
      *
@@ -141,7 +141,7 @@ public function search(Builder $builder)
      * @param  int  $perPage
      * @param  int  $page
      * @return mixed
-     */    
+     */
     public function paginate(Builder $builder, $perPage, $page)
     {
         $results = $this->performSearch($builder)
@@ -152,15 +152,16 @@ public function paginate(Builder $builder, $perPage, $page)
 
         return ['results' => $results, 'total' => $total];
     }
-    
+
     /**
      * Map the given results to instances of the given model.
      *
+     * @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 ($results['total'] === 0) {
             return Collection::make();
@@ -203,4 +204,4 @@ public function mapIds($results)
     {
         return $results['results']->pluck('objectID')->values();
     }
-}
+}