Skip to content

Merge to beta#2028

Merged
xavdid-stripe merged 7 commits intobetafrom
xavdid/merge-php-beta
Mar 6, 2026
Merged

Merge to beta#2028
xavdid-stripe merged 7 commits intobetafrom
xavdid/merge-php-beta

Conversation

@xavdid-stripe
Copy link
Member

Why?

Routine merge of master changes into the beta release channel.

What?

  • Merged master into beta using sdk-codegen's automerge tooling (tools/automerge/php-beta.yaml).
  • Resolved a generated code conflict in lib/ApiRequestor.php by taking master's version (which uses the new named section markers) and regenerating with just gen php --beta.

See Also

xavdid-stripe and others added 7 commits February 27, 2026 18:12
* Add agent information to UserAgent

* format and compat
* add "prepare" to justfile

* add Stripe-Request-Trigger header
* Upgrade php-cs-fixer to v3.94.0

* Use setUnsupportedPhpVersionAllowed() instead of deprecated ENV

---------

Co-authored-by: simonhammes <simonhammes@users.noreply.github.com>
Co-authored-by: Prathmesh Ranaut <165320323+prathmesh-stripe@users.noreply.github.com>
Committed-By-Agent: claude

# Conflicts:
#	lib/ApiRequestor.php
Committed-By-Agent: claude
@xavdid-stripe xavdid-stripe requested a review from a team as a code owner March 6, 2026 21:45
@xavdid-stripe xavdid-stripe requested review from mbroshi-stripe and removed request for a team March 6, 2026 21:45
@xavdid-stripe xavdid-stripe enabled auto-merge March 6, 2026 21:46
@xavdid-stripe xavdid-stripe merged commit b195782 into beta Mar 6, 2026
29 checks passed
@xavdid-stripe xavdid-stripe deleted the xavdid/merge-php-beta branch March 6, 2026 22:00
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