Skip to content

Commit

Permalink
bug #13366 [Docs] Add missing references in CONFLICT.md (lchrusciel)
Browse files Browse the repository at this point in the history 
This PR was merged into the 1.10 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.10
| Bug fix?        | yes
| New feature?  | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | Leftover from #13357 and #13358
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.10 branch
 - Features and deprecations must be submitted against the master 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
-->


Commits
-------

e3ba9b9 [Docs] Add missing references in CONFLICT.md
  • Loading branch information
@Zales0123
Zales0123 authored Dec 13, 2021
2 parents 9ac8dd6 + e3ba9b9 commit cdc7be6
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CONFLICTS.md
View file
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

0 comments on commit cdc7be6

Please sign in to comment.