Skip to content
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

Jump to bottom

Merge v1.x into v2.x #1775

Open
wants to merge 5 commits into
base: v2.x
Choose a base branch
from
Open

Merge v1.x into v2.x #1775

wants to merge 5 commits into from

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.x into v2.x.

Commits

Resolving conflicts

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

Ignoring changes

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

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

@jmikola
PHPC-2499: Update to libmongoc 1.29.2 (#1766)
787f301 
* Install Python 3.13 for drivers-evergreen-tools GH action

Related to mongodb/mongo-php-library#1564
@jmikola
PHPC-2496: WriteException stub should inherit ServerException (#1769)
2585be4
@jmikola
PHPC-2477: Remove unused libmongoc and libbson constants (#1768)
2b2e0be 
* PHPC-2477: BSON_HAVE_ATOMIC constants are obsolete

CDRIVER-4124 removed BSON_HAVE_ATOMIC_32_ADD_AND_FETCH and BSON_HAVE_ATOMIC_64_ADD_AND_FETCH

* PHPC-2477: BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES is obsolete

CDRIVER-2694 removed BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES

* PHPC-2477: BSON_HAVE_REALLOCF is obsolete

BSON_HAVE_REALLOCF was no longer used when libbson was vendored in CDRIVER-2416

* PHPC-2477: BSON_HAVE_SYSCALL_TID is obsolete

CDRIVER-2771 removed outstanding references to BSON_HAVE_SYSCALL_TID

* PHPC-2477: BSON_NEEDS_SET_OUTPUT_FORMAT is obsolete

* PHPC-2477: BSON_HAVE_DECIMAL128 is obsolete

* PHPC-2477: BSON_HAVE_ARC4RANDOM_BUF is obsolete

* PHPC-2477: MONGOC_ENABLE_SASL_GSSAPI is obsolete

CDRIVER-2654 removed MONGOC_ENABLE_SASL_GSSAPI. PHPC-2312 removed it from Autotools, but it was left behind in config.w32.

* PHPC-2477: MONGOC_HAVE_WEAK_SYMBOLS is obsolete

CDRIVER-2600 removed MONGOC_HAVE_WEAK_SYMBOLS
@jmikola
PHPC-2502: Remove XFAIL in server-executeQuery-012.phpt (#1772)
7590fae 
The corresponding CDRIVER ticket was fixed a while back, and included in the submodule bump for PHPC 1.13.
@jmikola
PHPC-2489: Deprecate passing WriteConcern and ReadPreference objects …
754e934 
…to execute methods (#1770)

* Prefer writeConcern and readPreference options for execute methods

* Correctly use Server method in server-executeQuery-010.phpt

The original test incorrectly called the Manager method. This dates back to 87fbd00.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mongodb-php-bot @jmikola