[UPMERGE] 2.1 -> 2.2 by SyliusBot · Pull Request #18695 · Sylius/Sylius

SyliusBot · 2025-12-20T02:34:28Z

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.2 -m "Resolve conflicts between 2.1 and 2.2"

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.

Summary by CodeRabbit

Chores
- Removed an unused import and broadened PSR HTTP Message compatibility in project manifests.
Tests
- Minor formatting adjustments in test files; no behavioral changes.

_{✏️ Tip: You can customize this high-level summary in your review settings.}

This PR has been generated automatically. For more details see [refactor.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/refactor.yaml).

coderabbitai · 2025-12-20T02:34:59Z

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.

📝 Walkthrough

Walkthrough

This pull request makes small maintenance edits: two test formatting tweaks, removal of an unused import, and broadening the psr/http-message composer constraint to allow v2 alongside v1.

Changes

Cohort / File(s)	Summary
Test file formatting `src/Sylius/Bundle/CoreBundle/tests/Telemetry/Provider/Business/CountriesDataProviderTest.php`, `src/Sylius/Bundle/CoreBundle/tests/Telemetry/Provider/Business/MetricsCountsDataProviderTest.php`	Cosmetic whitespace/line-break adjustments in test files only (no logic changes)
Import cleanup `src/Sylius/Component/Core/Telemetry/Generator/InstallationIdGenerator.php`	Removed unused `Symfony\Component\HttpFoundation\RequestStack` import
Dependency constraint updates `composer.json`, `src/Sylius/Component/Core/composer.json`	Relaxed `psr/http-message` requirement from `^1.0` to `^1.0

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

[UPMERGE] 2.1 -> 2.2 #18656 — Overlapping changes to telemetry test files (formatting and tests)

Suggested labels

Dependencies, Maintenance

Suggested reviewers

GSadee
mpysiak

Poem

🐰 A tiny hop, a tidy line,
An import gone, constraints align.
Tests breathe easy, composer too,
A quiet patch — hooray! 🥕

Pre-merge checks

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	You can run `@coderabbitai generate docstrings` to improve docstring coverage.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title '[UPMERGE] 2.1 -> 2.2' accurately reflects the PR's purpose: merging changes from the 2.1 branch into the 2.2 branch as part of an automated upmerge workflow.

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.}

github-actions · 2025-12-20T02:35:41Z

❌ Preview Environment deleted from Bunnyshell

Available commands:

🚀 /bns:deploy to redeploy the environment

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

This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/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.

| Q | A |-----------------|----- | Branch? | 2.2  | Bug fix? | no | New feature? | no | BC breaks? | no | License | MIT

Sylius Bot and others added 4 commits December 19, 2025 02:36

[CS][DX] Refactor

3b90c8a

[CS][DX] Refactor

9f63137

[CS][DX] Refactor (#18691)

88c123e

This PR has been generated automatically. For more details see [refactor.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/refactor.yaml).

[CS][DX] Refactor (#18689)

06d402e

This PR has been generated automatically. For more details see [refactor.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/refactor.yaml).

SyliusBot requested review from a team as code owners December 20, 2025 02:34

Rafikooo and others added 6 commits January 5, 2026 13:49

[Deps] Allow psr/http-message ^2.0

9998fa4

Resolve conflicts between 1.14 and 2.1

c4303d3

Try to fix build with PHP 8.5 and 8.4

6804eda

TheMilek approved these changes Jan 13, 2026

View reviewed changes

TheMilek merged commit d2dd201 into 2.2 Jan 13, 2026
127 of 129 checks passed

SyliusBot deleted the upmerge/2.1_2.2 branch January 14, 2026 02:45

SyliusBot restored the upmerge/2.1_2.2 branch January 15, 2026 02:40

coderabbitai bot mentioned this pull request Jan 16, 2026

[UPMERGE] 2.2 -> 2.3 #18731

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[UPMERGE] 2.1 -> 2.2#18695

[UPMERGE] 2.1 -> 2.2#18695
TheMilek merged 10 commits into2.2from
upmerge/2.1_2.2

SyliusBot commented Dec 20, 2025 •

edited by coderabbitai bot

Loading

Uh oh!

coderabbitai bot commented Dec 20, 2025 •

edited

Loading

Review skipped

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested labels

Suggested reviewers

Poem

Uh oh!

github-actions bot commented Dec 20, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

SyliusBot commented Dec 20, 2025 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Dec 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested labels

Suggested reviewers

Poem

Pre-merge checks

Uh oh!

github-actions bot commented Dec 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

❌ Preview Environment deleted from Bunnyshell

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

SyliusBot commented Dec 20, 2025 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Dec 20, 2025 •

edited

Loading

github-actions bot commented Dec 20, 2025 •

edited

Loading