Merge branch 'v1.18' into merge-v1.17-into-v1.18-1715326101426

* v1.18: (50 commits)
  Enable auto-merge in merge-up workflow (#1295)
  PHPLIB-1447: Add SBOM lite (#1292)
  Fix syntax error in docs (#1285)
  PHPLIB-1163 Create tutorial for using MongoDB with Bref (#1273) (#1282)
  Create sarif report when running psalm (#1280)
  Update composer.json and CI matrices for 1.18.0
  PHPLIB-1410: Invoke drivers-evergreen-tools scripts with bash (#1267)
  PHPLIB-1302: Use Composer\InstalledVersions (#1262)
  PHPLIB-1320: Support "comment" command option in Collection::createIndex() (#1263)
  PHPLIB-1413: Use env instead of matrix for driver-version (#1261)
  Fix Markdown heading
  PHPLIB-1399: Docs examples for agg expr projection (#1260)
  PHPLIB-1412: Skip range encryption tests on MongoDB 8.0+ (#1259)
  PHPLIB-1409: Skip $out and mapReduce tests on serverless (#1254)
  Exclude read-write-concern tests from serverless testing (#1253)
  PHPLIB-1409: Convert default write concern tests to unified test format (#1252)
  PHPLIB-1408: Convert ADL spec test to unified test format (#1250)
  Remove redundant annotations (#1251)
  PHPLIB-1404: Convert retryable reads spec tests to unified test format  (#1247)
  DOCSP-36627: Additional double backslash fixes for master (#1246)
  ...

.evergreen/compile-extension.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -o errexit  # Exit the script with error if any of the commands fail
 
 PATH="$PHP_PATH/bin:$PATH"

.evergreen/config.yml

@@ -47,6 +47,7 @@ include:
   - filename: .evergreen/config/test-variants.yml
 
   # Automatically generated files
+  - filename: .evergreen/config/generated/build/build-php-8.3.yml
   - filename: .evergreen/config/generated/build/build-php-8.2.yml
   - filename: .evergreen/config/generated/build/build-php-8.1.yml
   - filename: .evergreen/config/generated/build/build-php-8.0.yml
@@ -77,3 +78,9 @@ include:
   - filename: .evergreen/config/generated/test/csfle-5.0.yml
   - filename: .evergreen/config/generated/test/csfle-4.4.yml
   - filename: .evergreen/config/generated/test/csfle-4.2.yml
+  - filename: .evergreen/config/generated/test-variant/latest-php-8.3.yml
+  - filename: .evergreen/config/generated/test-variant/replicaset-php-8.2.yml
+  - filename: .evergreen/config/generated/test-variant/replicaset-php-8.1.yml
+  - filename: .evergreen/config/generated/test-variant/replicaset-php-8.0.yml
+  - filename: .evergreen/config/generated/test-variant/replicaset-php-7.4.yml
+  - filename: .evergreen/config/generated/test-variant/lowest-php-7.4.yml

.evergreen/config/functions.yml

@@ -141,7 +141,17 @@ functions:
       params:
         script: |
           ${PREPARE_SHELL}
-          SKIP_CRYPT_SHARED=${SKIP_CRYPT_SHARED} SKIP_LEGACY_SHELL=true MONGODB_VERSION=${MONGODB_VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} LOAD_BALANCER=${LOAD_BALANCER} REQUIRE_API_VERSION=${REQUIRE_API_VERSION} ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+          SKIP_CRYPT_SHARED=${SKIP_CRYPT_SHARED} \
+          SKIP_LEGACY_SHELL=true \
+          MONGODB_VERSION=${MONGODB_VERSION} \
+          ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
+          TOPOLOGY=${TOPOLOGY} \
+          AUTH=${AUTH} \
+          SSL=${SSL} \
+          STORAGE_ENGINE=${STORAGE_ENGINE} \
+          LOAD_BALANCER=${LOAD_BALANCER} \
+          REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
+          bash ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
     # run-orchestration generates expansion file with MONGODB_URI and CRYPT_SHARED_LIB_PATH
     - command: expansions.update
       params:
@@ -152,7 +162,7 @@ functions:
       params:
         script: |
           ${PREPARE_SHELL}
-          ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
+          bash ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
 
   "bootstrap mongohoused":
     - command: shell.exec
@@ -161,14 +171,14 @@ functions:
           cd ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake
 
           DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
-          ./pull-mongohouse-image.sh
+          bash ./pull-mongohouse-image.sh
     - command: shell.exec
       params:
         script: |
           cd ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake
 
           DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
-          ./run-mongohouse-image.sh
+          bash ./run-mongohouse-image.sh
 
   "create serverless instance":
     - command: subprocess.exec
@@ -235,7 +245,7 @@ functions:
           PHP_VERSION=${PHP_VERSION} \
           SSL=${SSL} \
           TESTS=${TESTS} \
-          ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
+          bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
   "run atlas data lake test":
     - command: shell.exec
@@ -248,7 +258,7 @@ functions:
           
           MONGODB_URI="mongodb://mhuser:pencil@127.0.0.1:27017" \
           TESTS="atlas-data-lake" \
-          ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
+          bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
   "run serverless tests":
     - command: shell.exec
@@ -284,7 +294,7 @@ functions:
           CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \
           MONGODB_URI="${SERVERLESS_URI}" \
           TESTS="serverless" \
-          ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
+          bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
   "cleanup":
     - command: shell.exec
@@ -310,7 +320,7 @@ functions:
           ${PREPARE_SHELL}
           file="${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh"
           # Don't use ${file} syntax here because evergreen treats it as an empty expansion.
-          [ -f "$file" ] && sh $file || echo "$file not available, skipping"
+          [ -f "$file" ] && bash $file || echo "$file not available, skipping"
 
   "install composer":
     - command: shell.exec
@@ -321,13 +331,14 @@ functions:
           ${PREPARE_SHELL}
           file="${PROJECT_DIRECTORY}/.evergreen/install-composer.sh"
           # Don't use ${file} syntax here because evergreen treats it as an empty expansion.
-          [ -f "$file" ] && DEPENDENCIES=${DEPENDENCIES} sh $file || echo "$file not available, skipping"
+          [ -f "$file" ] && DEPENDENCIES=${DEPENDENCIES} bash $file || echo "$file not available, skipping"
 
   "start load balancer":
     - command: shell.exec
       params:
         script: |
-          MONGODB_URI="${MONGODB_URI}" ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh start
+          MONGODB_URI="${MONGODB_URI}" \
+          bash ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh start
     - command: expansions.update
       params:
         file: lb-expansion.yml
@@ -338,7 +349,7 @@ functions:
         script: |
           # Only run if a load balancer was started
           if [ -n "${SINGLE_MONGOS_LB_URI}" ]; then
-            ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop
+            bash ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop
           fi
 
   "start kms servers":

.evergreen/config/generate-config.php

@@ -3,12 +3,16 @@
 
 // Supported PHP versions. Add new versions to the beginning of the list
 $supportedPhpVersions = [
+    '8.3',
     '8.2',
     '8.1',
     '8.0',
     '7.4'
 ];
 
+$latestPhpVersion = max($supportedPhpVersions);
+$lowestPhpVersion = min($supportedPhpVersions);
+
 // Supported MongoDB versions. Add new versions after "rapid"
 $supportedMongoDBVersions = [
     'latest',
@@ -51,6 +55,11 @@
 $allFiles[] = generateConfigs('test', 'mongodbVersion', 'require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions);
 $allFiles[] = generateConfigs('test', 'mongodbVersion', 'csfle.yml', 'csfle-%s', $csfleServerVersions);
 
+// Test variants
+$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'latest.yml', 'latest-php-%s', [$latestPhpVersion]);
+$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'replicaset-only.yml', 'replicaset-php-%s', array_diff($supportedPhpVersions, [$latestPhpVersion]));
+$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'lowest.yml', 'lowest-php-%s', [$lowestPhpVersion]);
+
 echo "Generated config. Use the following list to import files:\n";
 echo implode("\n", array_map('getImportConfig', array_merge(...$allFiles))) . "\n";