Merge pull request #30 from hotwired-laravel/laravel-12

Support Laravel 12
hotwired-laravel · Mar 2, 2025 · a9098a9 · a9098a9
2 parents ada1589 + 328ba63
commit a9098a9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,20 +13,14 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.1, 8.2]
-        laravel: [10.*, 11.*]
+        php: [8.2, 8.3, 8.4]
+        laravel: [11.*, 12.*]
         stability: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 10.*
-            testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
-        exclude:
-          - laravel: 11.*
-            php: 8.1
-          - laravel: 11.*
-            php: 8.2
-            os: windows-latest
+          - laravel: 12.*
+            testbench: 10.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -48,7 +42,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:^2.64.1" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: Execute tests

diff --git a/composer.json b/composer.json
@@ -18,15 +18,15 @@
         }
     ],
     "require": {
-        "php": "^8.1|^8.2",
+        "php": "^8.2",
         "spatie/laravel-package-tools": "^1.9.2",
-        "illuminate/contracts": "^10.0|^11.0"
+        "illuminate/contracts": "^11.0|^12.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.10|^8.1",
-        "orchestra/testbench": "^8.0|^9.1",
-        "phpunit/phpunit": "^10.5"
+        "nunomaduro/collision": "^8.1|^9.0",
+        "orchestra/testbench": "^9.1|^10.0",
+        "phpunit/phpunit": "^10.5|^11.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Commands/InstallCommand.php b/src/Commands/InstallCommand.php
@@ -85,6 +85,6 @@ private function importmapsFile(): string
 
     protected function phpBinary()
     {
-        return (new PhpExecutableFinder())->find(false) ?: 'php';
+        return (new PhpExecutableFinder)->find(false) ?: 'php';
     }
 }