From c3289555968c7329f226b626011cc147b5173409 Mon Sep 17 00:00:00 2001
From: Jesper Noordsij <jesper.noordsij@gmail.com>
Date: Wed, 1 Oct 2025 21:34:28 +0200
Subject: [PATCH 1/2] Test on PHP 8.5

---
 .github/workflows/run-integration-tests.yml | 4 +++-
 .github/workflows/run-tests.yml             | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml
index 2f78f954..2552102c 100644
--- a/.github/workflows/run-integration-tests.yml
+++ b/.github/workflows/run-integration-tests.yml
@@ -19,7 +19,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [8.4, 8.3, 8.2, 8.1]
+                php: [8.5, 8.4, 8.3, 8.2, 8.1]
                 laravel: [12.*, 11.*, 10.*, 9.*]
                 exclude:
                   - laravel: 12.*
@@ -28,6 +28,8 @@ jobs:
                     php: 8.1
                   - laravel: 9.*
                     php: 8.4
+                  - laravel: 9.*
+                    php: 8.5
         name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
         steps:
             - name: Checkout code
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 8cf1eff4..40e72492 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.4, 8.3, 8.2, 8.1]
+        php: [8.5, 8.4, 8.3, 8.2, 8.1]
         laravel: [^12, ^11, ^10, ^9]
         dependency-version: [prefer-stable]
         exclude:
@@ -30,6 +30,8 @@ jobs:
             php: 8.1
           - laravel: ^9
             php: 8.4
+          - laravel: ^9
+            php: 8.5
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

From 61a83eb143a78e12d70d9efb11d92d890fe3d3dc Mon Sep 17 00:00:00 2001
From: Jesper Noordsij <jesper.noordsij@gmail.com>
Date: Thu, 2 Oct 2025 09:17:16 +0200
Subject: [PATCH 2/2] Add --ignore-platform-req=php+ flag for integration test
 setup

---
 .github/workflows/run-integration-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml
index 2552102c..c3376d46 100644
--- a/.github/workflows/run-integration-tests.yml
+++ b/.github/workflows/run-integration-tests.yml
@@ -46,15 +46,15 @@ jobs:
 
             - name: Install dependencies
               run: |
-                  composer create-project --prefer-dist laravel/laravel:${{ matrix.laravel }} --stability=dev --no-progress sample
+                  composer create-project --prefer-dist --ignore-platform-req=php+ laravel/laravel:${{ matrix.laravel }} --stability=dev --no-progress sample
                   cd sample
                   composer config minimum-stability dev
-                  composer update --prefer-stable --prefer-dist --no-progress
+                  composer update --prefer-stable --prefer-dist --no-progress --ignore-platform-req=php+
             - name: Add package from source
               run: |
                   cd sample
                   sed -e 's|"type": "project",|&\n"repositories": [ { "type": "path", "url": "../src" } ],|' -i composer.json
-                  composer require --dev "barryvdh/laravel-debugbar:*"
+                  composer require --dev --ignore-platform-req=php+ "barryvdh/laravel-debugbar:*"
             - name: Execute generate run
               run: |
                   cd sample