Skip to content

Commit

Permalink
minor #13367 [Maintenance] Remove Sf6.0 conflicts (lchrusciel)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.11-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| 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
-->

Sf 5.2 is not supported in master, so conflicts are not needed 

Commits
-------

8b72684 [Maintenance] Remove Sf6.0 conflicts
  • Loading branch information
Zales0123 committed Dec 8, 2021
2 parents 7b8e0f8 + 8b72684 commit 69c18ee
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
7 changes: 0 additions & 7 deletions CONFLICTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
This document explains why certain conflicts were added to `composer.json` and
references related issues.

- `symfony/cache": "^6.0`, "symfony/amqp-messenger": "^6.0", "symfony/doctrine-messenger": "^6.0",
"symfony/error-handler": "^6.0", "symfony/redis-messenger": "^6.0", "symfony/stopwatch": "^6.0", "symfony/twig-bridge": "^6.0",
"symfony/var-dumper": "^6.0", "symfony/var-exporter": "^6.0",:

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.

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

Symfony in version 5.3 change password hashing logic, and in version 6.0 they removed BC layer
Expand Down
9 changes: 0 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,8 @@
"doctrine/doctrine-bundle": "2.3.0",
"doctrine/orm": "^2.10.0",
"jms/serializer-bundle": "3.9.0",
"symfony/cache": "^6.0",
"symfony/doctrine-bridge": "4.4.16",
"symfony/password-hasher": "^6.0",
"symfony/amqp-messenger": "^6.0",
"symfony/doctrine-messenger": "^6.0",
"symfony/error-handler": "^6.0",
"symfony/redis-messenger": "^6.0",
"symfony/stopwatch": "^6.0",
"symfony/twig-bridge": "^6.0",
"symfony/var-dumper": "^6.0",
"symfony/var-exporter": "^6.0",
"symfony/property-info": "4.4.22 || 5.2.7",
"symfony/serializer": "4.4.19 || 5.2.2",
"liip/imagine-bundle": "^2.7"
Expand Down

0 comments on commit 69c18ee

Please sign in to comment.