Merge v2.1 into v2.x (#1786)

Author: mongodb-php-bot

.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 }}"

.github/workflows/tests.yml

@@ -31,6 +31,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         mongodb-version:
           - "8.0"
         topology:
@@ -83,6 +84,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 --configuration phpunit.evergreen.xml --coverage-clover coverage.xml"