Skip to content

Merge v1.x into v2.x #1469

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 2 commits into from
Sep 27, 2024
Merged

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.x 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 v1.x

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

* Migration from @annotations to #[Attributes]
* Replace hasFailed with the method onNotSuccessfulTest in FunctionalTestCase
* User createStub in getInvalidDocumentCodecValues
* Update custom constraints (TestCase::exporter() is deprecated and ComparisonFailure 5th argument was removed)
* Use xxh faster algorithm for temp collection name
@GromNaN GromNaN force-pushed the merge-v1.x-into-v2.x-1727420850240 branch from 10c1f1f to 23c033e Compare September 27, 2024 07:23
@mongodb-php-bot mongodb-php-bot merged commit 5888c6d into v2.x Sep 27, 2024
31 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.x-into-v2.x-1727420850240 branch September 27, 2024 07: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