Repository navigation
ci: cascade-merge 4.x into master - #843
Merged
Merged
Conversation
A push to the 4.x maintenance branch opens (or updates) a "merge 4.x into master" pull request, so fixes made on 4.x are carried forward. CI also runs on pushes to 4.x. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FxhC1GE15owYbSGjsHAjCr
lisachenko
marked this pull request as ready for review
November 8, 2026 12:32
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 4.x #843 +/- ##
=========================================
Coverage 98.60% 98.60%
Complexity 2291 2291
=========================================
Files 131 131
Lines 5947 5947
=========================================
Hits 5864 5864
Misses 83 83 ☔ View full report in Codecov by Harness. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What and why
Brings the merge-up workflow from #841 to
4.x. A workflow triggered by a push runs from the branch that was pushed, so.github/workflows/merge-up.ymlhas to be on4.xbefore the cascade can start. After this, every push to4.xopens or updates achore: merge 4.x into masterPR. CS, PHPStan and PHPUnit also run on pushes to4.x.The head is commit
3ff646citself: the same commit master already contains through #841, and its parent is the current tip of4.x. The commit is not duplicated.Merge with "Create a merge commit". Squash or rebase would create a new commit, which the next merge-up PR would then bring into master as a duplicate.
Checklist
type(scope): summary)composer checkpasses: unchanged code; the same commit passed CI on build!: open 5.x on master (PHP 8.5+, merge-up from 4.x) #841Generated by Claude Code