Repository navigation
Merge v2.5 into v2.x - #2202
Merged
mongodb-drivers-pr-bot[bot] merged 3 commits intoOct 30, 2026
Merged
Merge v2.5 into v2.x#2202
Conversation
* PHPC-2797: Shut down libmongoc when the process exits libmongoc keeps process-wide state that is initialized by mongoc_init() and released by mongoc_cleanup(). Both calls are guarded by bson_once, and the C driver documents that mongoc_init() does not reinitialize the driver after mongoc_cleanup(). The driver called mongoc_cleanup() from the last GSHUTDOWN, assuming that the last engine shutdown means the end of the process. This does not hold for SAPIs that stop and start the engine in the same process, such as FrankenPHP rebooting its threads on opcache_reset(). The next engine startup reuses a libmongoc instance whose handshake data was freed, and the next Manager creation aborts in mongoc_handshake_data_append(). Initialize libmongoc once per process in MINIT and shut it down with atexit(), together with the libbson vtable restoration. GSHUTDOWN and GINIT now only deal with per-thread state, so the thread counter is removed. * PHPC-2797: Harden the FrankenPHP restart test Run a command on a MongoDB server on every request, so the test checks that the connection works after the in-process thread reboot. Use a single worker, so a different instance identifier can only come from a restart of that worker, and reject an empty response after the reboot instead of treating it as a new instance. Cache the Docker layers in the CI workflow with the GitHub Actions cache. * PHPC-2797: Run the FrankenPHP test against an Atlas Local replica set Use mongodb/mongodb-atlas-local, which starts a single-node replica set and ships a healthcheck. Wait for that healthcheck before checking the worker. * PHPC-2797: Run Atlas Local as a GitHub Actions service Declare mongodb/mongodb-atlas-local as a service container in the FrankenPHP workflow. The runner waits for its built-in healthcheck before running the steps. The test script uses MONGODB_URI when it is set and keeps starting the container itself for local runs. The FrankenPHP container reaches the service through the Docker host. * PHPC-2797: Require MONGODB_URI in the FrankenPHP test The test script no longer starts a MongoDB server. The developer or the CI service provides one and passes MONGODB_URI.
…ntain permissions' Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
GromNaN
approved these changes
Oct 30, 2026
Closed
mongodb-drivers-pr-bot
Bot
deleted the
merge-v2.5-into-v2.x-1793359444850
branch
October 30, 2026 11:48
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge new changes from v2.5 into v2.x.
Commits
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to update the pull request.