Skip to content

[UPMERGE] 5.1 -> 2026.x - #3293

Merged
dpfaffenbauer merged 9 commits into
2026.xfrom
upmerge/5.1_2026.x
Nov 11, 2026
Merged

dpfaffenbauer merged 9 commits into
2026.xfrom
upmerge/5.1_2026.x

Conversation

@dpfaffenbauer

Copy link
Copy Markdown
Member

Manual upmerge: it carries workflow changes (#3287, #3288), which the upmerge workflow cannot push with GITHUB_TOKEN.

Brings #3288, #3292 (with #3287 and #3290 from 5.0) into 2026.x. Conflicts in license-check.yaml, packages_bundles.yml and packages_components.yml were resolved in favour of 2026.x, which already has the gates since #3284. The resulting tree is identical to 2026.x; only the history is merged.

Remember! The upmerge should always be merged with using Merge pull request button.

dpfaffenbauer and others added 9 commits November 11, 2026 09:33
Both packages use typed class constants, which need PHP 8.3, but still
declared "php": "^8.0". PHPStan derives the minimum PHP version from it
and rejects every typed constant. The root package and 5.1 already require ^8.3.
[Composer] require PHP 8.3 for the Payment and PayumPayment components (5.0)
[CI] Add a stable required-check gate to the package and license workflows (5.0)
[CI] Add a stable required-check gate to the package and license workflows (5.1)
@dpfaffenbauer
dpfaffenbauer merged commit 72e0dc9 into 2026.x Nov 11, 2026
24 checks passed
@dpfaffenbauer
dpfaffenbauer deleted the upmerge/5.1_2026.x branch November 11, 2026 09:00
@github-actions github-actions Bot locked and limited conversation to collaborators Nov 11, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant