Skip to content

[UPMERGE] 1.14 -> 2.1#18694

Merged
Rafikooo merged 5 commits into2.1from
upmerge/1.14_2.1
Jan 6, 2026
Merged

[UPMERGE] 1.14 -> 2.1#18694
Rafikooo merged 5 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.

Sylius Bot and others added 2 commits December 19, 2025 02:36
This PR has been generated automatically.
For more details see
[refactor.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/refactor.yaml).
@SyliusBot SyliusBot requested review from a team as code owners December 20, 2025 02:34
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Dec 20, 2025

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.

Wojdylak
Wojdylak previously approved these changes Dec 30, 2025
Rafikooo and others added 2 commits January 5, 2026 13:49
Adding this to 1.14 for better flexibility when upgrading projects. This
is not a BC break - it only extends the allowed versions without forcing
any changes.

Many modern libraries now require `psr/http-message: ^2.0` exclusively.
Sylius only uses the interfaces as type hints without implementing them,
so supporting both versions is safe. Backporting to 1.14 benefits end
applications that want to upgrade their dependencies.

Ref: #18698
@github-actions
Copy link
Copy Markdown

github-actions bot commented Jan 6, 2026

❌ Preview Environment deleted from Bunnyshell

Available commands:

  • 🚀 /bns:deploy to redeploy the environment

@Rafikooo Rafikooo merged commit 2dc4d88 into 2.1 Jan 6, 2026
30 of 36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants