From 2b1d7e62e597337c14d1f69af8d5494d16f29c02 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Wed, 30 Jun 2021 11:28:16 +0200
Subject: [PATCH] [BUGFIX] Declare guzzlehttp/psr7 dependency
guzzlehttp/psr7 is not only an indirect dependency
from guzzlehttp/guzzle, but also a direct core
dependency since we extend LazyOpenStream in
SelfEmittableLazyOpenStream. Declare that dependency
directly, which also blocks upcoming guzzlehttp/psr7:2.0
which is currently incompatible with our core use.
composer req guzzlehttp/psr7:^1.7.0
composer req guzzlehttp/psr7:^1.7.0 -d typo3/sysext/core --no-update
Change-Id: I4968bc854545262ce0230ea71647463f5a332f54
Resolves: #94422
Releases: master, 10.4, 9.5
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/69668
Tested-by: core-ci <typo3@b13.com>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 1 +
composer.lock | 14 +++++++-------
typo3/sysext/core/composer.json | 1 +
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/composer.json b/composer.json
index f8afee10c5bc..51dd7a92c4ee 100644
--- a/composer.json
+++ b/composer.json
@@ -47,6 +47,7 @@
"doctrine/lexer": "^1.2.1",
"egulias/email-validator": "^2.1",
"guzzlehttp/guzzle": "^7.2",
+ "guzzlehttp/psr7": "^1.7.0",
"nikic/php-parser": "^4.10.4",
"phpdocumentor/reflection-docblock": "^5.2",
"phpdocumentor/type-resolver": "^1.4",
diff --git a/composer.lock b/composer.lock
index 3a8de3c9a60a..5936dcf98381 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": "63c454f6977e568f44a8f9b5e7a815ba",
+ "content-hash": "4cc6f8e7d9eff80f921541c99c4841e5",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -974,16 +974,16 @@
},
{
"name": "guzzlehttp/psr7",
- "version": "1.7.0",
+ "version": "1.8.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3"
+ "reference": "dc960a912984efb74d0a90222870c72c87f10c91"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3",
- "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91",
+ "reference": "dc960a912984efb74d0a90222870c72c87f10c91",
"shasum": ""
},
"require": {
@@ -1043,9 +1043,9 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/1.7.0"
+ "source": "https://github.com/guzzle/psr7/tree/1.8.2"
},
- "time": "2020-09-30T07:37:11+00:00"
+ "time": "2021-04-26T09:17:50+00:00"
},
{
"name": "nikic/php-parser",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 2c72a6631c3f..466d261fdd3e 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -35,6 +35,7 @@
"doctrine/lexer": "^1.2.1",
"egulias/email-validator": "^2.1",
"guzzlehttp/guzzle": "^7.2",
+ "guzzlehttp/psr7": "^1.7.0",
"nikic/php-parser": "^4.10.4",
"psr/container": "^1.1 || ^2.0",
"psr/event-dispatcher": "^1.0",
--
GitLab