Merge pull request #687 from crynobone/patch-2

[2.x] Supports PHP 8.4
inertiajs · Nov 20, 2024 · 166f25a · 166f25a
2 parents 111d38b + fad74bc
commit 166f25a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,10 +12,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2, 8.3]
+        php: [8.1, 8.2, 8.3, 8.4]
         laravel: [10, 11]
         stability: ["prefer-lowest", "prefer-stable"]
         exclude:
+          - php: 8.4
+            laravel: 10
           - php: 8.1
             laravel: 11
 
@@ -34,7 +36,7 @@ jobs:
           coverage: none
 
       - name: Set Minimum PHP 8.1 Versions
-        uses: nick-invision/retry@v3
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
@@ -44,7 +46,7 @@ jobs:
         if: matrix.php >= 8.1 && matrix.stability == 'prefer-lowest'
 
       - name: Set Minimum PHP 8.2 Versions
-        uses: nick-invision/retry@v3
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
@@ -53,7 +55,7 @@ jobs:
         if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest'
 
       - name: Set Minimum PHP 8.2 Versions and Laravel > 11
-        uses: nick-invision/retry@v3
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
@@ -63,14 +65,14 @@ jobs:
         if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' && matrix.laravel >= 11
 
       - name: Set Laravel version
-        uses: nick-invision/retry@v3
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
           command: composer require "laravel/framework=^${{ matrix.laravel }}" --no-interaction --no-update
 
       - name: Install dependencies
-        uses: nick-invision/retry@v3
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5

diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
     },
     "require-dev": {
         "roave/security-advisories": "dev-master",
-        "orchestra/testbench": "^8.0|^9.0",
+        "orchestra/testbench": "^8.0|^9.2",
         "mockery/mockery": "^1.3.3",
         "phpunit/phpunit": "^10.4|^11.0",
         "laravel/pint": "^1.16"