Bugfix

Author: pascalbaljet

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 All notable changes to `laravel-cross-eloquent-search` will be documented in this file
 
-## 2.0.0 - 2021-01-29
+## 2.0.3 - 2021-04-29
+
+- Bugfix for non-paginated queries.
+
+## 2.0.0 / 2.0.1 / 2.0.2 - 2021-01-29
 
 - Support for the soundex algorithm
 - Ability to disable wildcards

src/Searcher.php

@@ -55,7 +55,7 @@ class Searcher
     /**
      * The query string variable used to store the page.
      */
-    protected string $pageName = 'page';
+    protected string $pageName = '';
 
     /**
      * Parse the search term into multiple terms.
@@ -410,7 +410,7 @@ protected function getIdAndOrderAttributes()
         $paginateMethod = $this->simplePaginate ? 'simplePaginate' : 'paginate';
 
         // get all results or limit the results by pagination
-        return $this->perPage
+        return $this->pageName
             ? $query->{$paginateMethod}($this->perPage, ['*'], $this->pageName, $this->page)
             : $query->get();
 
@@ -509,6 +509,6 @@ public function get(string $terms = null)
             return $modelsPerType->get($modelKey)->get($item->$modelKey);
         })
             ->pipe(fn (Collection $models) => new EloquentCollection($models))
-            ->when($this->perPage, fn (EloquentCollection $models) => $results->setCollection($models));
+            ->when($this->pageName, fn (EloquentCollection $models) => $results->setCollection($models));
     }
 }

tests/SearchTest.php

@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 use ProtoneMedia\LaravelCrossEloquentSearch\Search;
 
 class SearchTest extends TestCase
@@ -26,6 +27,7 @@ public function it_can_search_two_models_and_orders_by_updated_at_by_default()
             ->add(Video::class, 'title')
             ->get('foo');
 
+        $this->assertInstanceOf(Collection::class, $results);
         $this->assertCount(2, $results);
 
         $this->assertTrue($results->contains($postA));