Skip to content

Merge v2.1 into v2.x #1748

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

Merged
merged 3 commits into from
Aug 13, 2025
Merged

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v2.1 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 v2.1

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

jmikola and others added 3 commits August 13, 2025 10:41
…ollections with autoEncryption enabled (#1745)

* PHPLIB-1702: Always consult server encryptedFieldsMap when dropping collections

* Bump tests/drivers-evergreen-tools to a332144

Necessary to fix PyMongo compat with MongoDB 4.0

* Detect metadata collections only when auto encryption is enabled on the client

* Bump tests/specifications to 0aee4aa

Necessary to fix change stream tests for server 8.2+

---------

Co-authored-by: Jérôme Tamarelle <[email protected]>
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner August 13, 2025 18:07
@codecov-commenter
Copy link

codecov-commenter commented Aug 13, 2025

Codecov Report

❌ Patch coverage is 85.71429% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 87.72%. Comparing base (fe91494) to head (002fad6).
⚠️ Report is 73 commits behind head on v2.x.
✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
src/Collection.php 80.00% 1 Missing ⚠️
src/Database.php 83.33% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               v2.x    #1748      +/-   ##
============================================
- Coverage     88.60%   87.72%   -0.89%     
- Complexity     3090     3190     +100     
============================================
  Files           419      424       +5     
  Lines          6189     6346     +157     
============================================
+ Hits           5484     5567      +83     
- Misses          705      779      +74     
Flag Coverage Δ
-replica_set ?
-server ?
5.0-replica_set ?
5.0-server ?
5.0-sharded_cluster ?
6.0-replica_set 85.67% <78.57%> (-1.81%) ⬇️
6.0-server 81.68% <78.57%> (-1.62%) ⬇️
6.0-sharded_cluster 85.26% <78.57%> (-2.01%) ⬇️
7.0-replica_set ?
7.0-server ?
7.0-sharded_cluster ?
8.0-replica_set 87.64% <85.71%> (-0.87%) ⬇️
8.0-server 82.57% <78.57%> (-0.69%) ⬇️
8.0-sharded_cluster 87.31% <85.71%> (-1.04%) ⬇️
latest-sharded_cluster ?
rapid-replica_set ?
rapid-server ?
rapid-sharded_cluster ?
service ?

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mongodb-php-bot mongodb-php-bot merged commit 1966a0c into v2.x Aug 13, 2025
53 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v2.1-into-v2.x-1755108420016 branch August 13, 2025 18:30
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.

3 participants