Merge pull request #633 from francoism90/master

Fix simple paginator append not working

Author: freekmurze

src/QueryBuilder.php

@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Traits\ForwardsCalls;
 use Spatie\QueryBuilder\Concerns\AddsFieldsToQuery;
@@ -124,18 +125,18 @@ public function __call($name, $arguments)
             $this->addAppendsToResults($result);
         }
 
-        if ($result instanceof LengthAwarePaginator) {
+        if ($result instanceof LengthAwarePaginator || $result instanceof Paginator) {
             $this->addAppendsToResults(collect($result->items()));
         }
 
         return $result;
     }
-    
+
     public function clone()
     {
         return clone $this;
     }
-    
+
     public function __clone()
     {
         $this->subject = clone $this->subject;

tests/AppendTest.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Collection;
 use Spatie\QueryBuilder\Exceptions\InvalidAppendQuery;
 use Spatie\QueryBuilder\QueryBuilder;
@@ -159,4 +160,14 @@ protected function assertPaginateAttributeLoaded(LengthAwarePaginator $collectio
 
         $this->assertFalse($hasModelWithoutAttributeLoaded, "The `{$attribute}` attribute was expected but not loaded.");
     }
+
+    protected function assertSimplePaginateAttributeLoaded(Paginator $collection, string $attribute)
+    {
+        $hasModelWithoutAttributeLoaded = $collection
+            ->contains(function (Model $model) use ($attribute) {
+                return ! array_key_exists($attribute, $model->toArray());
+            });
+
+        $this->assertFalse($hasModelWithoutAttributeLoaded, "The `{$attribute}` attribute was expected but not loaded.");
+    }
 }