From 4a8e8001fe6b8024728334b7a5f770df2a60902c Mon Sep 17 00:00:00 2001 From: Benni Mack Date: Thu, 12 Dec 2019 11:21:59 +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/+/62612 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 b76cc2d0be8a..0759e9452142 100644 --- a/composer.json +++ b/composer.json @@ -80,6 +80,7 @@ "ext-mysqli": "" }, "conflict": { + "guzzlehttp/guzzle": ">= 6.5.0", "symfony/cache": "< 2.8.50 >= 2.8.0 || < 3.4.26 >= 3.4.0 || < 4.1.12 >= 4.1.0 || < 4.2.7 >= 4.2.0", "symfony/finder": "2.7.44 || 2.8.37 || 3.4.7 || 4.0.7", "symfony/routing": "4.2.7", diff --git a/composer.lock b/composer.lock index 821e38e8f6b6..10f7c8f47db9 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": "98b2b36f1c68c1cbed8f4cff0336b940", + "content-hash": "9fe3afc7f2dbe8dd3725f936772b9f97", "packages": [ { "name": "algo26-matthias/idna-convert", diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json index 924614f6f284..0bb62a614108 100644 --- a/typo3/sysext/core/composer.json +++ b/typo3/sysext/core/composer.json @@ -64,6 +64,7 @@ "ext-zlib": "TYPO3 uses zlib for amongst others output compression and un/packing t3x extension files" }, "conflict": { + "guzzlehttp/guzzle": ">= 6.5.0", "symfony/cache": "< 2.8.50 >= 2.8.0 || < 3.4.26 >= 3.4.0 || < 4.1.12 >= 4.1.0 || < 4.2.7 >= 4.2.0", "symfony/finder": "2.7.44 || 2.8.37 || 3.4.7 || 4.0.7", "typo3/cms": "*",