Skip to content
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

Merge v1.x into v2.x #1485

Merged
merged 2 commits into from
Oct 16, 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.

* Add submodule for specifications

* Run spec tests from submodule

* Add dependabot configuration to update spec submodule

* Add submodule update to contributing docs

* Initialise spec submodule through composer

* Add guidance for fixing spec test failures in dependabot PRs

* PHPLIB-1458: Update aggregate-write-readPreference tests

* Update spec test paths

* Allow skipping duplicate tests in data providers

* Skip all clientBulkWrite tests

* PHPLIB-1450: Consolidate and improve skipping of tests

* Update to latest specs commit

* Use str_starts_with instead of regex logic

* Add annotations to type-qualify arrays

* Always require passing test group in provideTests

* Consistent wrapping

* PHPLIB-1492: Skip spec tests for sort in update operations

* Remove obsolete imports
* v2.x:
  PHPLIB-1546 and PHPLIB-1159: Remove CreateCollection flags and autoIndexId options (#1478)
  PHPLIB-1227 Use void return types for operations without meaningful result document (#1468)
  Remove deprecated functionality (#1439)
  PHPLIB-1518 `WriteResult::get*Count()` always return an int on acknowledged result (#1454)
  PHPLIB-954: Add return types to all methods (#1391)
  PHPLIB-797: Remove unused methods in UnsupportedException (#1436)
  Revert "Add final annotations to non-internal Operation classes (#1410)"
  PHPLIB-953 Make internal classes and Operation classes final (#1392)
  PHPLIB-1218 Remove deprecated fields from GridFS files (#1398)
@mongodb-php-bot mongodb-php-bot merged commit dc098ce into v2.x Oct 16, 2024
28 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.x-into-v2.x-1729063221979 branch October 16, 2024 07:55
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.

2 participants