From de4c6669e3252c77fde48bd0b70535a1642e723b Mon Sep 17 00:00:00 2001
From: Jesper Noordsij <jesper.noordsij@gmail.com>
Date: Wed, 1 Oct 2025 12:26:21 +0200
Subject: [PATCH 1/2] Run tests on PHP 8.5

---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 952e51424b53..c8e3f3b3f228 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.2, 8.3, 8.4, 8.5]
         phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.4.0']
         stability: [prefer-lowest, prefer-stable]
         exclude:
@@ -110,7 +110,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.2, 8.3, 8.4, 8.5]
         phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.4.0']
         stability: [prefer-lowest, prefer-stable]
         exclude:

From 8f7f906c69f244d46fb6d3ab37757dbd99812b7e Mon Sep 17 00:00:00 2001
From: Mior Muhammad Zaki <crynobone@gmail.com>
Date: Tue, 21 Oct 2025 10:40:33 +0800
Subject: [PATCH 2/2] DEBUG: only test PHP 8.5 on most recent PHPUnit

---
 .github/workflows/tests.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c8e3f3b3f228..ffc4f8d33dd8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3, 8.4, 8.5]
+        php: [8.2, 8.3, 8.4]
         phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.4.0']
         stability: [prefer-lowest, prefer-stable]
         exclude:
@@ -48,6 +48,9 @@ jobs:
           - php: 8.2
             phpunit: '12.4.0'
         include:
+          - php: 8.5
+            phpunit: '12.4.0'
+            stability: prefer-stable
           - php: 8.3
             phpunit: '12.1.0'
             stability: prefer-stable
@@ -110,7 +113,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3, 8.4, 8.5]
+        php: [8.2, 8.3, 8.4]
         phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.4.0']
         stability: [prefer-lowest, prefer-stable]
         exclude:
@@ -119,6 +122,9 @@ jobs:
           - php: 8.2
             phpunit: '12.4.0'
         include:
+          - php: 8.5
+            phpunit: '12.4.0'
+            stability: prefer-stable
           - php: 8.3
             phpunit: '12.1.0'
             stability: prefer-stable