Skip to content

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.20 into master.

Commits

Resolving conflicts

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

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to master and manually merge using the `ours` merge strategy:
git reset --hard master
git merge --strategy=ours v1.20

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

* PHPC-2412: Deprecate CursorId class

* Use zend_bool instead of bool

* Remove fixed length assertion in test

* Correctly set default parameter value

* Remove int cast to avoid warnings on 32-bit platforms

* Fix wrong expectation for CursorId debug format

* Use new cursor ID logic in tests where possible

* Remove deprecation comment from CursorId stub

* Restore cursorid serialisation test

* Restore original class initialisation order
@mongodb-php-bot mongodb-php-bot merged commit 43b1605 into master Sep 5, 2024
141 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.20-into-master-1725546081843 branch September 5, 2024 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants