Merge branch 'v1.13' into v1.15

Author: jmikola

.evergreen/config.yml

@@ -692,15 +692,15 @@ axes:
     display_name: Driver Version
     values:
       - id: "oldest-supported"
-        display_name: "PHPC 1.15.0"
+        display_name: "PHPC 1.15.0"
         variables:
           EXTENSION_VERSION: "1.15.0"
       - id: "latest-stable"
-        display_name: "PHPC (1.15.x)"
+        display_name: "PHPC (stable)"
         variables:
           EXTENSION_VERSION: "stable"
       - id: "latest-dev"
-        display_name: "PHPC (1.16-dev)"
+        display_name: "PHPC (master)"
         variables:
           EXTENSION_BRANCH: "master"
 

.github/workflows/tests.yml

@@ -34,34 +34,34 @@ jobs:
         mongodb-version:
           - "4.4"
         driver-version:
-          - "mongodb/mongo-php-driver@master"
+          - "stable"
         topology:
           - "server"
         include:
           - os: "ubuntu-20.04"
             php-version: "8.0"
             mongodb-version: "6.0"
-            driver-version: "mongodb/mongo-php-driver@master"
+            driver-version: "stable"
             topology: "replica_set"
           - os: "ubuntu-20.04"
             php-version: "8.0"
             mongodb-version: "6.0"
-            driver-version: "mongodb/mongo-php-driver@master"
+            driver-version: "stable"
             topology: "sharded_cluster"
           - os: "ubuntu-20.04"
             php-version: "8.0"
             mongodb-version: "5.0"
-            driver-version: "mongodb/mongo-php-driver@master"
+            driver-version: "stable"
             topology: "server"
           - os: "ubuntu-20.04"
             php-version: "8.0"
             mongodb-version: "4.4"
-            driver-version: "mongodb/mongo-php-driver@master"
+            driver-version: "stable"
             topology: "replica_set"
           - os: "ubuntu-20.04"
             php-version: "8.0"
             mongodb-version: "4.4"
-            driver-version: "mongodb/mongo-php-driver@master"
+            driver-version: "stable"
             topology: "sharded_cluster"
 
     steps:

tests/DocumentationExamplesTest.php

@@ -1867,6 +1867,11 @@ public function testQueryableEncryption(): void
             $this->markTestSkipped('Queryable encryption requires MongoDB 6.0 or later');
         }
 
+        // Note: this version requirement is consistent with QEv1 spec tests
+        if (version_compare($this->getServerVersion(), '6.2.99', '>')) {
+            $this->markTestSkipped('MongoDB 7.0 and later requires Queryable Encryption v2 protocol');
+        }
+
         if (! $this->isEnterprise()) {
             $this->markTestSkipped('Automatic encryption requires MongoDB Enterprise');
         }

tests/SpecTests/ClientSideEncryptionSpecTest.php

@@ -1241,6 +1241,11 @@ public function testExplicitEncryption(Closure $test): void
             $this->markTestSkipped('Explicit encryption tests require MongoDB 6.0 or later');
         }
 
+        // Note: this version requirement is consistent with QEv1 spec tests
+        if (version_compare($this->getServerVersion(), '6.2.99', '>')) {
+            $this->markTestSkipped('MongoDB 7.0 and later requires Queryable Encryption v2 protocol');
+        }
+
         // Test setup
         $encryptedFields = $this->decodeJson(file_get_contents(__DIR__ . '/client-side-encryption/etc/data/encryptedFields.json'));
         $key1Document = $this->decodeJson(file_get_contents(__DIR__ . '/client-side-encryption/etc/data/keys/key1-document.json'));

tests/SpecTests/client-side-encryption/tests/fle2-BypassQueryAnalysis.json

@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",

tests/SpecTests/client-side-encryption/tests/fle2-Compact.json

@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",