From 59d5159a1d82831704b3e09b3baebed30808b592 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
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/+/62606
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
---
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 45bb0617e941..030469ee7fc4 100644
--- a/composer.json
+++ b/composer.json
@@ -92,6 +92,7 @@
},
"conflict": {
"hoa/core": "*",
+ "guzzlehttp/guzzle": ">= 6.5.0",
"phpdocumentor/reflection-docblock": ">= 4.3.2"
},
"provide": {
diff --git a/composer.lock b/composer.lock
index 8f6404b857fb..ef3b68614c99 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": "849495c5f9338523ee9caeecb03741fc",
+ "content-hash": "49295a72bf4b2cda613861fea81568b3",
"packages": [
{
"name": "cogpowered/finediff",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index c19e577344cc..11f955fa5f3a 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -70,6 +70,7 @@
},
"conflict": {
"hoa/core": "*",
+ "guzzlehttp/guzzle": ">= 6.5.0",
"typo3/cms": "*"
},
"replace": {
--
GitLab