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

* v1.x: (87 commits)
  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)
  PHPLIB-1420 Integrate query builder for non-aggregation APIs (#1385)
  Fix optional parameter declared before required parameter (#1384)
  PHPLIB-1505 Add driver option "builderEncoder" (#1382)
  Exclude rector.php from the artifact
  Check generated files are up-to-date
  Replace composer package mongodb/builder
  Skip Pedentry method sort for generated files
  Remove composer constraints already imposed by the main package
  ...

.evergreen/config.yml

@@ -71,4 +71,3 @@ include:
   - 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

.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"]
@@ -34,7 +34,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"]
@@ -66,13 +66,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);
@@ -59,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);
 // TODO: Re-enable when 1.20.0 is released
 // $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
 // $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);

.gitattributes

@@ -4,6 +4,7 @@ tests export-ignore
 benchmark export-ignore
 docs export-ignore
 examples export-ignore
+generator export-ignore
 mongo-orchestration export-ignore
 stubs export-ignore
 tools export-ignore
@@ -14,6 +15,13 @@ phpunit.evergreen.xml export-ignore
 phpunit.xml.dist export-ignore
 psalm.xml.dist export-ignore
 psalm-baseline.xml export-ignore
+rector.php export-ignore
 
 # Prevent generated build files from showing diffs in pull requests
 .evergreen/config/generated/** linguist-generated=true
+/src/Builder/Accumulator/*.php linguist-generated=true
+/src/Builder/Expression/*.php linguist-generated=true
+/src/Builder/Query/*.php linguist-generated=true
+/src/Builder/Projection/*.php linguist-generated=true
+/src/Builder/Stage/*.php linguist-generated=true
+/tests/Builder/*/Pipelines.php linguist-generated=true

.github/actions/setup/action.yml

@@ -11,6 +11,9 @@ inputs:
     description: "INI values to pass along to setup-php action"
     required: false
     default: ""
+  working-directory:
+    description: "The directory where composer.json is located, if it is not in the repository root."
+    required: false
 
 runs:
   using: composite
@@ -49,3 +52,4 @@ runs:
         # Revert when psalm supports PHP 8.4
         # composer-options: "--no-suggest"
         composer-options: "--no-suggest ${{ inputs.php-version == '8.4' && '--ignore-platform-req=php+' || '' }}"
+        working-directory: "${{ inputs.working-directory }}"