Forward-merge 3.6 into 2026.2 (ancestry only — DO NOT SQUASH) - #154
Merged
Conversation
Ancestry-only forward merge. The php-cs-fixer.yaml conflict is resolved in favour of 2026.2: 3.6 carries a pull_request_target trigger that 2026.2 does not, so 3.6's workflow variant must not propagate upward. Net content change against 2026.2: none. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request.
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
|
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Squashing collapses this into a single-parent commit, which does not restore ancestry.
3.6would still readdivergedand would still block the next patch release. That is the entire point of this PR.What this is
3.6carried two commits (#150 and its auto-applied cs-fixer commit) that were never forward-merged. The pre-flight release check compares ancestry, not content, so3.6readsdivergedand blockedv3.6.3last week.Net content change: none
The one conflict,
.github/workflows/php-cs-fixer.yaml, is resolved in favour of2026.2. This is deliberate:3.6also has apull_request_targettrigger and therefore needsrepository: \${{ github.event.pull_request.head.repo.full_name || github.repository }}.2026.2is push-only and correctly usesgithub.repositorywith anif: github.repository_owner == 'pimcore'guard. Propagating 3.6's variant upward would put a fork-checkout expression into a push-only workflow.Verified before pushing:
Context
Follow-up to pimcore/service-operations#1071. The sweep fixed the workflow on 15 maintenance branches but left the ancestry unrepaired; 13 branches across 10 repos are in this state. This is the reference case — the rest follow the same pattern.
Next leg after this merges:
2026.2 -> 2026.x.