From b78938634a83b11df7a5d2a1618b0667b72f9c45 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Sat, 5 Dec 2020 10:42:59 +0100
Subject: [PATCH] [TASK] Require guzzlehttp dependency v7.2+
TYPO3 Core now requires the GuzzleHTTP library
in version v7.2 or higher as this one explicitly states
compatibility with PHP 8.0.
Resolves: #92995
Releases: master
Change-Id: Ib86d8fcdc6d5218269270292f71a819d47d6ef3b
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/67007
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Alexander Schnitzler <git@alexanderschnitzler.de>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Alexander Schnitzler <git@alexanderschnitzler.de>
Reviewed-by: Benni Mack <benni@typo3.org>
---
composer.json | 5 +-
composer.lock | 103 +++++++++++++++++++++-----------
typo3/sysext/core/composer.json | 3 +-
3 files changed, 70 insertions(+), 41 deletions(-)
diff --git a/composer.json b/composer.json
index 975311777de9..892b9ca418d7 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
"doctrine/instantiator": "^1.4",
"doctrine/lexer": "^1.2.1",
"egulias/email-validator": "^2.1",
- "guzzlehttp/guzzle": "^6.3.0",
+ "guzzlehttp/guzzle": "^7.2",
"nikic/php-parser": "^4.3",
"phpdocumentor/reflection-docblock": "^5.1.0",
"phpdocumentor/type-resolver": "^1.1.0",
@@ -106,8 +106,7 @@
"ext-mysqli": ""
},
"conflict": {
- "hoa/core": "*",
- "guzzlehttp/guzzle": "6.5.0"
+ "hoa/core": "*"
},
"provide": {
"psr/http-client-implementation": "1.0",
diff --git a/composer.lock b/composer.lock
index dcc7812c7197..e93c23b4c5ee 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": "4a0fa54be22aa86720a43f4ad40dbb42",
+ "content-hash": "03bffe666cd2a67b7cb2412ae3060044",
"packages": [
{
"name": "cogpowered/finediff",
@@ -623,36 +623,43 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "6.4.1",
+ "version": "7.2.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
+ "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
- "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0aa74dfb41ae110835923ef10a9d803a22d50e79",
+ "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79",
"shasum": ""
},
"require": {
"ext-json": "*",
- "guzzlehttp/promises": "^1.0",
- "guzzlehttp/psr7": "^1.6.1",
- "php": ">=5.5"
+ "guzzlehttp/promises": "^1.4",
+ "guzzlehttp/psr7": "^1.7",
+ "php": "^7.2.5 || ^8.0",
+ "psr/http-client": "^1.0"
+ },
+ "provide": {
+ "psr/http-client-implementation": "1.0"
},
"require-dev": {
"ext-curl": "*",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+ "php-http/client-integration-tests": "^3.0",
+ "phpunit/phpunit": "^8.5.5 || ^9.3.5",
"psr/log": "^1.1"
},
"suggest": {
+ "ext-curl": "Required for CURL handler support",
+ "ext-intl": "Required for Internationalized Domain Name (IDN) support",
"psr/log": "Required for using the Log middleware"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.3-dev"
+ "dev-master": "7.1-dev"
}
},
"autoload": {
@@ -672,6 +679,11 @@
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://sagikazarmark.hu"
}
],
"description": "Guzzle is a PHP HTTP client library",
@@ -682,34 +694,54 @@
"framework",
"http",
"http client",
+ "psr-18",
+ "psr-7",
"rest",
"web service"
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/master"
+ "source": "https://github.com/guzzle/guzzle/tree/7.2.0"
},
- "time": "2019-10-23T15:58:00+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/alexeyshockov",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/gmponos",
+ "type": "github"
+ }
+ ],
+ "time": "2020-10-10T11:47:56+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "v1.3.1",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+ "reference": "60d379c243457e073cff02bc323a2a86cb355631"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
- "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631",
+ "reference": "60d379c243457e073cff02bc323a2a86cb355631",
"shasum": ""
},
"require": {
- "php": ">=5.5.0"
+ "php": ">=5.5"
},
"require-dev": {
- "phpunit/phpunit": "^4.0"
+ "symfony/phpunit-bridge": "^4.4 || ^5.1"
},
"type": "library",
"extra": {
@@ -742,22 +774,22 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/master"
+ "source": "https://github.com/guzzle/promises/tree/1.4.0"
},
- "time": "2016-12-20T10:07:11+00:00"
+ "time": "2020-09-30T07:37:28+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "1.6.1",
+ "version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+ "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
- "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3",
+ "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3",
"shasum": ""
},
"require": {
@@ -770,15 +802,15 @@
},
"require-dev": {
"ext-zlib": "*",
- "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+ "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
},
"suggest": {
- "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6-dev"
+ "dev-master": "1.7-dev"
}
},
"autoload": {
@@ -817,9 +849,9 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/1.6.1"
+ "source": "https://github.com/guzzle/psr7/tree/1.7.0"
},
- "time": "2019-07-01T23:21:34+00:00"
+ "time": "2020-09-30T07:37:11+00:00"
},
{
"name": "nikic/php-parser",
@@ -1194,20 +1226,20 @@
},
{
"name": "psr/http-client",
- "version": "1.0.0",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
- "reference": "496a823ef742b632934724bf769560c2a5c7c44e"
+ "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-client/zipball/496a823ef742b632934724bf769560c2a5c7c44e",
- "reference": "496a823ef742b632934724bf769560c2a5c7c44e",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+ "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
"shasum": ""
},
"require": {
- "php": "^7.0",
+ "php": "^7.0 || ^8.0",
"psr/http-message": "^1.0"
},
"type": "library",
@@ -1240,10 +1272,9 @@
"psr-18"
],
"support": {
- "issues": "https://github.com/php-fig/http-client/issues",
"source": "https://github.com/php-fig/http-client/tree/master"
},
- "time": "2018-10-30T23:29:13+00:00"
+ "time": "2020-06-29T06:28:15+00:00"
},
{
"name": "psr/http-factory",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 699a66f7c1db..75774a7dc6a9 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -32,7 +32,7 @@
"doctrine/instantiator": "^1.4",
"doctrine/lexer": "^1.2.1",
"egulias/email-validator": "^2.1",
- "guzzlehttp/guzzle": "^6.3.0",
+ "guzzlehttp/guzzle": "^7.2",
"nikic/php-parser": "^4.3",
"psr/container": "^1.0",
"psr/event-dispatcher": "^1.0",
@@ -85,7 +85,6 @@
},
"conflict": {
"hoa/core": "*",
- "guzzlehttp/guzzle": "6.5.0",
"typo3/cms": "*"
},
"replace": {
--
GitLab