Merge branch 'master' into merge-v1.19-into-master-1725431470349

* master: (22 commits)
  PHPC-2434: Add PHP 8.4 to GitHub Actions (#1625)
  PHPC-2421, PHPC-2428: Update bundled dependencies (#1622)
  Don't build libmongoc version in pull requests
  Use drivers-evergreen-tools for Windows testing (#1615)
  PHPC-1957 Add tests for out-of-range UTCDateTime values (#1614)
  PHPC-2286 Implement `UTCDateTime::toDateTimeImmutable` (#1611)
  PHPC-2414, PHPC-2415: Update wire versions for MongoDB 8.0 compatibility (#1610)
  PHPC-2349, PHPC-2411: Deprecate unused exception classes (#1608)
  Fix failing tests on x86 systems (#1609)
  PHPC-2347: Deprecate BSON functions (#1607)
  PHPC-1489: Deprecate integer readPreference constants (#1604)
  Fix version computation for libmongoc development versions (#1599)
  PHPC-2376: Test against MongoDB 8.0 (#1598)
  PHPC-2254: Relax server selection timeout error message pattern (#1587)
  PHPC-2401: Support QEv2 range protocol (#1583)
  PHPC-2398: Use server_id methods for libmongoc 1.28+ (#1582)
  PHPC-2395: Fetch Atlas connectivity URIs from AWS Secrets Manager (#1579)
  Merge v1.19 into master (#1578)
  Revert "Bump mongodb-labs/drivers-github-tools from 1 to 2 (#1568)" (#1571)
  Bump mongodb-labs/drivers-github-tools from 1 to 2 (#1568)
  ...

.evergreen/compile-unix.sh

@@ -65,19 +65,21 @@ esac
 # Report the current PHP version
 echo "PHP: `php --version | head -n 1`"
 
-# If we're testing a specific version of libmongoc, update submodule sources
+# If we're testing a specific version of libmongoc, update submodule sources and version
 if [ -n "$LIBMONGOC_VERSION" ]; then
+ echo "Finding Python3 binary..."
+ PYTHON="$(bash -c ". $DRIVERS_TOOLS/.evergreen/find-python3.sh && find_python3 2>/dev/null")"
+ echo "Finding Python3 binary... done."
+
  php scripts/update-submodule-sources.php
+
+ # We invoke python manually as it may not be in the path
+ pushd src/libmongoc/
+ $PYTHON build/calc_release_version.py > ../LIBMONGOC_VERSION_CURRENT
+ popd
 fi
 
 phpize
 ./configure --enable-mongodb-developer-flags
 
-# configure relies on version information in libmongoc-version-current, but the target is not available until after calling configure
-# To work around this, run the make target, then run configure again
-if [ -n "$LIBMONGOC_VERSION" ]; then
- make libmongoc-version-current
- ./configure --enable-mongodb-developer-flags
-fi
-
 make test TESTS="tests/smoketest.phpt"

.evergreen/config.yml

@@ -29,7 +29,7 @@ post:
 github_pr_aliases: &github_pr_aliases
  # Always test all builds for consistency
  - variant_tags: ["pr build"]
- task_tags: ["pr"]
+ task_tags: ["pr !build-libmongoc"]
  # Run all tasks in PR variants for PHP 8.3 (excluding MongoDB latest)
  - variant_tags: ["pr php8.3"]
  task_tags: ["!latest"]
@@ -74,5 +74,6 @@ include:
  - filename: .evergreen/config/generated/test/ocsp.yml
  - filename: .evergreen/config/generated/test/require-api-version.yml
  - filename: .evergreen/config/generated/test/skip-crypt-shared.yml
- - filename: .evergreen/config/generated/test-variant/full.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/libmongoc.yml

.evergreen/config/build-variants.yml

@@ -3,13 +3,19 @@
 #
 buildvariants:
  # Debian
+ - name: build-debian12
+ display_name: "Build: Debian 12"
+ tags: ["build", "debian", "x64", "pr", "tag"]
+ run_on: debian12-small
+ tasks:
+ - name: "build-php-openssl3"
+ - name: "build-php-libmongoc"
  - name: build-debian11
  display_name: "Build: Debian 11"
  tags: ["build", "debian", "x64", "pr", "tag"]
  run_on: debian11-small
  tasks:
  - name: "build-all-php"
- - name: "build-php-libmongoc"
  - name: build-debian10
  display_name: "Build: Debian 10"
  tags: ["build", "debian", "x64", "pr", "tag"]

.evergreen/config/functions.yml

@@ -210,7 +210,6 @@ functions:
  params:
  include_expansions_in_env:
  - API_VERSION
- - ATLAS_CONNECTIVITY_URIS
  - CRYPT_SHARED_LIB_PATH
  - MONGODB_URI
  - APPEND_URI

.evergreen/config/generate-config.php

@@ -2,25 +2,28 @@
 <?php
 
 // Supported PHP versions. Add new versions to the beginning of the list
-$supportedPhpVersions = [
+$modernPhpVersions = [
  '8.3',
  '8.2',
  '8.1',
+];
+$legacyPhpVersions = [
  '8.0',
  '7.4',
 ];
+$supportedPhpVersions = array_merge($modernPhpVersions, $legacyPhpVersions);
 
 // Supported MongoDB versions. Add new versions after "rapid"
 $supportedMongoDBVersions = [
  'latest',
  'rapid',
+ '8.0',
  '7.0',
  '6.0',
  '5.0',
  '4.4',
  '4.2',
  '4.0',
- '3.6',
 ];
 
 $latestPhpVersion = max($supportedPhpVersions);
@@ -65,7 +68,8 @@
 $allFiles[] = generateConfigs('tasks', 'test', 'mongodbVersion', 'skip-crypt-shared.yml', $skipCryptSharedServerVersions);
 
 // Test variants
-$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'full.yml', $supportedPhpVersions);
+$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', 'libmongoc.yml', [$latestPhpVersion]);
 
 echo "Generated config. Use the following list to import files:\n";