Merge pull request #334 from driesvints/fix-collections

[6.0] Use Model collection where appropriate

src/Builder.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Traits\Macroable;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Pagination\LengthAwarePaginator;
 
 class Builder
@@ -267,7 +266,7 @@ public function paginate($perPage = null, $pageName = 'page', $page = null)
 
         $perPage = $perPage ?: $this->model->getPerPage();
 
-        $results = Collection::make($engine->map(
+        $results = $this->model->newCollection($engine->map(
             $this, $rawResults = $engine->paginate($this, $perPage, $page), $this->model
         ));
 

src/Engines/AlgoliaEngine.php

@@ -4,7 +4,6 @@
 
 use Laravel\Scout\Builder;
 use AlgoliaSearch\Client as Algolia;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class AlgoliaEngine extends Engine
@@ -171,20 +170,16 @@ public function mapIds($results)
     public function map(Builder $builder, $results, $model)
     {
         if (count($results['hits']) === 0) {
-            return Collection::make();
+            return $model->newCollection();
         }
 
-        $models = $model->getScoutModelsByIds(
-            $builder, collect($results['hits'])->pluck('objectID')->values()->all()
-        )->keyBy(function ($model) {
-            return $model->getScoutKey();
-        });
+        $objectIds = collect($results['hits'])->pluck('objectID')->values()->all();
 
-        return Collection::make($results['hits'])->map(function ($hit) use ($models) {
-            if (isset($models[$hit['objectID']])) {
-                return $models[$hit['objectID']];
-            }
-        })->filter()->values();
+        return $model->getScoutModelsByIds(
+                $builder, $objectIds
+            )->filter(function ($model) use ($objectIds) {
+                return in_array($model->getScoutKey(), $objectIds);
+            });
     }
 
     /**

src/Engines/Engine.php

@@ -3,7 +3,6 @@
 namespace Laravel\Scout\Engines;
 
 use Laravel\Scout\Builder;
-use Illuminate\Database\Eloquent\Collection;
 
 abstract class Engine
 {
@@ -94,8 +93,8 @@ public function keys(Builder $builder)
      */
     public function get(Builder $builder)
     {
-        return Collection::make($this->map(
+        return $this->map(
             $builder, $this->search($builder), $builder->model
-        ));
+        );
     }
 }

src/Engines/NullEngine.php

@@ -4,6 +4,7 @@
 
 use Laravel\Scout\Builder;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Collection as BaseCollection;
 
 class NullEngine extends Engine
 {
@@ -61,7 +62,7 @@ public function paginate(Builder $builder, $perPage, $page)
      */
     public function mapIds($results)
     {
-        return Collection::make();
+        return BaseCollection::make();
     }
 
     /**

src/Searchable.php

@@ -3,7 +3,6 @@
 namespace Laravel\Scout;
 
 use Laravel\Scout\Jobs\MakeSearchable;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Collection as BaseCollection;
 
@@ -137,7 +136,7 @@ public static function makeAllSearchable()
      */
     public function searchable()
     {
-        Collection::make([$this])->searchable();
+        $this->newCollection([$this])->searchable();
     }
 
     /**
@@ -159,7 +158,7 @@ public static function removeAllFromSearch()
      */
     public function unsearchable()
     {
-        Collection::make([$this])->unsearchable();
+        $this->newCollection([$this])->unsearchable();
     }
 
     /**

tests/AlgoliaEngineTest.php

@@ -63,7 +63,8 @@ public function test_map_correctly_maps_results_to_models()
         $model = m::mock('StdClass');
         $model->shouldReceive('newQuery')->andReturn($model);
         $model->shouldReceive('getKeyName')->andReturn('id');
-        $model->shouldReceive('getScoutModelsByIds')->andReturn(Collection::make([new AlgoliaEngineTestModel]));
+        $model->shouldReceive('getScoutModelsByIds')->andReturn($models = Collection::make([new AlgoliaEngineTestModel]));
+        $model->shouldReceive('newCollection')->andReturn($models);
 
         $builder = m::mock(Builder::class);
 

tests/BuilderTest.php

@@ -30,9 +30,11 @@ public function test_pagination_correctly_handles_paginated_results()
         $model->shouldReceive('searchableUsing')->andReturn($engine = m::mock());
 
         $engine->shouldReceive('paginate');
-        $engine->shouldReceive('map')->andReturn(Collection::make([new stdClass]));
+        $engine->shouldReceive('map')->andReturn($results = Collection::make([new stdClass]));
         $engine->shouldReceive('getTotalCount');
 
+        $model->shouldReceive('newCollection')->andReturn($results);
+
         $builder->paginate();
     }