Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Merge v2.1 into v2.x #1769

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
mongodb-php-bot merged 3 commits into v2.x from merge-v2.1-into-v2.x-1756362197800
Aug 28, 2025
Merged

Conversation

@mongodb-php-bot
Copy link
Collaborator

@mongodb-php-bot mongodb-php-bot commented Aug 28, 2025

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.

// The server requires an empty document for automatic credentials.
if (isset($options['kmsProviders']) && is_array($options['kmsProviders'])) {
foreach ($options['kmsProviders'] as $name => $provider) {
if ($provider === []) {

Check notice

Code scanning / Psalm

MixedAssignment Note

Unable to determine the type that $provider is being assigned to
Copy link

codecov-commenter commented Aug 28, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 87.73%. Comparing base (94527f2) to head (88e8347).
⚠️ Report is 49 commits behind head on v2.x.
✅ All tests successful. No failed tests found.

Additional details and impacted files 
@@ Coverage Diff @@
## v2.x #1769 +/- ##
=========================================
 Coverage 87.72% 87.73% 
- Complexity 3190 3194 +4 
=========================================
 Files 424 424 
 Lines 6348 6352 +4 
=========================================
+ Hits 5569 5573 +4 
 Misses 779 779
Flag Coverage Δ
6.0-replica_set 85.68% <100.00%> (+<0.01%) ⬆️
6.0-server 81.70% <100.00%> (+0.01%) ⬆️
6.0-sharded_cluster 85.28% <100.00%> (+<0.01%) ⬆️
8.0-replica_set 87.65% <100.00%> (+<0.01%) ⬆️
8.0-server 82.58% <100.00%> (+0.01%) ⬆️
8.0-sharded_cluster 87.32% <100.00%> (+<0.01%) ⬆️

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 771b3da into v2.x Aug 28, 2025
52 of 53 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v2.1-into-v2.x-1756362197800 branch August 28, 2025 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GromNaN GromNaN GromNaN approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /