Skip to content

[UPMERGE] 1.14 -> 2.1#18723

Merged
TheMilek merged 17 commits into2.1from
upmerge/1.14_2.1
Jan 19, 2026
Merged

[UPMERGE] 1.14 -> 2.1#18723
TheMilek merged 17 commits into2.1from
upmerge/1.14_2.1

Conversation

@SyliusBot
Copy link
Copy Markdown
Contributor

This PR has been generated automatically.
For more details see upmerge_pr.yaml.

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

In case of conflicts, please resolve them manually with usign the following commands:

git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.1 -m "Resolve conflicts between 1.14 and 2.1"

If you use other name for the upstream remote, please replace upstream with the name of your remote pointing to the Sylius/Sylius repository.

Once the conflicts are resolved, please run git merge --continue and push the changes to this PR.

revoltek-daniel and others added 10 commits September 11, 2025 13:09
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 #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.
Version 2.17.0 adds AssetMapper support but breaks container compilation
when AssetMapper is not being used.
in case certain xml keys are missing from extending config
like properties, item opteration, collection operations or resources
Updates the `branch-alias` in all `composer.json` files from `1.13-dev`
to `1.14-dev`.

Affects all bundles and components (41 files).
@SyliusBot SyliusBot requested review from a team as code owners January 15, 2026 02:40
@probot-autolabeler probot-autolabeler bot added Admin AdminBundle related issues and PRs. API APIs related issues and PRs. Shop ShopBundle related issues and PRs. labels Jan 15, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Jan 15, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


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.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

TheMilek and others added 6 commits January 15, 2026 08:47
| Q               | A
|-----------------|-----
| Branch?         | 1.13 <!-- see the comment below -->
| Bug fix?        | a bit
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
 - Make sure that the correct base branch is set

To be sure you are not breaking any Backward Compatibilities, check the
documentation:

https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->

We need to adjust the code to make it consistent everywhere we use it
hardcoded in our test app
| Q               | A
|-----------------|-----
| Branch?         | 1.14
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | fixes #X, partially #Y, mentioned in #Z
| License         | MIT

Fix the broken romanian plural translation. 
There are multiple other keys in the translation.
| Q               | A
|-----------------|-----
| Branch?         | 1.14 <!-- see the comment below -->
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.14 or 2.1 branch
 - Features and deprecations must be submitted against the 2.2 branch
 - Make sure that the correct base branch is set

To be sure you are not breaking any Backward Compatibilities, check the
documentation:

https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
continuation of #16146
…d add upgrade file to inform about recommendations
Remove legacy `twig/twig` version conflicts that blocked users of
standalone bundles from upgrading to Twig 3.x:

- 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 `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 were
blocking users who use Sylius bundles standalone from upgrading.

Also adds `friendsofsymfony/rest-bundle` and `jms/serializer-bundle` to
UserBundle `require-dev` - they're used in functional tests but were
previously installed as transitive dependencies of
`sylius/resource-bundle` (moved from `require` to `require-dev` in
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
@probot-autolabeler probot-autolabeler bot added the Maintenance CI configurations, READMEs, releases, etc. label Jan 16, 2026
@github-actions
Copy link
Copy Markdown

github-actions bot commented Jan 19, 2026

❌ Preview Environment deleted from Bunnyshell

Available commands:

  • 🚀 /bns:deploy to redeploy the environment

@TheMilek TheMilek merged commit 84c8eaa into 2.1 Jan 19, 2026
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Admin AdminBundle related issues and PRs. API APIs related issues and PRs. Maintenance CI configurations, READMEs, releases, etc. Shop ShopBundle related issues and PRs.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants