From 617b7a5fb4030a0510bb2a9add6a84c1e17cea43 Mon Sep 17 00:00:00 2001
From: Alex Cicovic <23142906+acicovic@users.noreply.github.com>
Date: Mon, 22 Sep 2025 09:40:06 +0300
Subject: [PATCH 1/3] Integration tests: Add PHP 8.5 testing

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

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 7d30cc08a4..83363ef75d 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -29,19 +29,17 @@ jobs:
       # - coverage: Whether to run the tests with code coverage.
       # - experimental: Whether the build is "allowed to fail".
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3']
         wp: ['latest']
         coverage: [none]
         experimental: [false]
         include:
-          - php: '8.3'
+          - php: '8.4'
             coverage: pcov
             extensions: pcov
             ini-values: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
-            experimental: false
-          - php: '8.4'
+          - php: '8.5'
             wp: 'trunk'
-            coverage: none
             experimental: true
       fail-fast: false
     continue-on-error: ${{ matrix.experimental }}

From decda7d1e967d497be7d9fdd047a2f8475e90638 Mon Sep 17 00:00:00 2001
From: Alex Cicovic <23142906+acicovic@users.noreply.github.com>
Date: Mon, 22 Sep 2025 09:49:04 +0300
Subject: [PATCH 2/3] Unit tests: Add PHP 8.5 testing

---
 .github/workflows/unit-tests.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 653aa83043..cc7994bc79 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -30,17 +30,15 @@ jobs:
       # - coverage: Whether to run the tests with code coverage.
       # - experimental: Whether the build is "allowed to fail".
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3']
         coverage: [none]
         experimental: [false]
         include:
-          - php: '8.3'
+          - php: '8.4'
             coverage: pcov
             extensions: pcov
             ini-values: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
-            experimental: false
-          - php: '8.4'
-            coverage: none
+          - php: '8.5'
             experimental: true
       fail-fast: false
     continue-on-error: ${{ matrix.experimental }}

From 0f2a97f91fbe5b44a8d6140d494743cc0830465c Mon Sep 17 00:00:00 2001
From: Alex Cicovic <23142906+acicovic@users.noreply.github.com>
Date: Mon, 22 Sep 2025 10:26:25 +0300
Subject: [PATCH 3/3] Fix workflows: Attempt 1

---
 .github/workflows/integration-tests.yml | 1 +
 .github/workflows/unit-tests.yml        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 83363ef75d..d37f740bb4 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -38,6 +38,7 @@ jobs:
             coverage: pcov
             extensions: pcov
             ini-values: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
+            experimental: false
           - php: '8.5'
             wp: 'trunk'
             experimental: true
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index cc7994bc79..5217c9f954 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -38,6 +38,7 @@ jobs:
             coverage: pcov
             extensions: pcov
             ini-values: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
+            experimental: false
           - php: '8.5'
             experimental: true
       fail-fast: false