From 6e1a6c13b1160057b52d2ec8986c909c64b65c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= <jerome@tamarelle.net>
Date: Fri, 6 Feb 2026 10:35:02 +0100
Subject: [PATCH] PHPC-2679 Test PHP 8.5 on Evergreen

---
 .evergreen/config/generate-config.php         |  3 +-
 .../generated/build/build-libmongoc.yml       | 18 ++---
 .../config/generated/build/build-php.yml      |  7 ++
 .../generated/test-variant/libmongoc.yml      | 30 +++----
 .../generated/test-variant/php-full.yml       | 79 +++++++++++++++++++
 5 files changed, 112 insertions(+), 25 deletions(-)
 mode change 100644 => 100755 .evergreen/config/generate-config.php

diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php
old mode 100644
new mode 100755
index cec13919c..01acb11d4
--- a/.evergreen/config/generate-config.php
+++ b/.evergreen/config/generate-config.php
@@ -1,8 +1,9 @@
-#!/bin/env php
+#!/usr/bin/env php
 <?php
 
 // Supported PHP versions. Add new versions to the beginning of the list
 $phpVersions = [
+    '8.5',
     '8.4',
     '8.3',
     '8.2',
diff --git a/.evergreen/config/generated/build/build-libmongoc.yml b/.evergreen/config/generated/build/build-libmongoc.yml
index 3bb18605d..65cc9ce6a 100644
--- a/.evergreen/config/generated/build/build-libmongoc.yml
+++ b/.evergreen/config/generated/build/build-libmongoc.yml
@@ -6,29 +6,29 @@ tasks:
 # These tasks are used in the build task group "build-php-libmongoc" defined in .evergreen/config/templates/build-task-groups.yml,
 # where the "max_hosts" setting must be set to the number of enabled tasks.
 # Last but not least, make sure the corresponding test variants are enabled in .evergreen/config/templates/test-variant/libmongoc.yml
-  - name: "build-php-8.4-libmongoc-lowest-supported"
-    tags: ["build-libmongoc", "php8.4"]
+  - name: "build-php-8.5-libmongoc-lowest-supported"
+    tags: ["build-libmongoc", "php8.5"]
     commands:
       - func: "compile driver"
         vars:
-          PHP_VERSION: "8.4"
+          PHP_VERSION: "8.5"
           LIBMONGOC_VERSION: "2.2.2"
       - func: "upload build"
 
-  - name: "build-php-8.4-libmongoc-next-stable"
-    tags: ["build-libmongoc", "php8.4"]
+  - name: "build-php-8.5-libmongoc-next-stable"
+    tags: ["build-libmongoc", "php8.5"]
     commands:
       - func: "compile driver"
         vars:
-          PHP_VERSION: "8.4"
+          PHP_VERSION: "8.5"
           LIBMONGOC_VERSION: "r2.2"
       - func: "upload build"
 
-  - name: "build-php-8.4-libmongoc-latest"
-    tags: ["build-libmongoc", "php8.4"]
+  - name: "build-php-8.5-libmongoc-latest"
+    tags: ["build-libmongoc", "php8.5"]
     commands:
       - func: "compile driver"
         vars:
-          PHP_VERSION: "8.4"
+          PHP_VERSION: "8.5"
           LIBMONGOC_VERSION: "master"
       - func: "upload build"
diff --git a/.evergreen/config/generated/build/build-php.yml b/.evergreen/config/generated/build/build-php.yml
index 6126a1466..3c304f79e 100644
--- a/.evergreen/config/generated/build/build-php.yml
+++ b/.evergreen/config/generated/build/build-php.yml
@@ -1,5 +1,12 @@
 # This file is generated automatically - please edit the "templates/build/build-php.yml" template file instead.
 tasks:
+  - name: "build-php-8.5"
+    tags: ["build", "php8.5", "pr", "tag"]
+    commands:
+      - func: "compile driver"
+        vars:
+          PHP_VERSION: "8.5"
+      - func: "upload build"
   - name: "build-php-8.4"
     tags: ["build", "php8.4", "pr", "tag"]
     commands:
diff --git a/.evergreen/config/generated/test-variant/libmongoc.yml b/.evergreen/config/generated/test-variant/libmongoc.yml
index f7e839552..15035110a 100644
--- a/.evergreen/config/generated/test-variant/libmongoc.yml
+++ b/.evergreen/config/generated/test-variant/libmongoc.yml
@@ -1,16 +1,16 @@
 # This file is generated automatically - please edit the "templates/test-variant/libmongoc.yml" template file instead.
 buildvariants:
   # Variants with different libmongoc
-  - name: test-debian12-php-8.4-libmongoc-lowest-supported
-    tags: ["test", "libmongoc", "debian", "x64", "php8.4", "pr", "tag"]
-    display_name: "Test: Debian 12, PHP 8.4, libmongoc lowest"
+  - name: test-debian12-php-8.5-libmongoc-lowest-supported
+    tags: ["test", "libmongoc", "debian", "x64", "php8.5", "pr", "tag"]
+    display_name: "Test: Debian 12, PHP 8.5, libmongoc lowest"
     run_on: debian12-small
     expansions:
       FETCH_BUILD_VARIANT: "build-debian12"
-      FETCH_BUILD_TASK: "build-php-8.4-libmongoc-lowest-supported"
+      FETCH_BUILD_TASK: "build-php-8.5-libmongoc-lowest-supported"
     depends_on:
       - variant: "build-debian12"
-        name: "build-php-8.4-libmongoc-lowest-supported"
+        name: "build-php-8.5-libmongoc-lowest-supported"
     tasks:
       - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
       - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
@@ -32,16 +32,16 @@ buildvariants:
         execution_tasks:
           - ".ocsp .7.0"
 
-  - name: test-debian12-php-8.4-libmongoc-next-stable
-    tags: ["test", "libmongoc", "debian", "x64", "php8.4", "pr", "tag"]
-    display_name: "Test: Debian 12, PHP 8.4, libmongoc next stable"
+  - name: test-debian12-php-8.5-libmongoc-next-stable
+    tags: ["test", "libmongoc", "debian", "x64", "php8.5", "pr", "tag"]
+    display_name: "Test: Debian 12, PHP 8.5, libmongoc next stable"
     run_on: debian12-small
     expansions:
       FETCH_BUILD_VARIANT: "build-debian12"
-      FETCH_BUILD_TASK: "build-php-8.4-libmongoc-next-stable"
+      FETCH_BUILD_TASK: "build-php-8.5-libmongoc-next-stable"
     depends_on:
       - variant: "build-debian12"
-        name: "build-php-8.4-libmongoc-next-stable"
+        name: "build-php-8.5-libmongoc-next-stable"
     tasks:
       - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
       - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
@@ -63,16 +63,16 @@ buildvariants:
         execution_tasks:
           - ".ocsp .7.0"
 
-  - name: test-debian12-php-8.4-libmongoc-latest
-    tags: ["test", "libmongoc", "debian", "x64", "php8.4"]
-    display_name: "Test: Debian 12, PHP 8.4, libmongoc latest"
+  - name: test-debian12-php-8.5-libmongoc-latest
+    tags: ["test", "libmongoc", "debian", "x64", "php8.5"]
+    display_name: "Test: Debian 12, PHP 8.5, libmongoc latest"
     run_on: debian12-small
     expansions:
       FETCH_BUILD_VARIANT: "build-debian12"
-      FETCH_BUILD_TASK: "build-php-8.4-libmongoc-latest"
+      FETCH_BUILD_TASK: "build-php-8.5-libmongoc-latest"
     depends_on:
       - variant: "build-debian12"
-        name: "build-php-8.4-libmongoc-latest"
+        name: "build-php-8.5-libmongoc-latest"
     tasks:
       - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
       - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
diff --git a/.evergreen/config/generated/test-variant/php-full.yml b/.evergreen/config/generated/test-variant/php-full.yml
index e441a2e64..bdcbd0737 100644
--- a/.evergreen/config/generated/test-variant/php-full.yml
+++ b/.evergreen/config/generated/test-variant/php-full.yml
@@ -1,6 +1,85 @@
 # This file is generated automatically - please edit the "templates/test-variant/php-full.yml" template file instead.
 buildvariants:
   # Test MongoDB >= 7.0
+  - name: test-debian12-php-8.5
+    tags: ["test", "debian", "x64", "php8.5", "pr", "tag"]
+    display_name: "Test: Debian 12, PHP 8.5"
+    run_on: debian12-small
+    expansions:
+      FETCH_BUILD_VARIANT: "build-debian12"
+      FETCH_BUILD_TASK: "build-php-8.5"
+    depends_on:
+      - variant: "build-debian12"
+        name: "build-php-8.5"
+    tasks:
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".ocsp !.4.4 !.5.0 !.6.0"
+      - "test-atlas-connectivity"
+    display_tasks:
+      - name: "test-ocsp-latest"
+        execution_tasks:
+          - ".ocsp .latest"
+      - name: "test-ocsp-rapid"
+        execution_tasks:
+          - ".ocsp .rapid"
+      - name: "test-ocsp-8.0"
+        execution_tasks:
+          - ".ocsp .8.0"
+      - name: "test-ocsp-7.0"
+        execution_tasks:
+          - ".ocsp .7.0"
+
+  # Test MongoDB 5.0 and 6.0
+  - name: test-debian11-php-8.5
+    tags: ["test", "debian", "x64", "php8.5", "pr", "tag"]
+    display_name: "Test: Debian 11, PHP 8.5"
+    run_on: debian11-small
+    expansions:
+      FETCH_BUILD_VARIANT: "build-debian11"
+      FETCH_BUILD_TASK: "build-php-8.5"
+    depends_on:
+      - variant: "build-debian11"
+        name: "build-php-8.5"
+    tasks:
+      # Remember to add new major versions here as they are released
+      - ".standalone .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".replicaset .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".sharded .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".loadbalanced .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+    display_tasks:
+      - name: "test-ocsp-6.0"
+        execution_tasks:
+          - ".ocsp .6.0"
+      - name: "test-ocsp-5.0"
+        execution_tasks:
+          - ".ocsp .5.0"
+
+  # Test versions < 5.0
+  - name: test-rhel80-php-8.5
+    tags: ["test", "rhel", "x64", "php8.5", "pr", "tag"]
+    display_name: "Test: RHEL 8.0, PHP 8.5"
+    run_on: rhel80-small
+    expansions:
+      FETCH_BUILD_VARIANT: "build-rhel8"
+      FETCH_BUILD_TASK: "build-php-8.5"
+    depends_on:
+      - variant: "build-rhel8"
+        name: "build-php-8.5"
+    tasks:
+      # Remember to add new major versions here as they are released
+      - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
+      - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
+      - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
+      - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
+    display_tasks:
+      - name: "test-ocsp-4.4"
+        execution_tasks:
+          - ".ocsp .4.4"
+  # Test MongoDB >= 7.0
   - name: test-debian12-php-8.4
     tags: ["test", "debian", "x64", "php8.4", "pr", "tag"]
     display_name: "Test: Debian 12, PHP 8.4"