Skip to content

Conversation

@mongodb-php-bot
Copy link
Collaborator

Merge new changes from 5.5 into 5.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge 5.x -m "Resolve conflicts in 5.x"

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to 5.x and manually merge using the `ours` merge strategy:
git reset --hard 5.x
git merge --strategy=ours 5.5 -m "Ignore changes from 5.5"

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

zigzagdev and others added 2 commits December 8, 2025 14:03
* Improve change log categories (#3442)

So that anything labeled `feature` is added to the Features category and docs changes are listed as a separate category

* Bump actions/labeler from 5 to 6 (#3445)

Bumps [actions/labeler](https://github.com/actions/labeler) from 5 to 6.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](actions/labeler@v5...v6)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Remove explicit dependency to symfony/http-kernel as it's not used directly (#3446)

* Bump mongodb-labs/drivers-github-tools from 2 to 3 (#3452)

Bumps [mongodb-labs/drivers-github-tools](https://github.com/mongodb-labs/drivers-github-tools) from 2 to 3.
- [Release notes](https://github.com/mongodb-labs/drivers-github-tools/releases)
- [Commits](mongodb-labs/drivers-github-tools@v2...v3)

---
updated-dependencies:
- dependency-name: mongodb-labs/drivers-github-tools
  dependency-version: '3'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github/codeql-action from 3 to 4 (#3455)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v3...v4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Test with PHP 8.5 and reduce test matrix

* Test all server versions with the lowest PHP and latest Laravel

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Pauline Vos <pvos88@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner December 8, 2025 17:29
@github-actions github-actions bot added the github label Dec 8, 2025
@GromNaN GromNaN mentioned this pull request Dec 8, 2025
@mongodb-php-bot mongodb-php-bot merged commit 61a3b77 into 5.x Dec 8, 2025
58 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.5-into-5.x-1765214952346 branch December 8, 2025 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants