Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Docs] Add missing references in CONFLICT.md #13366

Merged
merged 1 commit into from
Dec 13, 2021
Merged

[Docs] Add missing references in CONFLICT.md #13366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CONFLICTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ references related issues.

Symfony in version 5.2 is installing amqp-messenger, doctrine-messenger, error-handler, redis-messenger, stopwatch,
twig-bridge, var-dumper, var-exporter 6.0, which is not compatible with the current version of Sylius. This is not happening for Sf4.4, Sf5.3, Sf5.4.

References: https://github.com/Sylius/Sylius/pull/13357

- `symfony/password-hasher": "^6.0`:

Symfony in version 5.3 change password hashing logic, and in version 6.0 they removed BC layer

References: https://github.com/Sylius/Sylius/pull/13358

- `doctrine/doctrine-bundle:2.3.0`:

Expand Down