Skip to content

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.

* PHPLIB-1709: Test with PHP 8.5

* Ignore upper PHP version bound when running on PHP 8.5
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner October 6, 2025 12:12
@alcaeus alcaeus removed the request for review from GromNaN October 6, 2025 12:14
@codecov-commenter
Copy link

codecov-commenter commented Oct 6, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 87.73%. Comparing base (1d94eb1) to head (0a2472b).
⚠️ Report is 58 commits behind head on v2.x.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff            @@
##               v2.x    #1786   +/-   ##
=========================================
  Coverage     87.73%   87.73%           
  Complexity     3194     3194           
=========================================
  Files           424      424           
  Lines          6352     6352           
=========================================
  Hits           5573     5573           
  Misses          779      779           
Flag Coverage Δ
6.0-replica_set 85.68% <ø> (ø)
6.0-server 81.70% <ø> (ø)
6.0-sharded_cluster 85.28% <ø> (ø)
8.0-replica_set 87.65% <ø> (ø)
8.0-server 82.58% <ø> (ø)
8.0-sharded_cluster 87.32% <ø> (ø)

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.

@mongodb-php-bot mongodb-php-bot merged commit 67f7ddb into v2.x Oct 6, 2025
54 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v2.1-into-v2.x-1759752772547 branch October 6, 2025 12:35
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