Skip to content

PHPC-2435: Support libmongoc 2.0 #1829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 3, 2025
Merged

PHPC-2435: Support libmongoc 2.0 #1829

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5f3c8e
Bump libmongoc to 2.0.1 and libmongocrypt to 1.14.0
alcaeus May 22, 2025
71510e2
PHPC-2584: Run driver test with system libraries (#1831)
alcaeus May 26, 2025
adfedd2
PHPC-2545: Drop support for compiling with LibreSSL (#1836)
alcaeus May 26, 2025
6c715e9
Fix usage of wrong version variable
alcaeus May 27, 2025
51cdb21
PHPC-2367: Add SSPI SASL, drop Cyrus on Windows (#1837)
alcaeus Jun 2, 2025
9090d84
Apply feedback from code review
alcaeus Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/prep-release.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function get_files() {

"src/libmongoc/src/common/src/*.{c,h,h.in}",
// Note: src/libmongoc/src/common/src/mlib/ does not contain source files (as of libmongoc 2.0.1)
"src/libmongoc/src/common/src/mlib/*.{c,h}",
"src/libmongoc/src/common/src/mlib/*.h",
"src/libmongoc/src/kms-message/src/*.{c,h}",
"src/libmongoc/src/kms-message/src/kms_message/*.{c,h}",
"src/libmongoc/src/libbson/src/bson/*.{c,h,h.in}",
Expand All @@ -65,7 +65,7 @@ function get_files() {
"src/libmongocrypt-compat/mongocrypt/*.{c,h}",
"src/libmongocrypt/src/*.{c,h,h.in}",
"src/libmongocrypt/src/crypto/*.{c,h}",
"src/libmongocrypt/src/mlib/*.{c,h}",
"src/libmongocrypt/src/mlib/*.h",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alcaeus: This line appears to be redundant with the pattern appearing after the subsequent comment. Perhaps this should be removed entirely?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. Removed in #1848

// Note: src/libmongocrypt/src/mlib/ does not contain source files (as of libmongocrypt 1.14.0)
"src/libmongocrypt/src/mlib/*.h",
"src/libmongocrypt/src/os_posix/*.{c,h}",
Expand Down
4 changes: 0 additions & 4 deletions tests/manager/manager-ctor-write_concern-error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ echo throws(function() {
create_test_manager(null, ['w' => 1.0]);
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";

/* Note: Values of w < 0 are invalid, but libmongoc's URI string parsing only
* logs a warning instead of raising an error (see: CDRIVER-2234), so we cannot
* test for this. */

echo throws(function() {
create_test_manager(null, ['w' => -1]);
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
Expand Down