From d1a99cb59a3b2362b3ae42b433f7a5abc77ba3dc Mon Sep 17 00:00:00 2001
From: John Blackbourn <john@johnblackbourn.com>
Date: Sun, 7 Sep 2025 01:33:49 +0100
Subject: [PATCH] Add testing on PHP 8.5.

---
 .github/workflows/acceptance-tests.yml  | 3 +++
 .github/workflows/coding-standards.yml  | 1 +
 .github/workflows/integration-tests.yml | 3 +++
 .github/workflows/nightly-tests.yml     | 4 ++--
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
index c661a1d9..229cb626 100644
--- a/.github/workflows/acceptance-tests.yml
+++ b/.github/workflows/acceptance-tests.yml
@@ -57,6 +57,9 @@ jobs:
           # Latest WordPress on PHP 8.4
           - wp: '6.8'
             php: '8.4'
+          # Latest WordPress on PHP 8.5
+          - wp: '6.8'
+            php: '8.5'
           # Oldest supported WordPress
           - wp: '6.0'
             php: '7.4'
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 8dc05afa..b2c5e011 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -44,6 +44,7 @@ jobs:
         label:
           - 'PHP'
         php:
+          - '8.5'
           - '8.4'
       fail-fast: false
     with:
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index eb31bad1..a8514a51 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -58,6 +58,9 @@ jobs:
           # Latest WordPress on PHP 8.4
           - wp: '6.8'
             php: '8.4'
+          # Latest WordPress on PHP 8.5
+          - wp: '6.8'
+            php: '8.5'
           # Oldest supported WordPress
           - wp: '6.0'
             php: '7.4'
diff --git a/.github/workflows/nightly-tests.yml b/.github/workflows/nightly-tests.yml
index 67aa9645..e372c90a 100644
--- a/.github/workflows/nightly-tests.yml
+++ b/.github/workflows/nightly-tests.yml
@@ -39,7 +39,7 @@ jobs:
           - 'acceptance'
         php:
           # Newest and oldest supported versions of PHP
-          - '8.4'
+          - '8.5'
           - '7.4'
       fail-fast: false
     uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-acceptance-tests.yml@bfe334f89bb5c443ad7433a3ad0570be4ab756bb # 1.2.0
@@ -60,7 +60,7 @@ jobs:
           - 'integration'
         php:
           # Newest and oldest supported versions of PHP
-          - '8.4'
+          - '8.5'
           - '7.4'
       fail-fast: false
     with: