From 68f00d114cf46d99c3350839048587bb4e38c2b6 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 10 Dec 2025 10:29:26 +0100 Subject: [PATCH 1/3] PHPC-2654: Update to libmongoc 2.2.1 --- .../config/generated/build/build-libmongoc.yml | 4 ++-- .../config/templates/build/build-libmongoc.yml | 4 ++-- .github/workflows/tests.yml | 2 +- config.m4 | 10 +++++----- config.w32 | 2 +- sbom.json | 16 ++++++++-------- src/libmongoc | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.evergreen/config/generated/build/build-libmongoc.yml b/.evergreen/config/generated/build/build-libmongoc.yml index 5ea3a68b1..9b6f6382f 100644 --- a/.evergreen/config/generated/build/build-libmongoc.yml +++ b/.evergreen/config/generated/build/build-libmongoc.yml @@ -12,7 +12,7 @@ tasks: - func: "compile driver" vars: PHP_VERSION: "8.4" - LIBMONGOC_VERSION: "2.1.2" + LIBMONGOC_VERSION: "2.2.1" - func: "upload build" - name: "build-php-8.4-libmongoc-next-stable" @@ -21,7 +21,7 @@ tasks: - func: "compile driver" vars: PHP_VERSION: "8.4" - LIBMONGOC_VERSION: "r2.1" + LIBMONGOC_VERSION: "r2.2" - func: "upload build" - name: "build-php-8.4-libmongoc-latest" diff --git a/.evergreen/config/templates/build/build-libmongoc.yml b/.evergreen/config/templates/build/build-libmongoc.yml index 9c4643be4..c4fe71dca 100644 --- a/.evergreen/config/templates/build/build-libmongoc.yml +++ b/.evergreen/config/templates/build/build-libmongoc.yml @@ -10,7 +10,7 @@ - func: "compile driver" vars: PHP_VERSION: "%phpVersion%" - LIBMONGOC_VERSION: "2.1.2" + LIBMONGOC_VERSION: "2.2.1" - func: "upload build" - name: "build-php-%phpVersion%-libmongoc-next-stable" @@ -19,7 +19,7 @@ - func: "compile driver" vars: PHP_VERSION: "%phpVersion%" - LIBMONGOC_VERSION: "r2.1" + LIBMONGOC_VERSION: "r2.2" - func: "upload build" - name: "build-php-%phpVersion%-libmongoc-latest" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f9950cfdb..6bcabfa78 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -148,7 +148,7 @@ jobs: # Note: omit the patch version when referring to the libmongocrypt package LIBMONGOCRYPT_VERSION: "1.16" # Note: include the patch version when referring to a libmongoc release tarball - LIBMONGOC_VERSION: "2.1.2" + LIBMONGOC_VERSION: "2.2.1" SERVER_VERSION: "8.0" steps: diff --git a/config.m4 b/config.m4 index e8e115cd7..bf1e78fc6 100644 --- a/config.m4 +++ b/config.m4 @@ -243,7 +243,7 @@ if test "$PHP_MONGODB" != "no"; then PHP_MONGODB_MONGOCRYPT_VERSION_STRING="None" if test "$PHP_MONGODB_SYSTEM_LIBS" != "no"; then - PKG_CHECK_MODULES([PHP_MONGODB_BSON], [bson2 >= 2.1.2], [ + PKG_CHECK_MODULES([PHP_MONGODB_BSON], [bson2 >= 2.2.1], [ PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG bson2 --modversion` PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)" @@ -251,10 +251,10 @@ if test "$PHP_MONGODB" != "no"; then PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD) AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson]) ],[ - AC_MSG_ERROR([Could not find system library for libbson >= 2.1.2]) + AC_MSG_ERROR([Could not find system library for libbson >= 2.2.1]) ]) - PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [mongoc2 >= 2.1.2], [ + PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [mongoc2 >= 2.2.1], [ PHP_MONGODB_MONGOC_VERSION=`$PKG_CONFIG mongoc2 --modversion` PHP_MONGODB_MONGOC_VERSION_STRING="System ($PHP_MONGODB_MONGOC_VERSION)" @@ -262,7 +262,7 @@ if test "$PHP_MONGODB" != "no"; then PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOC_LIBS, MONGODB_SHARED_LIBADD) AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc]) ],[ - AC_MSG_ERROR(Could not find system library for libmongoc >= 2.1.2) + AC_MSG_ERROR(Could not find system library for libmongoc >= 2.2.1) ]) if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then @@ -361,7 +361,7 @@ if test "$PHP_MONGODB" != "no"; then PHP_MONGODB_KMS_MESSAGE_SOURCES="hexlify.c kms_azure_request.c kms_b64.c kms_caller_identity_request.c kms_crypto_apple.c kms_crypto_libcrypto.c kms_crypto_none.c kms_crypto_windows.c kms_decrypt_request.c kms_encrypt_request.c kms_gcp_request.c kms_kmip_reader_writer.c kms_kmip_request.c kms_kmip_response.c kms_kmip_response_parser.c kms_kv_list.c kms_message.c kms_port.c kms_request.c kms_request_opt.c kms_request_str.c kms_response.c kms_response_parser.c sort.c" PHP_MONGODB_BSON_SOURCES="bson-bcon.c bson.c bson-clock.c bson-context.c bson-decimal128.c bson-iso8601.c bson-iter.c bson-json.c bson-keys.c bson-oid.c bson-reader.c bson-string.c bson-timegm.c bson-utf8.c bson-value.c bson-vector.c bson-version-functions.c bson-writer.c error.c memory.c validate.c" PHP_MONGODB_JSONSL_SOURCES="jsonsl.c" - PHP_MONGODB_MONGOC_SOURCES="mcd-azure.c mcd-nsinfo.c mcd-rpc.c mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-bulkwrite.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-deprioritized-servers.c mongoc-error.c mongoc-find-and-modify.c mongoc-flags.c mongoc-generation-map.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-init.c mongoc-interrupt.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log-and-monitor-private.c mongoc-log.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-oidc-callback.c mongoc-oidc-env.c mongoc-opcode.c mongoc-openssl.c mongoc-optional.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-api.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-shared.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-structured-log.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-ts-pool.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-concern.c service-gcp.c" + PHP_MONGODB_MONGOC_SOURCES="mcd-azure.c mcd-nsinfo.c mcd-rpc.c mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-bulkwrite.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-oidc.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cyrus.c mongoc-database.c mongoc-deprioritized-servers.c mongoc-error.c mongoc-find-and-modify.c mongoc-flags.c mongoc-generation-map.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-init.c mongoc-interrupt.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log-and-monitor-private.c mongoc-log.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-oidc-cache.c mongoc-oidc-callback.c mongoc-oidc-env.c mongoc-opcode.c mongoc-openssl.c mongoc-optional.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-api.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-shared.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-structured-log.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-ts-pool.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-concern.c service-gcp.c" PHP_MONGODB_UTF8PROC_SOURCES="utf8proc.c" PHP_MONGODB_ZLIB_SOURCES="adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c" diff --git a/config.w32 b/config.w32 index 6baa3e0a9..0b5c66034 100644 --- a/config.w32 +++ b/config.w32 @@ -111,7 +111,7 @@ if (PHP_MONGODB != "no") { var PHP_MONGODB_KMS_MESSAGE_SOURCES="hexlify.c kms_azure_request.c kms_b64.c kms_caller_identity_request.c kms_crypto_apple.c kms_crypto_libcrypto.c kms_crypto_none.c kms_crypto_windows.c kms_decrypt_request.c kms_encrypt_request.c kms_gcp_request.c kms_kmip_reader_writer.c kms_kmip_request.c kms_kmip_response.c kms_kmip_response_parser.c kms_kv_list.c kms_message.c kms_port.c kms_request.c kms_request_opt.c kms_request_str.c kms_response.c kms_response_parser.c sort.c"; var PHP_MONGODB_BSON_SOURCES="bson-bcon.c bson.c bson-clock.c bson-context.c bson-decimal128.c bson-iso8601.c bson-iter.c bson-json.c bson-keys.c bson-oid.c bson-reader.c bson-string.c bson-timegm.c bson-utf8.c bson-value.c bson-vector.c bson-version-functions.c bson-writer.c error.c memory.c validate.c"; var PHP_MONGODB_JSONSL_SOURCES="jsonsl.c"; - var PHP_MONGODB_MONGOC_SOURCES="mcd-azure.c mcd-nsinfo.c mcd-rpc.c mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-bulkwrite.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-deprioritized-servers.c mongoc-error.c mongoc-find-and-modify.c mongoc-flags.c mongoc-generation-map.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-init.c mongoc-interrupt.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log-and-monitor-private.c mongoc-log.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-oidc-callback.c mongoc-oidc-env.c mongoc-opcode.c mongoc-openssl.c mongoc-optional.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-api.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-shared.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-structured-log.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-ts-pool.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-concern.c service-gcp.c"; + var PHP_MONGODB_MONGOC_SOURCES="mcd-azure.c mcd-nsinfo.c mcd-rpc.c mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-bulkwrite.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-oidc.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cyrus.c mongoc-database.c mongoc-deprioritized-servers.c mongoc-error.c mongoc-find-and-modify.c mongoc-flags.c mongoc-generation-map.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-init.c mongoc-interrupt.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log-and-monitor-private.c mongoc-log.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-oidc-cache.c mongoc-oidc-callback.c mongoc-oidc-env.c mongoc-opcode.c mongoc-openssl.c mongoc-optional.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-api.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-shared.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-structured-log.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-ts-pool.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-concern.c service-gcp.c"; var PHP_MONGODB_UTF8PROC_SOURCES="utf8proc.c"; EXTENSION("mongodb", "php_phongo.c", null, PHP_MONGODB_CFLAGS); diff --git a/sbom.json b/sbom.json index ec0ee7d92..b7bfdb5bf 100644 --- a/sbom.json +++ b/sbom.json @@ -19,22 +19,22 @@ "version": "1.16.0" }, { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@2.1.2", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@2.2.1", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/2.1.2.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/2.2.1.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/2.1.2" + "url": "https://github.com/mongodb/mongo-c-driver/tree/2.2.1" } ], "group": "mongodb", "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@2.1.2", + "purl": "pkg:github/mongodb/mongo-c-driver@2.2.1", "type": "library", - "version": "2.1.2" + "version": "2.2.1" } ], "dependencies": [ @@ -42,11 +42,11 @@ "ref": "pkg:github/mongodb/libmongocrypt@1.16.0" }, { - "ref": "pkg:github/mongodb/mongo-c-driver@2.1.2" + "ref": "pkg:github/mongodb/mongo-c-driver@2.2.1" } ], "metadata": { - "timestamp": "2025-10-16T19:58:34.438489+00:00", + "timestamp": "2025-12-10T09:26:19.253727+00:00", "tools": [ { "externalReferences": [ @@ -90,7 +90,7 @@ ] }, "serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082", - "version": 18, + "version": 19, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.5", diff --git a/src/libmongoc b/src/libmongoc index 81c27ddad..0694203e5 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit 81c27ddadd54e80d9743dee0e8b7a0a862aa6ab5 +Subproject commit 0694203e57a7699b3eb82f8c665e474ef31dc59a From 02047f3d8380eee6cf5c0c4758df0e8ab60c8733 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 10 Dec 2025 13:32:20 +0100 Subject: [PATCH 2/3] PHPC-2625: Set values for C++ compiler in configure scripts --- config.m4 | 1 + config.w32 | 10 +++++++++- scripts/autotools/libmongoc/Versions.m4 | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/config.m4 b/config.m4 index bf1e78fc6..58a7f544f 100644 --- a/config.m4 +++ b/config.m4 @@ -398,6 +398,7 @@ if test "$PHP_MONGODB" != "no"; then ${ac_config_dir}/src/libmongoc/src/libbson/src/bson/config.h ${ac_config_dir}/src/libmongoc/src/libbson/src/bson/version.h ${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h + ${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h ${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h ]) diff --git a/config.w32 b/config.w32 index 0b5c66034..c36d81745 100644 --- a/config.w32 +++ b/config.w32 @@ -194,7 +194,9 @@ if (PHP_MONGODB != "no") { MONGOC_HAVE_SS_FAMILY: 0, MONGOC_CC: "", MONGOC_USER_SET_CFLAGS: "", - MONGOC_USER_SET_LDFLAGS: "" + MONGOC_USER_SET_LDFLAGS: "", + MONGOC_CXX_COMPILER_ID: "Unknown", + MONGOC_CXX_COMPILER_VERSION: "" }; var mongoc_ssl_path_to_check = PHP_MONGODB; @@ -335,6 +337,12 @@ if (PHP_MONGODB != "no") { mongoc_opts ); + mongodb_generate_header( + configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h.in", + configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h", + mongoc_opts + ); + mongodb_generate_header( configure_module_dirname + "/src/libmongoc/src/common/src/common-config.h.in", configure_module_dirname + "/src/libmongoc/src/common/src/common-config.h", diff --git a/scripts/autotools/libmongoc/Versions.m4 b/scripts/autotools/libmongoc/Versions.m4 index 3581622dc..f8efdabea 100644 --- a/scripts/autotools/libmongoc/Versions.m4 +++ b/scripts/autotools/libmongoc/Versions.m4 @@ -12,3 +12,5 @@ AC_SUBST(libmongoc_VERSION_MAJOR) AC_SUBST(libmongoc_VERSION_MINOR) AC_SUBST(libmongoc_VERSION_PATCH) AC_SUBST(libmongoc_VERSION_PRERELEASE) +AC_SUBST(MONGOC_CXX_COMPILER_ID, "Unknown") +AC_SUBST(MONGOC_CXX_COMPILER_VERSION, "") From 25badf5b5816fa33d892622a5e6cf010422d17c3 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Thu, 11 Dec 2025 14:29:50 +0100 Subject: [PATCH 3/3] PHPC-2655: skip failing tests --- tests/causal-consistency/causal-consistency-012.phpt | 2 ++ tests/session/session-002.phpt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/causal-consistency/causal-consistency-012.phpt b/tests/causal-consistency/causal-consistency-012.phpt index f55bff53a..a1cb285ba 100644 --- a/tests/causal-consistency/causal-consistency-012.phpt +++ b/tests/causal-consistency/causal-consistency-012.phpt @@ -1,5 +1,7 @@ --TEST-- Causal consistency: $clusterTime is sent in commands to supported deployments +--XFAIL-- +Cluster time is not sent in first command sent out on single-threaded connections (PHPC-2655) --DESCRIPTION-- Causal consistency spec prose test #12 https://github.com/mongodb/specifications/blob/master/source/causal-consistency/causal-consistency.md#test-plan diff --git a/tests/session/session-002.phpt b/tests/session/session-002.phpt index 87a1ff268..cc69f1657 100644 --- a/tests/session/session-002.phpt +++ b/tests/session/session-002.phpt @@ -1,5 +1,7 @@ --TEST-- MongoDB\Driver\Session spec test: $clusterTime in commands +--XFAIL-- +Cluster time is not sent in first command sent out on single-threaded connections (PHPC-2655) --DESCRIPTION-- Session spec prose test #3: $clusterTime in commands https://github.com/mongodb/specifications/blob/master/source/sessions/tests/README.md#3-clustertime-in-commands