Skip to content

[UPMERGE] 2.0 -> 2.1#631

Open
SyliusBot wants to merge 7 commits into
2.1from
upmerge/2.0_2.1
Open

[UPMERGE] 2.0 -> 2.1#631
SyliusBot wants to merge 7 commits into
2.1from
upmerge/2.0_2.1

Conversation

@SyliusBot

Copy link
Copy Markdown

This PR has been generated automatically.

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

In case of conflicts, resolve them manually:

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

Rafikooo and others added 7 commits February 3, 2026 15:50
Adds telemetry policy and `sylius/telemetry-bundle` as a hard
dependency.

- `TELEMETRY_POLICY.md` — describes scope, purpose, and conditions of
telemetry data collection
- `composer.json` — requires `sylius/telemetry-bundle: ^1.0`
- `README.md` — telemetry notice pointing to the policy file

Related: Sylius/Sylius#18588
AdminBundle's modal-portal.js moves .modal elements to <body> on
show.bs.modal, detaching the modal from its LiveComponent wrapper.
This broke the data-action="live#action:prevent" binding, causing the
sandbox credential form to fall back to a plain HTTP POST.

Fix by intercepting show.bs.modal in the capture phase (before
modal-portal.js runs in the bubbling phase), moving the entire
LiveComponent wrapper to <body> instead of just the modal, and
restoring it to its original DOM position on hidden.bs.modal via a
comment-node placeholder.

Also fix getDataModelValue() visibility (protected) and return type
(string), drop Sylius ~2.0.1 from the build matrix, update the
winzou_state_machine CI entry to use Sylius ~2.2.0 / Symfony ^7.4,
and add a Behat scenario verifying PayPal is sorted first at checkout.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
AdminBundle's modal-portal.js moves .modal elements to <body> on
show.bs.modal, detaching the modal from its LiveComponent wrapper. This
broke the data-action="live#action:prevent" binding, causing the sandbox
credential form to fall back to a plain HTTP POST.

Fix by intercepting show.bs.modal in the capture phase (before
modal-portal.js runs in the bubbling phase), moving the entire
LiveComponent wrapper to <body> instead of just the modal, and restoring
it to its original DOM position on hidden.bs.modal via a comment-node
placeholder.

Also fix getDataModelValue() visibility (protected) and return type
(string), drop Sylius ~2.0.1 from the build matrix, update the
winzou_state_machine CI entry to use Sylius ~2.2.0 / Symfony ^7.4, and
add a Behat scenario verifying PayPal is sorted first at checkout.

| Q               | A
| --------------- | -----
| Branch?         | 2.0
| Bug fix?        | yes
| New feature?    | no
The component is registered as sylius_paypal:create_sandbox_modal in
services.xml, not sylius_paypal_sandbox_modal.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
)

The component is registered as sylius_paypal:create_sandbox_modal in
services.xml, not sylius_paypal_sandbox_modal as previously assumed.

| Q               | A
| --------------- | -----
| Branch?         | and 2.0
| Bug fix?        | yes
| New feature?    | no
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