[Composer] Remove outdated twig/twig conflicts from bundles#18702
Merged
GSadee merged 6 commits intoSylius:1.14from Jan 15, 2026
Merged
[Composer] Remove outdated twig/twig conflicts from bundles#18702GSadee merged 6 commits intoSylius:1.14from
GSadee merged 6 commits intoSylius:1.14from
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
❌ Preview Environment deleted from BunnyshellAvailable commands:
|
de48dc2 to
ed47490
Compare
40561a9 to
3b8e02c
Compare
Remove legacy twig/twig version conflicts: - Remove ^3.0 conflict (added in 2019, already removed in Sylius 2.0+) - Remove ^1.0 conflict (Twig 1.x reached EOL years ago) Keep twig/twig:3.9.0 conflict as it's a specific buggy version documented in CONFLICTS.md. Since Twig 2.x reached EOL in December 2023, these conflicts blocked users of standalone bundles from upgrading to Twig 3.x. Closes Sylius#18700
ResourceBundle 1.12 moved several packages from require to require-dev. Bundle functional tests that use these packages now need explicit deps.
… require-dev ResourceBundle 1.12 moved willdurand/hateoas-bundle from require to require-dev. These bundles use BazingaHateoasBundle in their test kernels.
d263b0a to
c9bfc5b
Compare
Version 2.17.0 adds AssetMapper support but breaks container compilation when AssetMapper is not being used.
6c3be6d to
4f8f660
Compare
…d add upgrade file to inform about recommendations
4f8f660 to
fb74928
Compare
GSadee
approved these changes
Jan 15, 2026
Contributor
|
Thanks! |
Closed
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.
Remove legacy
twig/twigversion conflicts that blocked users of standalone bundles from upgrading to Twig 3.x:^3.0conflict added in 2019, already removed in Sylius 2.0+^1.0conflict (Twig 1.x reached EOL years ago)3.9.0conflict as it's a specific buggy version documented inCONFLICTS.mdSince Twig 2.x reached EOL in December 2023, these conflicts were blocking users who use Sylius bundles standalone from upgrading.
Also adds
friendsofsymfony/rest-bundleandjms/serializer-bundleto UserBundlerequire-dev- they're used in functional tests but were previously installed as transitive dependencies ofsylius/resource-bundle(moved fromrequiretorequire-devin ResourceBundle 1.13).Additionally adds conflict for
liip/imagine-bundle: 2.17.0- this version was released on 2026-01-05 and breaks container compilation when AssetMapper is not used (unrelated to twig changes).Affected bundles: AddressingBundle, CustomerBundle, CurrencyBundle, InventoryBundle, LocaleBundle, MoneyBundle, OrderBundle, PaymentBundle, PromotionBundle, ReviewBundle, ShippingBundle, TaxationBundle, TaxonomyBundle, UiBundle, UserBundle
Closes #18700