Merge v1.20 into v1.x (#1452)

.evergreen/config.yml

@@ -71,3 +71,5 @@ 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/phpc.yml
+  - filename: .evergreen/config/generated/test-variant/lowest.yml

.evergreen/config/generate-config.php

@@ -55,9 +55,8 @@
 
 // Test variants
 $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]);
+$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
+$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
 
 echo "Generated config. Use the following list to import files:\n";
 echo implode("\n", array_map('getImportConfig', $allFiles)) . "\n";

.evergreen/config/templates/build/build-extension.yml

@@ -5,38 +5,34 @@
         vars:
           PHP_VERSION: "%phpVersion%"
       - func: "compile extension"
-        # TODO: remove once 1.20.0 is released
+      - func: "upload extension"
+  - name: "build-php-%phpVersion%-lowest"
+    tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"]
+    commands:
+      - func: "locate PHP binaries"
+        vars:
+          PHP_VERSION: "%phpVersion%"
+      - func: "compile extension"
+        vars:
+          EXTENSION_VERSION: "1.20.0"
+      - func: "upload extension"
+  - name: "build-php-%phpVersion%-next-stable"
+    tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"]
+    commands:
+      - func: "locate PHP binaries"
+        vars:
+          PHP_VERSION: "%phpVersion%"
+      - func: "compile extension"
         vars:
           EXTENSION_BRANCH: "v1.20"
       - func: "upload extension"
-  # TODO: re-enable once 1.20.0 is released
-#  - name: "build-php-%phpVersion%-lowest"
-#    tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"]
-#    commands:
-#      - func: "locate PHP binaries"
-#        vars:
-#          PHP_VERSION: "%phpVersion%"
-#      - func: "compile extension"
-#        vars:
-#          EXTENSION_VERSION: "1.20.0"
-#      - func: "upload extension"
-#  - name: "build-php-%phpVersion%-next-stable"
-#    tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"]
-#    commands:
-#      - func: "locate PHP binaries"
-#        vars:
-#          PHP_VERSION: "%phpVersion%"
-#      - func: "compile extension"
-#        vars:
-#          EXTENSION_BRANCH: "v1.20.0"
-#      - 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: "master"
-#      - 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"

.github/workflows/coding-standards.yml

@@ -13,9 +13,7 @@ on:
 
 env:
   PHP_VERSION: "8.2"
-  # TODO: change to "stable" once 1.20.0 is released
-  # DRIVER_VERSION: "stable"
-  DRIVER_VERSION: "mongodb/[email protected]"
+  DRIVER_VERSION: "stable"
 
 jobs:
   phpcs:

.github/workflows/static-analysis.yml

@@ -19,9 +19,7 @@ on:
 
 env:
   PHP_VERSION: "8.2"
-  # TODO: change to "stable" once 1.20.0 is released
-  # DRIVER_VERSION: "stable"
-  DRIVER_VERSION: "mongodb/[email protected]"
+  DRIVER_VERSION: "stable"
 
 jobs:
   psalm:

.github/workflows/tests.yml

@@ -12,9 +12,7 @@ on:
       - "feature/*"
 
 env:
-  # TODO: change to "stable" once 1.20.0 is released
-  # DRIVER_VERSION: "stable"
-  DRIVER_VERSION: "mongodb/[email protected]"
+  DRIVER_VERSION: "stable"
 
 jobs:
   phpunit:

tests/Operation/FindFunctionalTest.php

@@ -48,7 +48,9 @@ function () use ($modifiers): void {
                     ['modifiers' => $modifiers],
                 );
 
-                $operation->execute($this->getPrimaryServer());
+                $this->assertDeprecated(
+                    fn () => $operation->execute($this->getPrimaryServer()),
+                );
             },
             function (array $event) use ($expectedSort): void {
                 $this->assertEquals($expectedSort, $event['started']->getCommand()->sort ?? null);