Skip to content

Merge v2.1 into v2.x#1925

Merged
mongodb-php-bot merged 13 commits intov2.xfrom
merge-v2.1-into-v2.x-1769595501524
Jan 28, 2026
Merged

Merge v2.1 into v2.x#1925
mongodb-php-bot merged 13 commits intov2.xfrom
merge-v2.1-into-v2.x-1769595501524

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.

alcaeus and others added 12 commits January 28, 2026 09:25
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
* Fix workflow name for creating release artifacts

* Remove ref parameter from php-windows-builder
* v2.1: (50 commits)
  Back to -dev
  Package 2.1.5
  Back to -dev
  Package 2.1.4
  PHPC-2637: Update to libmongoc 1.30.6 (#1882) (#1887)
  Back to -dev
  Package 2.1.3
  Back to -dev
  Package 2.1.2
  PHPC-2617: Support PHP 8.5 (#1871)
  PHPC-2613: Test x509 authentication on Atlas (#1858)
  Back to -dev
  Package 2.1.1
  Back to -dev
  Package 2.1.0
  PHPC-2555: Stop testing with MongoDB 4.0 (#1827)
  PHPC-2510 Install evergreen tools using git submodule (#1797)
  Bump to libmongoc 1.30.4 (#1822)
  Feature: Client Bulk Write (#1818)
  Mention Serializable/Unserializable types in upgrade guide (#1805)
  ...
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner January 28, 2026 10:18
@mongodb-php-bot mongodb-php-bot requested review from GromNaN and removed request for a team January 28, 2026 10:18
* v2.x: (40 commits)
  PHPC-2664: Drop Windows x86 builds (#1911)
  Bump tests/drivers-evergreen-tools from `61cb4e9` to `5514d6a` (#1908)
  Bump tests/drivers-evergreen-tools from `514927f` to `61cb4e9` (#1906)
  Bump tests/drivers-evergreen-tools from `ebe98d0` to `514927f` (#1905)
  PHPC-2649: Update to libmongocrypt 1.17.0 (#1904)
  PHPC-2654: Update to libmongoc 2.2.1 (#1900)
  Bump tests/drivers-evergreen-tools from `c92d062` to `ebe98d0` (#1903)
  Bump actions/cache from 4 to 5 (#1902)
  Bump tests/drivers-evergreen-tools from `c83e428` to `c92d062` (#1899)
  Bump tests/drivers-evergreen-tools from `cb019f7` to `c83e428` (#1898)
  Bump actions/checkout from 5 to 6 (#1895)
  Bump tests/drivers-evergreen-tools from `f8ab2a5` to `cb019f7` (#1896)
  PHPC-2634: Binary vector corpus tests (#1892)
  Bump tests/drivers-evergreen-tools from `1dcbfe4` to `f8ab2a5` (#1891)
  PHPC-2638 and PHPC-2630: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0 (#1868)
  Fix git submodule command in CONTRIBUTING.md
  PHPC-2627: Use appropriate return type for zend_object_iterator_funcs.valid (#1890)
  Bump github/codeql-action from 3 to 4 (#1889)
  Bump tests/drivers-evergreen-tools from `3b3f081` to `1dcbfe4` (#1878)
  PHPC-2474: Support Binary vector subtype (#1853)
  ...
@alcaeus alcaeus requested review from alcaeus and removed request for GromNaN January 28, 2026 11:13
@mongodb-php-bot mongodb-php-bot merged commit 2298c18 into v2.x Jan 28, 2026
42 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v2.1-into-v2.x-1769595501524 branch January 28, 2026 11:36
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