[Maintanance] add conflict

Sylius · Dec 6, 2021 · 860c3e8 · 860c3e8
1 parent b0b4efe
commit 860c3e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CONFLICTS.md b/CONFLICTS.md
@@ -3,6 +3,10 @@
 This document explains why certain conflicts were added to `composer.json` and
 references related issues.
 
+- `symfony/password-hasher": "^6.0`:
+
+  Symfony in version 5.3 change password hashing logic, and in version 6.0 they removed BC layer
+
  - `doctrine/doctrine-bundle:2.3.0`:
 
    This version makes Gedmo Doctrine Extensions fail (tree and position behaviour mostly).

diff --git a/composer.json b/composer.json
@@ -164,7 +164,8 @@
         "symfony/doctrine-bridge": "4.4.16",
         "symfony/property-info": "4.4.22 || 5.2.7",
         "symfony/serializer": "4.4.19 || 5.2.2",
-        "liip/imagine-bundle": "^2.7"
+        "liip/imagine-bundle": "^2.7",
+        "symfony/password-hasher": "^6.0"
     },
     "require-dev": {
         "ext-json": "*",