Merge branch 'v1.x' into merge-v1.20-into-v1.x-1727445566295

* v1.x: (95 commits)
  PHPLIB-1369 Upgrade to PHPUnit 10 (#1412)
  Higher phpunit version required (#1463)
  Fix deprecations in tests (#1458)
  Deprecate functionality to be removed (#1441)
  Expect BulkWriteException (#1455)
  Merge v1.20 into v1.x (#1447)
  PHPLIB-1525 Removes dependency to Symfony PHPUnit bridge (#1413)
  Change deprecated assertObjectHasAttribute to assertObjectHasProperty (#1432)
  Performance: Keep collections and indexes between GridFS tests (#1421)
  Add final annotations to non-internal Operation classes (#1410)
  Fix types accepted by $round (#1401)
  Replace arrayHasKey with assertArrayHasKey in tests (#1403)
  PHPLIB-1514 Make data providers static (#1404)
  PHPLIB-1515 Replace assertObjectHasAttribute with assertObjectHasProperty (#1405)
  Restore Prose22_RangeExplicitEncryptionTest (#1400)
  Remove Prose22_RangeExplicitEncryptionTest that requires ext-mongodb < 1.20 (#1394)
  Use `match` instead of `switch` when a simple value is returned (#1393)
  Remove PHPUnit functions polyfill (#1395)
  Update branch names for GHA workflows (#1390)
  PHPLIB-1419 Encode Agg builder objects in Collection methods (#1383)
  ...

Author: alcaeus

.evergreen/config.yml

@@ -66,12 +66,10 @@ include:
 
   # Automatically generated files
   - filename: .evergreen/config/generated/build/build-extension.yml
-  - filename: .evergreen/config/generated/build/build-extension-next-minor.yml
   - filename: .evergreen/config/generated/test/local.yml
   - filename: .evergreen/config/generated/test/load-balanced.yml
   - filename: .evergreen/config/generated/test/require-api-version.yml
   - filename: .evergreen/config/generated/test/csfle.yml
   - filename: .evergreen/config/generated/test-variant/modern-php-full.yml
-  - filename: .evergreen/config/generated/test-variant/legacy-php-full.yml
   - filename: .evergreen/config/generated/test-variant/phpc.yml
   - filename: .evergreen/config/generated/test-variant/lowest.yml

.evergreen/config/build-task-groups.yml

@@ -11,22 +11,10 @@ task_groups:
   # Builds all versions of PHP
   - name: "build-all-php"
     # Keep this number in sync with the number of PHP versions to allow for parallel builds
-    max_hosts: 4
+    max_hosts: 3
     setup_task: *build_setup
     setup_task_can_fail_task: true
     setup_task_timeout_secs: 1800
     teardown_task: *build_teardown
     tasks:
       - ".build"
-
-  # Builds all versions of PHP that support OpenSSL 3 (PHP 8.1+)
-  - name: "build-php-openssl3"
-    # Keep this number in sync with the number of PHP versions to allow for parallel builds
-    # Subtract 2 versions as PHP 7.4 and 8.0 are not built with OpenSSL 3
-    max_hosts: 2
-    setup_task: *build_setup
-    setup_task_can_fail_task: true
-    setup_task_timeout_secs: 1800
-    teardown_task: *build_teardown
-    tasks:
-      - ".build !.php7.4 !.php8.0"

.evergreen/config/build-variants.yml

@@ -8,7 +8,7 @@ buildvariants:
     tags: ["build", "debian", "x64"]
     run_on: debian12-small
     tasks:
-      - name: "build-php-openssl3"
+      - name: "build-all-php"
   - name: build-debian11
     display_name: "Build: Debian 11"
     tags: ["build", "debian", "x64", "pr", "tag"]
@@ -22,7 +22,7 @@ buildvariants:
     tags: ["build", "rhel", "x64", "pr", "tag"]
     run_on: rhel90-small
     tasks:
-      - name: "build-php-openssl3"
+      - name: "build-all-php"
   - name: build-rhel83-zseries
     display_name: "Build: RHEL 8.3 Zseries"
     tags: ["build", "rhel", "zseries", "tag"]
@@ -54,13 +54,13 @@ buildvariants:
     tags: ["build", "ubuntu", "x64", "pr", "tag"]
     run_on: ubuntu2204-small
     tasks:
-      - name: "build-php-openssl3"
+      - name: "build-all-php"
   - name: build-ubuntu2204-arm64
     display_name: "Build: Ubuntu 22.04 ARM64"
     tags: ["build", "ubuntu", "arm64", "tag"]
     run_on: ubuntu2204-arm64-small
     tasks:
-      - name: "build-php-openssl3"
+      - name: "build-all-php"
   - name: build-ubuntu2004
     display_name: "Build: Ubuntu 20.04 x64"
     tags: ["build", "ubuntu", "x64", "pr", "tag"]

.evergreen/config/generate-config.php

@@ -2,16 +2,11 @@
 <?php
 
 // Supported PHP versions. Add new versions to the beginning of the list
-$modernPhpVersions = [
+$supportedPhpVersions = [
     '8.3',
     '8.2',
     '8.1',
 ];
-$legacyPhpVersions = [
-    '8.0',
-    '7.4',
-];
-$supportedPhpVersions = array_merge($modernPhpVersions, $legacyPhpVersions);
 
 $latestPhpVersion = max($supportedPhpVersions);
 $lowestPhpVersion = min($supportedPhpVersions);
@@ -51,7 +46,6 @@
 
 // Build tasks
 $allFiles[] = generateConfigs('tasks', 'build', 'phpVersion', 'build-extension.yml', $supportedPhpVersions);
-$allFiles[] = generateConfigs('tasks', 'build', 'phpVersion', 'build-extension-next-minor.yml', $modernPhpVersions);
 
 // Test tasks
 $allFiles[] = generateConfigs('tasks', 'test', 'mongodbVersion', 'local.yml', $localServerVersions);
@@ -60,8 +54,7 @@
 $allFiles[] = generateConfigs('tasks', 'test', 'mongodbVersion', 'csfle.yml', $csfleServerVersions);
 
 // Test variants
-$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'modern-php-full.yml', $modernPhpVersions);
-$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'legacy-php-full.yml', $legacyPhpVersions);
+$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'modern-php-full.yml', $supportedPhpVersions);
 $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
 $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
 

.evergreen/config/generated/build/build-extension-next-minor.yml

@@ -26,3 +26,13 @@
         vars:
           EXTENSION_BRANCH: "v1.20"
       - func: "upload extension"
+  - name: "build-php-%phpVersion%-next-minor"
+    tags: ["build", "php%phpVersion%", "next-minor"]
+    commands:
+      - func: "locate PHP binaries"
+        vars:
+          PHP_VERSION: "%phpVersion%"
+      - func: "compile extension"
+        vars:
+          EXTENSION_BRANCH: "v1.x"
+      - func: "upload extension"