feat: support Laravel 11 & 12

Upgrades package dependency requirements to allow installation in Laravel 11 & 12 environments.

This also addresses some newer phpstan issues, where phpstan knows about specific types now.

Author: saibotk

.github/workflows/fix-php-code-style-issues.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 

.github/workflows/phpstan.yml

@@ -11,12 +11,12 @@ jobs:
     name: phpstan
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.3'
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -13,13 +13,19 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.3, 8.2, 8.1]
-        laravel: [10.*]
+        php: [8.3, 8.2]
+        laravel: [10.*, 11.*, 12.*]
         stability: [prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
             carbon: ^2.63
+          - laravel: 11.*
+            testbench: 9.*
+            carbon: ^2.63
+          - laravel: 12.*
+            testbench: 10.*
+            carbon: ^3.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -39,7 +45,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/update-changelog.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: main
 

CHANGELOG.md

@@ -4,12 +4,17 @@ All notable changes to `ag-grid-laravel` will be documented in this file.
 
 ## Unreleased
 
+- Added support for Laravel 11 & 12
 - Added support for nested relations in filters
 - Added support for set values handling
 
+## 0.2.1 (2023-10-5)
+
+- Fixed double query for resource classes
+
 ## 0.2.0 (2023-08-24)
 
-- Rename `$params` to `$filters` in `AgGridCustomFilterable` 
+- Rename `$params` to `$filters` in `AgGridCustomFilterable`
 
 ## 0.1.0 (2023-08-24)
 

composer.json

@@ -21,22 +21,22 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "illuminate/contracts": "^10.0",
+        "php": "^8.1|^8.2|^8.3|^8.4",
+        "illuminate/contracts": "^10.0|^11.0|^12.0",
         "maatwebsite/excel": "^3.1",
         "spatie/laravel-package-tools": "^1.14.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.8",
-        "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^8.8",
-        "pestphp/pest": "^2.0",
-        "pestphp/pest-plugin-arch": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0",
+        "nunomaduro/collision": "^7.8|^8.1",
+        "larastan/larastan": "^2.0.1|^3.0",
+        "orchestra/testbench": "^8.8|^9.0|^10.0",
+        "pestphp/pest": "^3.0",
+        "pestphp/pest-plugin-arch": "^3.0",
+        "pestphp/pest-plugin-laravel": "^3.0",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0"
+        "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
+        "phpstan/phpstan-phpunit": "^1.0|^2.0"
     },
     "autoload": {
         "psr-4": {

phpstan.neon.dist

@@ -9,5 +9,4 @@ parameters:
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: false
 

src/AgGridQueryBuilder.php

@@ -196,7 +196,6 @@ public function toResponse($request): mixed
 
         $clone = $this->clone();
         tap($clone->getQuery(), function (QueryBuilder $query) {
-            /** @phpstan-ignore-next-line */
             $query->limit = $query->offset = $query->orders = null;
             $query->cleanBindings(['order']);
         });
@@ -421,7 +420,7 @@ protected function traverse($model, $key, $default = null): Model
         foreach (explode('.', $key) as $segment) {
             try {
                 $model = $model->$segment;
-            } catch (\Exception $e) { // @phpstan-ignore-line
+            } catch (\Exception $e) {
                 return value($default);
             }
         }

src/Support/Column.php

@@ -31,7 +31,7 @@ public function __construct(
         if ($hasPathAccessor) {
             $this->isJsonColumn = true;
         } else {
-            $model = collect($this->relations)->last()?->model ?? $this->baseModel;
+            $model = collect($this->relations)->last()->model ?? $this->baseModel;
             $colum = Str::before($this->name, '.');
 
             $this->isJsonColumn = $model->hasCast($colum, [