chore: add conflict versions 0.5.2 and 0.6.2 without the Twig cap#38
Merged
Conversation
Michael Telgmann (mitelg)
left a comment
Michael Telgmann (mitelg)
left a comment
Member
There was a problem hiding this comment.
don't we need to create a new version with raised SW min version? 🤔
Soner (shyim)
requested changes
Jul 6, 2026
Nicolas Fortier (nfortier-shopware)
changed the title
Nicolas Fortier (nfortier-shopware)
requested review from
Michael Telgmann (mitelg) and
Soner (shyim)
Michael Telgmann (mitelg)
approved these changes
Jul 6, 2026
Co-authored-by: Michael Telgmann <mitelg@users.noreply.github.com>
Florian Ruppel (fruppel)
approved these changes
Jul 7, 2026
Soner (shyim)
approved these changes
Jul 7, 2026
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
4 participants
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.
Successor versions for the streams fixed by shopware/shopware#18027, per review: the existing 0.5.1/0.6.0/0.6.1 keep their
twig/twig >=3.28conflict (released unfixed versions pin them exactly), and the upcoming fixed releases pin the new versions instead:composer.0.6.2.json— copy of 0.6.1 without the Twig cap,shopware/core >=6.7.11.2(6.7 stream: 6.7.11.2 backport, 6.7.12.x, 6.7.13.0)composer.0.5.2.json— copy of 0.5.1 without the Twig cap,shopware/core >=6.6.10.20 <6.7.0.0(6.6 LTS backport)Floors assume the next patch versions are 6.7.11.2 / 6.6.10.20 — adjust if the release numbering differs. Requires follow-up shopware PRs bumping the
shopware/conflictspin on trunk/6.7.12.x/6.7.11.x (→0.6.2) and 6.6.x (→0.5.2), which also restores twig 3.28 coverage in CI.