Merge v1.21 into v2.1 #1843

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.

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

Jump to bottom

Merged

mongodb-php-bot merged 2 commits into v2.1 from merge-v1.21-into-v2.1-1749718805391

Jun 12, 2025

Merged

Merge v1.21 into v2.1 #1843

mongodb-php-bot merged 2 commits into v2.1 from merge-v1.21-into-v2.1-1749718805391

Jun 12, 2025

Conversation

@mongodb-php-bot

Copy link

Collaborator

@mongodb-php-bot mongodb-php-bot commented Jun 12, 2025

Merge new changes from v1.21 into v2.1.

Commits

PHPC-2593: Update libmongoc to 1.30.5 (PHPC-2593: Update libmongoc to 1.30.5 #1841 ): 41d273c

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:

git merge v2.1

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.1 and manually merge using the `ours` merge strategy:

git reset --hard v2.1
git merge --strategy=ours v1.21

Then, push the temporary branch to upate the pull request.

@alcaeus


 PHPC-2593 : Update libmongoc to 1.30.5 ( #1841 )

41d273c

* PHPC-2593: Update libmongoc to 1.30.5
* Update tests for new BSON validation logic

@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner

June 12, 2025 09:00

@mongodb-php-bot mongodb-php-bot requested review from alcaeus and removed request for a team

June 12, 2025 09:00

@mongodb-php-bot mongodb-php-bot enabled auto-merge

June 12, 2025 09:00

@alcaeus


 Resolve conflicts

750a5e1

* v2.1: (37 commits)
 Back to -dev
 Package 2.1.0
 PHPC-2555: Stop testing with MongoDB 4.0 (#1827)
 PHPC-2510 Install evergreen tools using git submodule (#1797)
 Bump to libmongoc 1.30.4 (#1822)
 Feature: Client Bulk Write (#1818)
 Mention Serializable/Unserializable types in upgrade guide (#1805)
 Back to -dev
 Package 2.0.0
 Master is now 2.1-dev
 PHPC-2536: Remove run-ocsp-responder.sh (#1802)
 PHPC-2536: Migrate to common OCSP responder script (#1800)
 1.x is now 1.22.0dev
 PHPC-2485: Remove WriteConcern and ReadPreference from execute method arginfo (#1783)
 PHPC-2497: BulkWriteException stub should inherit ServerException (#1784)
 PHPC-2441: Remove deprecated Manager constructor options (#1719)
 PHPC-990: Strict type validation for boolean URI options (#1713)
 PHPC-2440: Remove deprecated Query constructor options (#1707)
 PHPC-2459: Remove support for float arg in UTCDateTime ctor (#1709)
 Remove obsolete test
 ...