Merge pull request #10 from clickbar/laravel-11-12

saibotk · web-flow · commit b9b19f90fa8b · 2025-11-05T10:44:13.000+01:00
feat: support Laravel 11 &amp; 12
diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.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 }}
 
diff --git a/.github/workflows/phpstan.yml b/.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
diff --git a/.github/workflows/run-tests.yml b/.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
diff --git a/.github/workflows/update-changelog.yml b/.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
 
diff --git a/CHANGELOG.md b/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)
 
diff --git a/composer.json b/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": "^2.0|^3.0",
+        "pestphp/pest-plugin-arch": "^2.0|^3.0",
+        "pestphp/pest-plugin-laravel": "^2.0|^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": {
diff --git a/demo/app/Models/Flamingo.php b/demo/app/Models/Flamingo.php
@@ -67,17 +67,17 @@ public static function getAgGridColumnDefinitions(): array
             new AgGridColumnDefinition(
                 'is_hungry',
                 __('Is Hungry'),
-                new AgGridBooleanFormatter()
+                new AgGridBooleanFormatter
             ),
             new AgGridColumnDefinition(
                 'last_vaccinated_on',
                 __('Last Vaccinated'),
-                new AgGridDateFormatter(),
+                new AgGridDateFormatter,
             ),
             new AgGridColumnDefinition(
                 'preferred_food_types',
                 __('Preferred Food Types'),
-                new AgGridArrayFormatter(),
+                new AgGridArrayFormatter,
             ),
             new AgGridColumnDefinition(
                 'keeper_id',
@@ -88,12 +88,12 @@ public static function getAgGridColumnDefinitions(): array
             new AgGridColumnDefinition(
                 'created_at',
                 __('Created At'),
-                new AgGridDateTimeFormatter(),
+                new AgGridDateTimeFormatter,
             ),
             new AgGridColumnDefinition(
                 'updated_at',
                 __('Updated At'),
-                new AgGridDateTimeFormatter(),
+                new AgGridDateTimeFormatter,
             ),
         ];
     }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -9,5 +9,4 @@ parameters:
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: false
 
diff --git a/src/AgGridColumnDefinition.php b/src/AgGridColumnDefinition.php
@@ -12,6 +12,5 @@ public function __construct(
         public ?AgGridValueFormatter $valueFormatter = null,
         public ?\Closure $valueGetter = null,
         public ?string $excelFormat = null
-    ) {
-    }
+    ) {}
 }
diff --git a/src/AgGridFormatterContext.php b/src/AgGridFormatterContext.php
@@ -6,7 +6,5 @@
 
 class AgGridFormatterContext
 {
-    public function __construct(public string $locale, public ?DateTimeZone $timezone = null)
-    {
-    }
+    public function __construct(public string $locale, public ?DateTimeZone $timezone = null) {}
 }
diff --git a/src/AgGridQueryBuilder.php b/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']);
         });
@@ -404,10 +403,10 @@ protected function addDateFilterToQuery(EloquentBuilder|Relation $subject, Colum
         };
     }
 
-    protected function traverse($model, $key, $default = null): Model
+    protected function traverse($model, $key): Model
     {
         if (is_array($model)) {
-            return Arr::get($model, $key, $default);
+            return Arr::get($model, $key);
         }
 
         if (is_null($key)) {
@@ -419,11 +418,7 @@ protected function traverse($model, $key, $default = null): Model
         }
 
         foreach (explode('.', $key) as $segment) {
-            try {
-                $model = $model->$segment;
-            } catch (\Exception $e) { // @phpstan-ignore-line
-                return value($default);
-            }
+            $model = $model->$segment;
         }
 
         return $model;
diff --git a/src/Data/AgGridSetValue.php b/src/Data/AgGridSetValue.php
@@ -7,8 +7,7 @@ class AgGridSetValue
     public function __construct(
         public readonly string|int $value,
         public readonly ?string $label = null,
-    ) {
-    }
+    ) {}
 
     public static function fromValue(string|int|null $value): ?self
     {
diff --git a/src/Formatters/AgGridArrayFormatter.php b/src/Formatters/AgGridArrayFormatter.php
@@ -7,9 +7,7 @@
 
 class AgGridArrayFormatter implements AgGridValueFormatter
 {
-    public function __construct(private readonly string $separator = ',', private readonly ?AgGridValueFormatter $itemFormatter = null)
-    {
-    }
+    public function __construct(private readonly string $separator = ',', private readonly ?AgGridValueFormatter $itemFormatter = null) {}
 
     public function format(AgGridFormatterContext $context, $value): ?string
     {
diff --git a/src/Support/Column.php b/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, [
diff --git a/src/Support/RelationMetadata.php b/src/Support/RelationMetadata.php
@@ -9,6 +9,5 @@ class RelationMetadata
     public function __construct(
         public string $name,
         public Model $model,
-    ) {
-    }
+    ) {}
 }
diff --git a/tests/ExportTest.php b/tests/ExportTest.php
@@ -19,7 +19,7 @@
         Flamingo::class,
     );
 
-    $response = TestResponse::fromBaseResponse($queryBuilder->toResponse(new Request()));
+    $response = TestResponse::fromBaseResponse($queryBuilder->toResponse(new Request));
 
     $response->assertDownload('export.xlsx');
 });
