From bb11a3e02127c7705287c7486a66aa0e460b7f4a Mon Sep 17 00:00:00 2001 From: Benni Mack Date: Fri, 13 Dec 2019 11:12:25 +0100 Subject: [PATCH] [BUGFIX] Mark guzzlehttp/guzzle >= 6.5.0 as conflict Due to the INTL/ICU bug, which we have seen on various places, Guzzle, which does not cover our edge cases yet, ran in the same issue as our Core versions earlier in 2019. See https://github.com/guzzle/guzzle/issues/2448 https://github.com/guzzle/guzzle/pull/2454 For the time being, lets mark guzzle as incompatible until Guzzle has solved the issue and released a new version, so we can loosen the conflict constraint. Related: #87953 Resolves: #89904 Releases: master, 9.5, 8.7 Change-Id: If64fb9472d046f020c850cd0551beeaf78796b60 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/62613 Tested-by: TYPO3com Tested-by: Oliver Hader Reviewed-by: Oliver Hader --- composer.json | 1 + composer.lock | 2 +- typo3/sysext/core/composer.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 398763d514e7..3b07fef484df 100644 --- a/composer.json +++ b/composer.json @@ -72,6 +72,7 @@ "ext-zlib": "TYPO3 uses zlib for amongst others output compression and un/packing t3x extension files" }, "conflict": { + "guzzlehttp/guzzle": ">= 6.5.0", "symfony/finder": "2.7.44 || 2.8.37 || 3.4.7 || 4.0.7", "typo3fluid/fluid": "2.6.4 || 2.6.5" }, diff --git a/composer.lock b/composer.lock index ec226418533f..4247bbc49c6c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1737a8523854a73d56af3d4858d641c9", + "content-hash": "443f9b14d81e5a20ee0ca8badbadcc59", "packages": [ { "name": "algo26-matthias/idna-convert", diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json index 7777142065c4..315246009d60 100644 --- a/typo3/sysext/core/composer.json +++ b/typo3/sysext/core/composer.json @@ -47,6 +47,7 @@ "ext-zlib": "TYPO3 uses zlib for amongst others output compression and un/packing t3x extension files" }, "conflict": { + "guzzlehttp/guzzle": ">= 6.5.0", "symfony/finder": "2.7.44 || 2.8.37 || 3.4.7 || 4.0.7", "typo3/cms": "*", "typo3fluid/fluid": "2.6.4 || 2.6.5"