Merge pull request #1282

jmikola · jmikola · commit 6fab43c93347 · 2022-02-10T13:21:12.000-05:00
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -1157,19 +1157,16 @@ axes:
   - id: libmongoc-version
     display_name: libmongoc version
     values:
-      # TODO: enable lowest-supported and upcoming-stable after 1.20.0 is
-      # released and r1.20 is branched. As-is, r1.19 cannot be compiled because
-      # PHP_MONGODB_MONGOC_SOURCES conflicts with 1.20-dev (see: PHPC-2006).
-      #- id: "lowest-supported"
-      #  display_name: "1.19.1"
-      #  variables:
-      #    LIBMONGOC_VERSION: "1.19.1"
-      #- id: "upcoming-stable"
-      #  display_name: "1.19-dev"
-      #  variables:
-      #    LIBMONGOC_VERSION: "r1.19"
+      - id: "lowest-supported"
+        display_name: "1.21.0"
+        variables:
+          LIBMONGOC_VERSION: "1.21.0"
+      - id: "upcoming-stable"
+        display_name: "1.21-dev"
+        variables:
+          LIBMONGOC_VERSION: "r1.21"
       - id: "latest-dev"
-        display_name: "1.20-dev (master)"
+        display_name: "1.22-dev (master)"
         variables:
           LIBMONGOC_VERSION: "master"
 
diff --git a/src/LIBMONGOC_VERSION_CURRENT b/src/LIBMONGOC_VERSION_CURRENT
@@ -1 +1 @@
-1.11.1-20220104+gite7e15002d6
+1.21.0
diff --git a/src/libmongoc b/src/libmongoc
@@ -1 +1 @@
-Subproject commit e7e15002d63cb57424f467c5f21eafa9ec0f018e
+Subproject commit e2f1784f49a51d41a619f2ab29c908852eac0ca0
diff --git a/tests/bulk/bulkwrite-debug-002.phpt b/tests/bulk/bulkwrite-debug-002.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\BulkWrite debug output after execution
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/command/cursor-tailable-001.phpt b/tests/command/cursor-tailable-001.phpt
@@ -3,9 +3,9 @@ MongoDB\Driver\Command tailable cursor iteration with maxAwaitTimeMS option
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_server_storage_engine('wiredTiger'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/cursor/bug1050-001.phpt b/tests/cursor/bug1050-001.phpt
@@ -3,9 +3,9 @@ PHPC-1050: Command cursor should not invoke getMore at execution
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_server_storage_engine('wiredTiger'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/cursor/bug1050-002.phpt b/tests/cursor/bug1050-002.phpt
@@ -4,9 +4,9 @@ PHPC-1050: Command cursor should not invoke getMore at execution (rewind omitted
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_php_version('>', '7.99'); ?>
 <?php skip_if_not_replica_set(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_server_storage_engine('wiredTiger'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/cursor/bug1529-001.phpt b/tests/cursor/bug1529-001.phpt
@@ -4,9 +4,9 @@ PHPC-1529: Resetting a client should also reset the keyVaultClient
 <?php if (!function_exists('pcntl_fork')) { die('skip pcntl_fork() not available'); } ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_libmongocrypt(); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/cursor/cursor-tailable-003.phpt b/tests/cursor/cursor-tailable-003.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\Cursor tailable iteration with awaitData and maxAwaitTimeMS optio
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.2'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/cursor/cursor-tailable_error-002.phpt b/tests/cursor/cursor-tailable_error-002.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\Cursor cursor killed during tailable iteration
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.2'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/cursorid/cursorid-002.phpt b/tests/cursorid/cursorid-002.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\CursorId BSON serialization for killCursors command
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.2'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 
diff --git a/tests/manager/manager-executeBulkWrite-011.phpt b/tests/manager/manager-executeBulkWrite-011.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\BulkWrite: bypassDocumentValidation option
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.2'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/manager/manager-executeCommand-004.phpt b/tests/manager/manager-executeCommand-004.phpt
@@ -5,8 +5,8 @@ MongoDB\Driver\Manager::executeCommand() options (MONGOC_CMD_RAW)
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_replica_set(); ?>
 <?php skip_if_no_secondary(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/manager/manager-executeReadCommand-001.phpt b/tests/manager/manager-executeReadCommand-001.phpt
@@ -5,9 +5,9 @@ MongoDB\Driver\Manager::executeReadCommand()
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_replica_set(); ?>
 <?php skip_if_no_secondary(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_server_storage_engine('wiredTiger'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/manager/manager-executeReadWriteCommand-001.phpt b/tests/manager/manager-executeReadWriteCommand-001.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\Manager::executeReadWriteCommand()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.4'); /* aggregate write concern */ ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/manager/manager-executeWriteCommand-001.phpt b/tests/manager/manager-executeWriteCommand-001.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\Manager::executeWriteCommand()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-construct-001.phpt b/tests/server/server-construct-001.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\Server::__construct()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_multiple_mongos(); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-executeCommand-006.phpt b/tests/server/server-executeCommand-006.phpt
@@ -4,8 +4,8 @@ MongoDB\Driver\Server::executeCommand() options (MONGO_CMD_RAW)
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_standalone(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-executeCommand-008.phpt b/tests/server/server-executeCommand-008.phpt
@@ -4,8 +4,8 @@ MongoDB\Driver\Server::executeCommand() does not send read preference to standal
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_standalone(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-executeQuery-012.phpt b/tests/server/server-executeQuery-012.phpt
@@ -1,5 +1,7 @@
 --TEST--
 MongoDB\Driver\Server::executeQuery() pins transaction to server
+--XFAIL--
+_mongoc_cursor_fetch_stream segfault (CDRIVER-4290)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_mongos(); ?>
diff --git a/tests/server/server-executeReadCommand-001.phpt b/tests/server/server-executeReadCommand-001.phpt
@@ -5,9 +5,9 @@ MongoDB\Driver\Server::executeReadCommand()
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_replica_set(); ?>
 <?php skip_if_no_secondary(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_server_storage_engine('wiredTiger'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-executeReadWriteCommand-001.phpt b/tests/server/server-executeReadWriteCommand-001.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\Server::executeReadWriteCommand()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.2'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-executeWriteCommand-001.phpt b/tests/server/server-executeWriteCommand-001.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\Server::executeWriteCommand()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/writeResult/writeresult-getupsertedids-002.phpt b/tests/writeResult/writeresult-getupsertedids-002.phpt
@@ -3,8 +3,8 @@ MongoDB\Driver\WriteResult::getUpsertedIds() with client-generated values
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.0'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-1.11.1-20220104+gite7e15002d6`
	`1`	`+1.21.0`