Spatie/laravel-query-builder support for >= 3.0

Author: JimCronqvist

composer.json

@@ -16,7 +16,7 @@
     "laravel/framework": "^8.0|^9.0",
     "laravel/passport": "^10.1.0",
     "spatie/laravel-permission": "^3.2",
-    "spatie/laravel-query-builder": "^2.3|^3.0||^4.0|^5.0",
+    "spatie/laravel-query-builder": "^2.3|^3.0|^4.0|^5.0",
     "phpdocumentor/reflection-docblock": "^4.3|^5.0",
     "lcobucci/jwt": "^4.0",
     "league/oauth2-server": "^8.3.2"

src/Http/Controllers/ApiController.php

@@ -5,6 +5,7 @@
 use Cronqvist\Api\Exception\ApiAuthorizationException;
 use Cronqvist\Api\Services\Auth\Utils;
 use Cronqvist\Api\Services\Helpers\GuessForModel;
+use Cronqvist\Api\Services\QueryBuilder\QueryBuilder;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\Builder;
@@ -95,7 +96,8 @@ protected function defaultIndex()
     {
         $this->authorizeMethod('index');
         $data = [];
-        if(($builder = $this->getBuilder()) instanceof Builder) {
+        $builder = $this->getBuilder();
+        if($builder instanceof QueryBuilder || $builder instanceof Builder) {
             $data = $this->perPage > 0
                 ? $builder->paginate($this->getPerPage())
                 : $builder->get();