From 71756e8d48e749e8f175c31a08fea8f99643a9a5 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Thu, 1 Dec 2022 22:07:17 +0100
Subject: [PATCH] [TASK] Update guzzle components
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Used commands:
composer req -W \
-d typo3/sysext/core --no-update \
guzzlehttp/guzzle:^7.5.0 \
guzzlehttp/psr7:^2.4.3
composer req -W \
-d typo3/sysext/install --no-update \
guzzlehttp/promises:^1.5.2
composer req -W \
guzzlehttp/guzzle:^7.5.0 \
guzzlehttp/promises:^1.5.2 \
guzzlehttp/psr7:^2.4.3
Resolves: #99242
Releases: main, 11.5
Change-Id: Iec5f53533860f3811127b1a4463e7a4a7fd70877
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/76878
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
---
composer.json | 6 ++--
composer.lock | 56 +++++++++++++++++-------------
typo3/sysext/core/composer.json | 4 +--
typo3/sysext/install/composer.json | 2 +-
4 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/composer.json b/composer.json
index 92c17eff14d2..246d60b1694c 100644
--- a/composer.json
+++ b/composer.json
@@ -56,9 +56,9 @@
"egulias/email-validator": "^3.2.1",
"enshrined/svg-sanitize": "^0.15.4",
"firebase/php-jwt": "^6.3.1",
- "guzzlehttp/guzzle": "^7.4.5",
- "guzzlehttp/promises": "^1.4.0",
- "guzzlehttp/psr7": "^1.8.5 || ^2.1.2",
+ "guzzlehttp/guzzle": "^7.5.0",
+ "guzzlehttp/promises": "^1.5.2",
+ "guzzlehttp/psr7": "^2.4.3",
"lolli42/finediff": "^1.0.2",
"masterminds/html5": "^2.7.6",
"nikic/php-parser": "^4.15.1",
diff --git a/composer.lock b/composer.lock
index 25ae4d0a9cce..261b8af6f2e2 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": "ab839c89c68caf9cc01d4fc45b1da848",
+ "content-hash": "6bc48f0418071fffdecd89c621941f5b",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -830,16 +830,16 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.4.5",
+ "version": "7.5.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
+ "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
- "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+ "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
"shasum": ""
},
"require": {
@@ -854,10 +854,10 @@
"psr/http-client-implementation": "1.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.4.1",
+ "bamarni/composer-bin-plugin": "^1.8.1",
"ext-curl": "*",
"php-http/client-integration-tests": "^3.0",
- "phpunit/phpunit": "^8.5.5 || ^9.3.5",
+ "phpunit/phpunit": "^8.5.29 || ^9.5.23",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"suggest": {
@@ -867,8 +867,12 @@
},
"type": "library",
"extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
+ },
"branch-alias": {
- "dev-master": "7.4-dev"
+ "dev-master": "7.5-dev"
}
},
"autoload": {
@@ -934,7 +938,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.4.5"
+ "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
},
"funding": [
{
@@ -950,20 +954,20 @@
"type": "tidelift"
}
],
- "time": "2022-06-20T22:16:13+00:00"
+ "time": "2022-08-28T15:39:27+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "1.5.1",
+ "version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+ "reference": "b94b2807d85443f9719887892882d0329d1e2598"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
- "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+ "reference": "b94b2807d85443f9719887892882d0329d1e2598",
"shasum": ""
},
"require": {
@@ -1018,7 +1022,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/1.5.1"
+ "source": "https://github.com/guzzle/promises/tree/1.5.2"
},
"funding": [
{
@@ -1034,20 +1038,20 @@
"type": "tidelift"
}
],
- "time": "2021-10-22T20:56:57+00:00"
+ "time": "2022-08-28T14:55:35+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "2.4.0",
+ "version": "2.4.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "13388f00956b1503577598873fffb5ae994b5737"
+ "reference": "67c26b443f348a51926030c83481b85718457d3d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
- "reference": "13388f00956b1503577598873fffb5ae994b5737",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
+ "reference": "67c26b443f348a51926030c83481b85718457d3d",
"shasum": ""
},
"require": {
@@ -1061,15 +1065,19 @@
"psr/http-message-implementation": "1.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.4.1",
+ "bamarni/composer-bin-plugin": "^1.8.1",
"http-interop/http-factory-tests": "^0.9",
- "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+ "phpunit/phpunit": "^8.5.29 || ^9.5.23"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
+ },
"branch-alias": {
"dev-master": "2.4-dev"
}
@@ -1133,7 +1141,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.4.0"
+ "source": "https://github.com/guzzle/psr7/tree/2.4.3"
},
"funding": [
{
@@ -1149,7 +1157,7 @@
"type": "tidelift"
}
],
- "time": "2022-06-20T21:43:11+00:00"
+ "time": "2022-10-26T14:07:24+00:00"
},
{
"name": "lolli42/finediff",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 52759d650335..e843af3966ab 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -39,8 +39,8 @@
"egulias/email-validator": "^3.2.1",
"enshrined/svg-sanitize": "^0.15.4",
"firebase/php-jwt": "^6.3.1",
- "guzzlehttp/guzzle": "^7.4.5",
- "guzzlehttp/psr7": "^1.8.5 || ^2.1.2",
+ "guzzlehttp/guzzle": "^7.5.0",
+ "guzzlehttp/psr7": "^2.4.3",
"lolli42/finediff": "^1.0.2",
"masterminds/html5": "^2.7.6",
"psr/container": "^2.0",
diff --git a/typo3/sysext/install/composer.json b/typo3/sysext/install/composer.json
index cb9b8622f657..d6189317fa03 100644
--- a/typo3/sysext/install/composer.json
+++ b/typo3/sysext/install/composer.json
@@ -20,7 +20,7 @@
},
"require": {
"doctrine/dbal": "^3.5.1",
- "guzzlehttp/promises": "^1.4.0",
+ "guzzlehttp/promises": "^1.5.2",
"nikic/php-parser": "^4.15.1",
"symfony/finder": "^6.2",
"symfony/http-foundation": "^6.2",
--
GitLab