Skip to content

[UPMERGE] 2.2 -> 2.3#18741

Merged
Rafikooo merged 6 commits into2.3from
upmerge/2.2_2.3
Jan 24, 2026
Merged

[UPMERGE] 2.2 -> 2.3#18741
Rafikooo merged 6 commits into2.3from
upmerge/2.2_2.3

Conversation

@SyliusBot
Copy link
Copy Markdown
Contributor

@SyliusBot SyliusBot commented Jan 21, 2026 •
edited by coderabbitai bot
Loading

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

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
    • Bumped release version and updated internal version identifiers for the next patch.
    • Added a new changelog entry for v2.2.2 (2026-01-20).
  • Tests
    • Updated frontend test metadata to run with the Mink Chromedriver setup.

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

@SyliusBot SyliusBot requested review from a team as code owners January 21, 2026 02:41
@probot-autolabeler probot-autolabeler bot added the Maintenance CI configurations, READMEs, releases, etc. label Jan 21, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Jan 21, 2026 •
edited
Loading

📝 Walkthrough

Walkthrough

This pull request bumps package version to v2.2.3-dev, updates corresponding bundle version constants, adds a new v2.2.2 changelog entry, and changes two Behat scenario tags from @javascript to @mink:chromedriver.

Changes

Cohort / File(s) Summary
Version Configuration
composer.json, src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php		 Bumped package version to v2.2.3-dev: updated version in composer.json and VERSION, VERSION_ID, RELEASE_VERSION constants in SyliusCoreBundle.php.
Changelog Documentation
CHANGELOG-2.2.md		 Added new v2.2.2 (2026-01-20) release section with a Details subsection listing PRs and contributors.
Test Tags
features/shop/checkout/preventing_from_claiming_cart_of_wrong_user.feature		 Replaced @javascript with @mink:chromedriver for two scenarios (keeps scenario bodies unchanged).

Sequence Diagram(s)

(omitted)

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

Suggested reviewers

  • Rafikooo
  • GSadee

Poem

🐰 I hopped through files with nimble feet,
Bumped the version and logged the feat.
Tests now point at Chromedriver's light,
Changelog shines a new release bright. 🎉

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title '[UPMERGE] 2.2 -> 2.3' directly describes the main objective of this pull request - upmerging changes from the 2.2 branch to the 2.3 branch, which is confirmed by the PR objectives.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

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
Copy link
Copy Markdown

github-actions bot commented Jan 21, 2026 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands:

  • 🚀 /bns:deploy to redeploy the environment

TheMilek and others added 3 commits January 23, 2026 15:07
@TheMilek
Fix panther build
af1b55c
@TheMilek
Fix panther build (#18747)
71b03d7 
| Q               | A
|-----------------|-----
| Branch?         | 2.1 <!-- see the comment below -->
| Bug fix?        | no
| 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
-->
@NoResponseMate
[UPMERGE] 2.1 -> 2.2 (#18748)
bb1be13 
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.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.
coderabbitai[bot]
coderabbitai bot reviewed Jan 23, 2026
View reviewed changes
Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
features/shop/checkout/preventing_from_claiming_cart_of_wrong_user.feature (1)

64-64: Update scenario on line 64 to use @mink:chromedriver instead of @javascript for consistency.

This scenario is the only one in the file using @javascript while all other four scenarios use @mink:chromedriver. Align this scenario with the rest of the file by replacing @javascript with @mink:chromedriver in the tag list at line 64.

@Rafikooo Rafikooo merged commit 265a614 into 2.3 Jan 24, 2026
66 of 67 checks passed
@SyliusBot SyliusBot deleted the upmerge/2.2_2.3 branch January 25, 2026 02:50
@SyliusBot SyliusBot restored the upmerge/2.2_2.3 branch January 26, 2026 02:50
@SyliusBot SyliusBot deleted the upmerge/2.2_2.3 branch January 27, 2026 02:46
@SyliusBot SyliusBot restored the upmerge/2.2_2.3 branch January 28, 2026 02:43
@SyliusBot SyliusBot deleted the upmerge/2.2_2.3 branch January 29, 2026 02:56
@SyliusBot SyliusBot restored the upmerge/2.2_2.3 branch January 30, 2026 03:03
@SyliusBot SyliusBot deleted the upmerge/2.2_2.3 branch January 31, 2026 02:53
@SyliusBot SyliusBot restored the upmerge/2.2_2.3 branch February 1, 2026 03:03
@SyliusBot SyliusBot deleted the upmerge/2.2_2.3 branch February 2, 2026 03:03
@SyliusBot SyliusBot restored the upmerge/2.2_2.3 branch February 3, 2026 03:00
@SyliusBot SyliusBot deleted the upmerge/2.2_2.3 branch February 4, 2026 02:57
@SyliusBot SyliusBot restored the upmerge/2.2_2.3 branch February 5, 2026 02:59
This was referenced Mar 17, 2026
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@coderabbitai coderabbitai[bot] coderabbitai[bot] left review comments

@Rafikooo Rafikooo Rafikooo approved these changes

Assignees

No one assigned

Labels

Maintenance CI configurations, READMEs, releases, etc.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@SyliusBot @Rafikooo @GSadee @TheMilek @NoResponseMate