Skip to content

Merge v2.1 into v2.x#1910

Merged
mongodb-php-bot merged 4 commits intov2.xfrom
merge-v2.1-into-v2.x-1768991977088
Jan 21, 2026
Merged

Merge v2.1 into v2.x#1910
mongodb-php-bot merged 4 commits intov2.xfrom
merge-v2.1-into-v2.x-1768991977088

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 3 commits January 21, 2026 09:50
* PHPC-2661: Use php-windows-builder to build Windows DLLs

* Use php-windows-builder for releases

* Clarify PHP version argument for build workflow

* Include build ref to harden release workflow

* Fix mistakes in windows package build workflow

* Update verification instructions for Windows packages
* v2.1: (48 commits)
  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)
  Back to -dev
  Package 2.0.0
  ...
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner January 21, 2026 10:39
@mongodb-php-bot mongodb-php-bot requested review from paulinevos and removed request for a team January 21, 2026 10:39
@alcaeus alcaeus requested review from alcaeus and removed request for paulinevos January 21, 2026 10:40
* v2.x: (39 commits)
  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)
  Upload test results to codecov.io (#1857)
  ...
@alcaeus
Copy link
Member

alcaeus commented Jan 21, 2026

Ignoring failing Windows tests for the time being. We'll likely end up dropping x86 builds for Windows from 2.2 onwards.

@mongodb-php-bot mongodb-php-bot merged commit 948af8d into v2.x Jan 21, 2026
48 of 52 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v2.1-into-v2.x-1768991977088 branch January 21, 2026 11: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