From e716e105c2a415a248ca0e1535b68a5da2a8eb45 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Thu, 11 Mar 2021 17:01:04 +0100 Subject: [PATCH] Fix article bundle conflicts --- composer.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index c5e2eec7..1b44374f 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "elasticsearch/elasticsearch": "^5.0 || ^6.0 || ^7.0", "friendsofphp/php-cs-fixer": "^2.17", "handcraftedinthealps/elasticsearch-bundle": "^5.2.6.4", - "handcraftedinthealps/elasticsearch-dsl": "^6.2.0.1", + "handcraftedinthealps/elasticsearch-dsl": "^5.0.7.1 || ^6.2.0.1 || ^7.2.0.1", "handcraftedinthealps/zendsearch": "^2.0", "jackalope/jackalope-doctrine-dbal": "^1.3.4", "jackalope/jackalope-jackrabbit": "^1.3", @@ -60,11 +60,15 @@ }, "conflict": { "elasticsearch/elasticsearch": "<5.0 >=8.0", - "handcraftedinthealps/elasticsearch-bundle": "<5.2.6.4 >= 6.0", - "handcraftedinthealps/elasticsearch-dsl": "<5.0.7.1 || <6.2.0.1 || <7.2.0.1 >=8.0" + "ongr/elasticsearch-bundle": "*", + "handcraftedinthealps/elasticsearch-bundle": "<5.2.6.4 >=6.0", + "handcraftedinthealps/elasticsearch-dsl": "<=5.0.7 || 6.0 - 6.2.0 || 7.0 - 7.2.0 >=8.0" }, "suggest": { - "sulu/automation-bundle": "Allows to outsource long-running route update processes." + "elasticsearch/elasticsearch": "Required for the default article phpcr storage.", + "handcraftedinthealps/elasticsearch-bundle": "Required for the default article phpcr storage.", + "sulu/automation-bundle": "Allows publish automation and outsource long-running route update processes.", + "sulu/content-bundle": "Allows to use the experimental article storage." }, "autoload": { "psr-4": {