Skip to content

Merge v1.21 into v2.4 - #1974

Merged
mongodb-php-bot merged 8 commits into
v2.4from
merge-v1.21-into-v2.4-1787852889909
Aug 27, 2026
Merged

Merge v1.21 into v2.4#1974
mongodb-php-bot merged 8 commits into
v2.4from
merge-v1.21-into-v2.4-1787852889909

Conversation

@mongodb-php-bot

Copy link
Copy Markdown
Collaborator

Merge new changes from v1.21 into v2.4.

Commits

Resolving conflicts

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

Ignoring changes

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

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

GromNaN and others added 7 commits August 27, 2026 16:27
Database and collection names were only checked for being non-empty. A "." in a database name, or a NUL byte in a database or collection name, shifts the namespace split performed by the server, so operations end up targeting a different database or collection than the caller intended.

Reject "." and NUL bytes in database names, and NUL bytes in collection names. Dots remain legal in collection names.

Add a create_namespace() helper that validates both names and returns the concatenated namespace, and use it in Collection, Database, and all Operation classes that build a namespace by concatenating database and collection names (BulkWrite, Delete, Find, InsertMany, InsertOne, RenameCollection, Update).

Move the shared invalid name data provider to the base TestCase, and add prose test 17 for database and collection name validation.
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>
* Support creating release branches when releasing new versions

* Use same logic as in laravel integration

* Update .github/workflows/release.yml

Co-authored-by: Jeremy Mikola <jmikola@gmail.com>

---------

Co-authored-by: Jeremy Mikola <jmikola@gmail.com>

- name: Upload S3 assets
uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v2
uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v3

@semgrep-code-mongodb semgrep-code-mongodb Bot Aug 27, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitHub Actions step uses a mutable tag or branch reference. Tags and branch names can be silently repointed by the action owner, enabling supply-chain attacks — as seen in the trivy-action and kics-github-action compromises. Pin the reference to a full 40-character commit SHA instead, e.g. uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608.

🧁 Removed in commit b5c1531 🧁

Comment thread .github/workflows/release.yml
@codecov-commenter

codecov-commenter commented Aug 27, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@mongodb-php-bot
mongodb-php-bot merged commit 6b8afaa into v2.4 Aug 27, 2026
37 checks passed
@mongodb-php-bot
mongodb-php-bot deleted the merge-v1.21-into-v2.4-1787852889909 branch August 27, 2026 18:33
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.

5 participants