feat: add Laravel 12 compatibility

.github/workflows/phpstan.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.4'
       - uses: actions/checkout@v4
       - name: Install Dependencies
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist

.github/workflows/pint.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.4'
 
       - uses: actions/checkout@v4
         with:

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.2'
+        php-version: '8.4'
     - uses: actions/checkout@v4
     - name: Install Dependencies
       run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist

composer.json

@@ -12,16 +12,16 @@
         "php": ">=8.2",
         "ext-json": "*",
         "intermax/laravel-open-api": "^2.0",
-        "laravel/framework": "^10.0 || ^11.0",
+        "laravel/framework": "^10.0 || ^11.0 || ^12.0",
         "spatie/laravel-json-api-paginate": "^1.12",
-        "spatie/laravel-query-builder": "^5.0"
+        "spatie/laravel-query-builder": "^6.0"
     },
     "require-dev": {
-        "laravel/pint": "^1.1",
-        "nunomaduro/collision": "^8.0",
-        "phpunit/phpunit": "^11.0",
-        "larastan/larastan": "^2.2",
-        "orchestra/testbench": "^9.0"
+        "laravel/pint": "^1.22",
+        "nunomaduro/collision": "^8.8",
+        "phpunit/phpunit": "^11.5",
+        "larastan/larastan": "^3.4",
+        "orchestra/testbench": "^10.0"
     },
     "autoload-dev": {
         "psr-4": {

phpstan.neon

@@ -11,5 +11,3 @@ parameters:
     excludePaths:
         - %currentWorkingDirectory%/tests/
         - %currentWorkingDirectory%/vendor/
-
-    checkMissingIterableValueType: true

src/Resources/IncludesGathering.php

@@ -14,7 +14,7 @@ public function initializeIncludesBag(): void
     }
 
     /**
-     * @param  IncludesBag  $included
+     * @param  ?mixed  $included
      */
     public function setIncludesBag($included = null): void
     {

tests/Filters/OperatorFilterTest.php

@@ -10,6 +10,7 @@
 use PHPUnit\Framework\Attributes\Test;
 use Spatie\QueryBuilder\AllowedFilter;
 use Spatie\QueryBuilder\QueryBuilder;
+use Spatie\QueryBuilder\QueryBuilderRequest;
 
 class OperatorFilterTest extends TestCase
 {
@@ -122,6 +123,8 @@ public function it_produces_an_in_query()
 
     protected function createQuery($field): QueryBuilder
     {
+        app()->instance(QueryBuilderRequest::class, QueryBuilderRequest::fromRequest(request()));
+
         return QueryBuilder::for(User::class)
             ->allowedFilters([
                 AllowedFilter::custom($field, new OperatorFilter($field)),

tests/Requests/QueryResolverTest.php

@@ -13,6 +13,7 @@
 use Intermax\LaravelJsonApi\Tests\Utilities\User;
 use Orchestra\Testbench\TestCase;
 use PHPUnit\Framework\Attributes\Test;
+use Spatie\QueryBuilder\QueryBuilderRequest;
 
 class QueryResolverTest extends TestCase
 {
@@ -36,6 +37,8 @@ public function includes(): array
 
         request()->replace(['include' => 'friends']);
 
+        app()->instance(QueryBuilderRequest::class, QueryBuilderRequest::fromRequest(request()));
+
         /** @var QueryResolver $queryResolver */
         $queryResolver = $this->app->make(QueryResolver::class);
 
@@ -60,6 +63,8 @@ public function sorts(): array
 
         request()->replace(['sort' => 'name']);
 
+        app()->instance(QueryBuilderRequest::class, QueryBuilderRequest::fromRequest(request()));
+
         /** @var QueryResolver $queryResolver */
         $queryResolver = $this->app->make(QueryResolver::class);
 
@@ -84,6 +89,8 @@ public function filters(): array
 
         request()->replace(['filter' => ['name' => 'Test']]);
 
+        app()->instance(QueryBuilderRequest::class, QueryBuilderRequest::fromRequest(request()));
+
         /** @var QueryResolver $queryResolver */
         $queryResolver = $this->app->make(QueryResolver::class);