From 36294dfc195baafcdad04c01e3d9b374f38fb8cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?=
 <jerome.tamarelle@mongodb.com>
Date: Fri, 9 May 2025 15:19:10 +0200
Subject: [PATCH] Test next next minor PHP version with PHP 8.4 (#1685)

---
 .evergreen/config/generate-config.php         |  6 ++---
 .../config/generated/test-variant/phpc.yml    | 24 +++++++++----------
 2 files changed, 14 insertions(+), 16 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 82a1d701a..1b455988e
--- a/.evergreen/config/generate-config.php
+++ b/.evergreen/config/generate-config.php
@@ -1,4 +1,4 @@
-#!/bin/env php
+#!/usr/bin/env php
 <?php
 
 // Supported PHP versions. Add new versions to the beginning of the list
@@ -9,9 +9,7 @@
     '8.1',
 ];
 
-// TODO: use max() once PHP 8.4 is stable
-//$latestPhpVersion = max($supportedPhpVersions);
-$latestPhpVersion = '8.3';
+$latestPhpVersion = max($supportedPhpVersions);
 $lowestPhpVersion = min($supportedPhpVersions);
 
 // Supported MongoDB versions. Add new versions after "rapid"
diff --git a/.evergreen/config/generated/test-variant/phpc.yml b/.evergreen/config/generated/test-variant/phpc.yml
index e0eb428ce..4e6db6325 100644
--- a/.evergreen/config/generated/test-variant/phpc.yml
+++ b/.evergreen/config/generated/test-variant/phpc.yml
@@ -1,17 +1,17 @@
 # This file is generated automatically - please edit the "templates/test-variant/phpc.yml" template file instead.
 buildvariants:
   # Variants with different PHPC versions
-  - name: test-debian12-php-8.3-phpc-next-stable
-    tags: ["test", "debian", "x64", "php8.3", "pr", "tag"]
-    display_name: "Test: Debian 12, PHP 8.3, PHPC next-stable"
+  - name: test-debian12-php-8.4-phpc-next-stable
+    tags: ["test", "debian", "x64", "php8.4", "pr", "tag"]
+    display_name: "Test: Debian 12, PHP 8.4, PHPC next-stable"
     run_on: debian12-small
     expansions:
       FETCH_BUILD_VARIANT: "build-debian12"
-      FETCH_BUILD_TASK: "build-php-8.3-next-stable"
-      PHP_VERSION: "8.3"
+      FETCH_BUILD_TASK: "build-php-8.4-next-stable"
+      PHP_VERSION: "8.4"
     depends_on:
       - variant: "build-debian12"
-        name: "build-php-8.3-next-stable"
+        name: "build-php-8.4-next-stable"
     tasks:
       - ".standalone .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
       - ".replicaset .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
@@ -21,17 +21,17 @@ buildvariants:
       - "test_serverless_proxy_task_group"
       - "test-atlas-data-lake"
 
-  - name: test-debian12-php-8.3-phpc-next-minor
-    tags: ["test", "debian", "x64", "php8.3"]
-    display_name: "Test: Debian 12, PHP 8.3, PHPC next-minor"
+  - name: test-debian12-php-8.4-phpc-next-minor
+    tags: ["test", "debian", "x64", "php8.4"]
+    display_name: "Test: Debian 12, PHP 8.4, PHPC next-minor"
     run_on: debian12-small
     expansions:
       FETCH_BUILD_VARIANT: "build-debian12"
-      FETCH_BUILD_TASK: "build-php-8.3-next-minor"
-      PHP_VERSION: "8.3"
+      FETCH_BUILD_TASK: "build-php-8.4-next-minor"
+      PHP_VERSION: "8.4"
     depends_on:
       - variant: "build-debian12"
-        name: "build-php-8.3-next-minor"
+        name: "build-php-8.4-next-minor"
     tasks:
       - ".standalone .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
       - ".replicaset .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"