- Testing laravel 12 support

Author: dash8x

Diff for: .github/workflows/run-tests.yml

@@ -16,22 +16,19 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ ubuntu-latest ]
-                php: [ 8.3, 8.2, 8.1 ]
-                laravel: [ 11.*, 10.*, 9.* ]
+                php: [ 8.4, 8.3, 8.2 ]
+                laravel: [ 12.*, 11.*, 10.* ]
                 stability: [ prefer-lowest, prefer-stable ]
                 include:
+                    -   laravel: 12.*
+                        testbench: 10.*
+                        carbon: ^3.8.4
                     -   laravel: 11.*
                         testbench: 9.*
                         carbon: ^2.63
                     -   laravel: 10.*
                         testbench: 8.*
                         carbon: ^2.63
-                    -   laravel: 9.*
-                        testbench: 7.*
-                        carbon: ^2.63
-                exclude:
-                    -   laravel: 11.*
-                        php: 8.1
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

Diff for: composer.json

@@ -10,13 +10,13 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "illuminate/support": "^9.0 || ^10.0 || ^11.0",
-        "spatie/laravel-query-builder": "^5.7"
+        "php": "^8.2",
+        "illuminate/support": "^10.0 || ^11.0 || ^12.0",
+        "spatie/laravel-query-builder": "^6.3"
     },
     "require-dev": {
-        "orchestra/testbench": "^7.0 || ^8.0 || ^9.0",
-        "phpunit/phpunit": "^9.5 || ^10.5"
+        "orchestra/testbench": "^8.0 || ^9.0 || ^10.0",
+        "phpunit/phpunit": "^10.5 || ^11.5.3"
     },
     "autoload": {
         "psr-4": {
@@ -30,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.0-dev"
+            "dev-main": "2.0-dev"
         },
         "laravel": {
             "providers": [

Diff for: src/QueryBuilder.php

@@ -60,7 +60,7 @@ public function ignoreInvalidFilters(): self
     /**
      * Validate filters conditionally
      */
-    protected function ensureAllFiltersExist()
+    protected function ensureAllFiltersExist(): void
     {
         if (!$this->ignoreInvalidFilters) {
             parent::ensureAllFiltersExist();
@@ -72,7 +72,7 @@ protected function ensureAllFiltersExist()
      *
      * @param  Collection  $includes
      */
-    protected function addIncludesToQuery(Collection $includes)
+    protected function addIncludesToQuery(Collection $includes): void
     {
         if (!$this->request->has('include')) {
             $includes = $this->allowedIncludes->map(function (AllowedInclude $allowedInclude) {
@@ -140,7 +140,7 @@ public function fieldsToAlwaysInclude($fields): self
     /**
      * Modified to support fields without table name
      */
-    protected function ensureAllFieldsExist()
+    protected function ensureAllFieldsExist(): void
     {
         $modelTable = $this->getSubject()->getModel()->getTable();
 
@@ -170,7 +170,7 @@ protected function ensureAllFieldsExist()
      *
      * @return array
      */
-    protected function getFieldAppends()
+    protected function getFieldAppends(): array
     {
         $subjectTable = $this->getSubject()->getModel()->getTable();
 
@@ -218,7 +218,7 @@ protected function retrieveFieldsToAppends(array $fields): array
      * @param  Collection  $results
      * @return Collection
      */
-    protected function addAppendsToResults(Collection $results)
+    protected function addAppendsToResults(Collection $results): Collection
     {
         return $results->each(function (Model $result) {
             $to_append = $this->getAllAppends();
@@ -250,7 +250,7 @@ protected function getAllAppends(): array
     /**
      * Modified to support fields without table name
      */
-    protected function addRequestedModelFieldsToQuery()
+    protected function addRequestedModelFieldsToQuery(): void
     {
         $modelTableName = $this->getModel()->getTable();
 

Diff for: tests/TestCase.php

@@ -20,6 +20,9 @@ public function setUp(): void
 
     protected function getPackageProviders($app): array
     {
-        return [QueryBuilderServiceProvider::class];
+        return [
+            \Spatie\QueryBuilder\QueryBuilderServiceProvider::class,
+            QueryBuilderServiceProvider::class
+        ];
     }
 }