From 1ce40af958d0e65039689c101c157ad5b3c0b900 Mon Sep 17 00:00:00 2001
From: Andreas Braun <andreas.braun@mongodb.com>
Date: Thu, 25 Sep 2025 11:08:40 +0200
Subject: [PATCH 1/2] PHPLIB-1709: Test with PHP 8.5

---
 .github/workflows/tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 956e0ec61..5fd3f4047 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -29,6 +29,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         mongodb-version:
           - "6.0"
         topology:

From 4fa2df4fd8346393db021ac99c48c6fbbadb4222 Mon Sep 17 00:00:00 2001
From: Andreas Braun <andreas.braun@mongodb.com>
Date: Thu, 25 Sep 2025 11:20:03 +0200
Subject: [PATCH 2/2] Ignore upper PHP version bound when running on PHP 8.5

---
 .github/actions/setup/action.yml | 6 +++++-
 .github/workflows/tests.yml      | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index c66c0fa8f..e68c386b8 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -14,6 +14,10 @@ inputs:
   working-directory:
     description: "The directory where composer.json is located, if it is not in the repository root."
     required: false
+  ignore-platform-req:
+    description: "Whether to ignore platform requirements when installing dependencies with Composer."
+    required: false
+    default: "false"
 
 runs:
   using: composite
@@ -49,5 +53,5 @@ runs:
     - name: Install dependencies with Composer
       uses: ramsey/composer-install@3.0.0
       with:
-        composer-options: "--no-suggest"
+        composer-options: "--no-suggest ${{ inputs.ignore-platform-req == 'true' && '--ignore-platform-req=php+' || '' }}"
         working-directory: "${{ inputs.working-directory }}"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5fd3f4047..319fcbb3d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -80,6 +80,7 @@ jobs:
           php-version: ${{ matrix.php-version }}
           driver-version: ${{ env.DRIVER_VERSION }}
           php-ini-values: "zend.assertions=1"
+          ignore-platform-req: ${{ matrix.php-version == '8.5' && 'true' || 'false' }}
 
       - name: "Run PHPUnit"
         run: "vendor/bin/phpunit"