@@ -32,7 +32,7 @@
         Flamingo::class,
     );
 
-    $response = TestResponse::fromBaseResponse($queryBuilder->toResponse(new Request()));
+    $response = TestResponse::fromBaseResponse($queryBuilder->toResponse(new Request));
 
     $response->assertDownload('export.csv');
 });
@@ -45,7 +45,7 @@
         Flamingo::class,
     );
 
-    $response = TestResponse::fromBaseResponse($queryBuilder->toResponse(new Request()));
+    $response = TestResponse::fromBaseResponse($queryBuilder->toResponse(new Request));
 
     $response->assertDownload('export.csv');
 });
@@ -59,7 +59,7 @@
         Flamingo::class,
     );
 
-    $response = TestResponse::fromBaseResponse($queryBuilder->toResponse(new Request()));
+    $response = TestResponse::fromBaseResponse($queryBuilder->toResponse(new Request));
 
     $response->assertDownload('export.csv');
 });
@@ -73,7 +73,7 @@
         Flamingo::class,
     );
 
-    $response = TestResponse::fromBaseResponse($queryBuilder->toResponse(new Request()));
+    $response = TestResponse::fromBaseResponse($queryBuilder->toResponse(new Request));
 
     $response->assertDownload('export.csv');
 });
diff --git a/tests/TestClasses/Models/Flamingo.php b/tests/TestClasses/Models/Flamingo.php
@@ -60,7 +60,7 @@ public static function getAgGridColumnDefinitions(): array
             new AgGridColumnDefinition(
                 'species',
                 __('Species'),
-                new AgGridBackedEnumFormatter(),
+                new AgGridBackedEnumFormatter,
             ),
             new AgGridColumnDefinition(
                 'weight',
@@ -69,17 +69,17 @@ public static function getAgGridColumnDefinitions(): array
             new AgGridColumnDefinition(
                 'is_hungry',
                 __('Is Hungry'),
-                new AgGridBooleanFormatter()
+                new AgGridBooleanFormatter
             ),
             new AgGridColumnDefinition(
                 'last_vaccinated_on',
                 __('Last Vaccinated'),
-                new AgGridDateFormatter(),
+                new AgGridDateFormatter,
             ),
             new AgGridColumnDefinition(
                 'preferred_food_types',
                 __('Preferred Food Types'),
-                new AgGridArrayFormatter(),
+                new AgGridArrayFormatter,
             ),
             new AgGridColumnDefinition(
                 'keeper_id',
@@ -90,12 +90,12 @@ public static function getAgGridColumnDefinitions(): array
             new AgGridColumnDefinition(
                 'created_at',
                 __('Created At'),
-                new AgGridDateTimeFormatter(),
+                new AgGridDateTimeFormatter,
             ),
             new AgGridColumnDefinition(
                 'updated_at',
                 __('Updated At'),
-                new AgGridDateTimeFormatter(),
+                new AgGridDateTimeFormatter,
             ),
         ];
     }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,5 @@ public function __construct(`
`12`	`12`	`public ?AgGridValueFormatter $valueFormatter = null,`
`13`	`13`	`public ?\Closure $valueGetter = null,`
`14`	`14`	`public ?string $excelFormat = null`
`15`		`- ) {`
`16`		`- }`
	`15`	`+ ) {}`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,5 @@`
`6`	`6`
`7`	`7`	`class AgGridFormatterContext`
`8`	`8`	`{`
`9`		`- public function __construct(public string $locale, public ?DateTimeZone $timezone = null)`
`10`		`- {`
`11`		`- }`
	`9`	`+ public function __construct(public string $locale, public ?DateTimeZone $timezone = null) {}`
`12`	`10`	`}`