From 3f0e226236c7d0b552668c4ad36975f05a1a35f4 Mon Sep 17 00:00:00 2001
From: Dennis Prinse <dennis.prinse@maxserv.com>
Date: Wed, 28 Jun 2023 08:32:04 +0200
Subject: [PATCH] [BUGFIX] Re-allow guzzlehttp/promises v1
The update to only allow guzzlehttp/promises has been breaking to
external extensions and their dependencies. Only allowing
guzzlehttp/promises v2 caused projects to refuse updating TYPO3 from
v12.4.1 to v12.4.2
> composer require guzzlehttp/promises:"^1.5.2 || ^2.0"
> composer require --no-update guzzlehttp/promises:"^1.5.2 || ^2.0" \
-d typo3/sysext/install/
Resolves: #101184
Related: #100919
Releases: main, 12.4
Change-Id: I173ca51ed03e3d1522d3dfa2e0db46a9141b6e13
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/79526
Reviewed-by: Nikita Hovratov <nikita.h@live.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
Tested-by: Nikita Hovratov <nikita.h@live.de>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
---
composer.json | 2 +-
composer.lock | 2 +-
typo3/sysext/install/composer.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/composer.json b/composer.json
index 367cc2e573df..3cbc4f284874 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,7 @@
"enshrined/svg-sanitize": "^0.15.4",
"firebase/php-jwt": "^6.4.0",
"guzzlehttp/guzzle": "^7.7.0",
- "guzzlehttp/promises": "^2.0",
+ "guzzlehttp/promises": "^1.5.2 || ^2.0",
"guzzlehttp/psr7": "^2.5.0",
"lolli42/finediff": "^1.0.2",
"masterminds/html5": "^2.7.6",
diff --git a/composer.lock b/composer.lock
index ce9a9b766c12..a645d1865839 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": "65210637ad668eacf4e8243752810645",
+ "content-hash": "a7776c6d39beabb20f0217922d718e11",
"packages": [
{
"name": "bacon/bacon-qr-code",
diff --git a/typo3/sysext/install/composer.json b/typo3/sysext/install/composer.json
index 478e52365bd9..045bc39aad85 100644
--- a/typo3/sysext/install/composer.json
+++ b/typo3/sysext/install/composer.json
@@ -20,7 +20,7 @@
},
"require": {
"doctrine/dbal": "^3.6.2",
- "guzzlehttp/promises": "^2.0",
+ "guzzlehttp/promises": "^1.5.2 || ^2.0",
"nikic/php-parser": "^4.15.4",
"symfony/finder": "^6.2",
"symfony/http-foundation": "^6.2",
--
GitLab