Update PHP version to 8.4 and enhance configuration for Laravel 12 support

Signed-off-by: Lloric Mayuga Garcia <[email protected]>

Author: lloricode

.github/workflows/phpstan.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -13,14 +13,16 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.3, 8.2, 8.1]
+        php: [8.4, 8.3, 8.2, 8.1]
         laravel: [^10.0, ^11.0]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: ^10.0
             testbench: ^8.0
           - laravel: ^11.0
             testbench: ^9.0
+          - laravel: ^12.0
+            testbench: ^10.0
         exclude:
           - laravel: ^11.0
             php: 8.1

composer.json

@@ -13,18 +13,19 @@
     ],
     "require": {       
         "php": "^8.1",
-        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/contracts": "^10.0|^11.0|^12.0",
         "spatie/laravel-package-tools": "^1.16.2"
     },
     "require-dev": {
-        "composer-runtime-api": "^2.2",
-        "orchestra/testbench": "^8.0|^9.0",
-        "pestphp/pest" : "^2.34.1",
-        "rector/rector": "^1.0.2",
-        "spatie/pest-plugin-snapshots": "^2.1.0",
+        "larastan/larastan": "^3.1.0",
         "laravel/pint": "^1.14",
-        "phpstan/phpstan": "^1.10.59",
-        "larastan/larastan": "^2.9.2"
+        "orchestra/testbench": "^8.0|^9.0|^10.0",
+        "pestphp/pest": "^3.7.4",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^2.1.6",
+        "rector/rector": "^2.0.9",
+        "spatie/pest-plugin-snapshots": "^2.1.0",
+        "ticketswap/phpstan-error-formatter": "^1.1"
     },
     "autoload": {
         "psr-4": {
@@ -55,8 +56,10 @@
         "refactor-dry-run": "vendor/bin/rector process --dry-run"
     },
     "config": {
+        "sort-packages": true,
         "allow-plugins": {
-            "pestphp/pest-plugin": true
+            "pestphp/pest-plugin": true,
+            "phpstan/extension-installer": true
         }
     },
     "minimum-stability": "dev",

phpstan.neon

@@ -1,13 +1,15 @@
 includes:
-    - ./vendor/larastan/larastan/extension.neon
+
 parameters:
     level: 8
     paths:
         - src
 
+    tmpDir: build/phpstan
+
     ignoreErrors:
+        - identifier: missingType.iterableValue
+
+    errorFormat: ticketswap
+    editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'
 
-    tmpDir: build/phpstan
-    checkMissingIterableValueType: false
-    # larastan
-    checkGenericClassInNonGenericObjectType: false

pint.json

@@ -9,6 +9,8 @@
   ],
   "rules": {
     "declare_strict_types": true,
-    "single_trait_insert_per_statement": true
+    "single_trait_insert_per_statement": true,
+    "strict_comparison":  true,
+    "strict_param":  true
   }
 }

rector.php

@@ -2,20 +2,14 @@
 
 declare(strict_types=1);
 
-use Rector\Config\RectorConfig;
-use Rector\Set\ValueObject\SetList;
-use Rector\ValueObject\PhpVersion;
-
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->paths([
+return Rector\Config\RectorConfig::configure()
+    ->withParallel(maxNumberOfProcess: 6)
+    ->withPhpSets()
+    ->withPaths([
         __DIR__.'/src',
-    ]);
-
-    $rectorConfig->sets([
-        SetList::PHP_81,
-    ]);
-
-    $rectorConfig->phpVersion(PhpVersion::PHP_81);
-
-    //    $rectorConfig->phpstanConfig(__DIR__ . '/phpstan.neon.dist');
-};
+        __DIR__.'/tests',
+    ])
+    ->withCache(
+        cacheDirectory: 'build/rector',
+        cacheClass: Rector\Caching\ValueObject\Storage\FileCacheStorage::class,
+    );

src/Generator.php

@@ -107,6 +107,9 @@ private function rowsData(array $data): string
         return $output.$this->tags->body_end;
     }
 
+    /**
+     * @param  Builder<Model>  $query
+     */
     private function rowsDataWithModel(Builder $query, array $fields, int $limit): string
     {
         $query
@@ -157,7 +160,7 @@ private function optionLinks(Model $model): string
             $link = route($this->optionLinks->routeName, $model->getRouteKey());
         }
 
-        $label = $this->optionLinks?->rowLabel ?? trans('View');
+        $label = $this->optionLinks->rowLabel ?? trans('View');
 
         return "<a href=\"$link\">$label</a>";
     }
@@ -245,7 +248,7 @@ protected function applyCustomTags(string|array|TableTags $customTags): void
 
     private function reset(): void
     {
-        $this->tags = new TableTags();
+        $this->tags = new TableTags;
         $this->optionLinks = null;
     }
 }

src/ModelOptionLinks.php

@@ -10,6 +10,5 @@ public function __construct(
         public readonly string $routeName,
         public readonly string $headerLabel = 'Options',
         public readonly ?string $rowLabel = null,
-    ) {
-    }
+    ) {}
 }

src/Providers/LaravelHtmlTableProvider.php

@@ -20,7 +20,7 @@ public function packageRegistered(): void
     {
         $this->app->singleton(
             'lloricodelaravelhtmltable',
-            fn ($app) => new LaravelHtmlTableGenerator()
+            fn ($app) => new LaravelHtmlTableGenerator
         );
     }
 }

src/TableTags.php

@@ -34,8 +34,7 @@ public function __construct(
         public readonly string $alt_body_row_end = '</tr>',
         public readonly string $alt_body_cell = '<td>',
         public readonly string $alt_body_cell_end = '</td>',
-    ) {
-    }
+    ) {}
 
     public function getBodyRow(bool $alt = false): string
     {