From 8b72684abca89151fe134206a749f2ca45196bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= Date: Tue, 7 Dec 2021 16:53:41 +0100 Subject: [PATCH] [Maintenance] Remove Sf6.0 conflicts --- CONFLICTS.md | 7 ------- composer.json | 9 --------- 2 files changed, 16 deletions(-) diff --git a/CONFLICTS.md b/CONFLICTS.md index af7c9cf107c..7bac02989f1 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -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 diff --git a/composer.json b/composer.json index 887583bb704..d9d7755a1f3 100644 --- a/composer.json +++ b/composer.json @@ -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"