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.

Sign up for GitHub

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

Jump to bottom

Merge v1.20 into v1.x #1651

Merged
merged 5 commits into from
Sep 16, 2024
Merged

Merge v1.20 into v1.x #1651

merged 5 commits into from
Sep 16, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.20 into v1.x.

Commits

Resolving conflicts

 To resolve any conflicts, check out the temporary branch and run the following command: 
git merge v1.x

Ignoring changes

 To ignore from the remote branch, first reset the temporary branch to v1.x and manually merge using the `ours` merge strategy: 
git reset --hard v1.x
git merge --strategy=ours v1.20

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

alcaeus and others added 4 commits September 13, 2024 17:01
@alcaeus
PHPC-2443: Deprecate string argument and accept Int64 instances in UT…
c394d37 
…CDateTime constructor (#1643)

* Refactor UTCDateTime initialisation logic

* PHPC-2443: Deprecate passing string values to UTCDateTime constructor

* PHPC-2443: Accept Int64 instances in UTCDateTime constructor

* Use Int64 instances in tests

* Use 64-bit value in UTCDateTime tests

* Fix missing word in deprecation message

* Extract init methods for utcdatetime_t
@alcaeus
PHPC-2413: Use new distros for RHEL ppc and Z (#1647)
3ffbe12
@jmikola
PHPC-2442: Deprecate getServer, add getHost and getPort to APM events (…
1869a72 
…#1644)

Also updates initial array size for debug output and reorders output fields.

* Expect alternative deprecation message for PHP 7.4

* Remove redundant comments for APM event methods
@alcaeus
Merge v1.19 into v1.20 (#1649)
e50911b
@alcaeus alcaeus mentioned this pull request Sep 16, 2024
Closed
@alcaeus
Merge branch 'v1.x' into merge-v1.20-into-v1.x-1726469029114
3a62cd6 
* v1.x:
  Update branch names for GHA workflows (#1646)
  PHPC-2343: Require PHP 8.1 (#1631)
@mongodb-php-bot mongodb-php-bot merged commit 04c29be into v1.x Sep 16, 2024
62 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.20-into-v1.x-1726469029114 branch September 16, 2024 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alcaeus alcaeus alcaeus approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mongodb-php-bot @alcaeus @jmikola