Issue #3282342 by xjm: Forward-port Guzzle updates, because the private... (362d1665) · Commits · project / drupal

composer.lock

+54 −10

Original line number	Diff line number	Diff line
		@@ -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": "d2dab2d3e21c0f34a5f463b766c90645",
		"content-hash": "2f38f79c094d1d9dbdfd594953fa4fba",
		"packages": [
		{
		"name": "asm89/stack-cors",
		@@ -531,7 +531,7 @@
		"dist": {
		"type": "path",
		"url": "core",
		"reference": "232d135ecf054a91a09ed87d08d5d200c2e11a6a"
		"reference": "cc8e3c080af53d2b57bb827f28fa0fb243ffccdc"
		},
		"require": {
		"asm89/stack-cors": "^1.1",
		@@ -552,7 +552,7 @@
		"ext-spl": "*",
		"ext-tokenizer": "*",
		"ext-xml": "*",
		"guzzlehttp/guzzle": "^6.5.2 \|\| ^7.4.1",
		"guzzlehttp/guzzle": "^6.5.6 \|\| ^7.4.3",
		"laminas/laminas-diactoros": "^2.1",
		"laminas/laminas-feed": "^2.12",
		"masterminds/html5": "^2.1",
		@@ -918,16 +918,16 @@
		},
		{
		"name": "guzzlehttp/guzzle",
		"version": "6.5.5",
		"version": "6.5.6",
		"source": {
		"type": "git",
		"url": "https://github.com/guzzle/guzzle.git",
		"reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
		"reference": "f092dd734083473658de3ee4bef093ed77d2689c"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
		"reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
		"url": "https://api.github.com/repos/guzzle/guzzle/zipball/f092dd734083473658de3ee4bef093ed77d2689c",
		"reference": "f092dd734083473658de3ee4bef093ed77d2689c",
		"shasum": ""
		},
		"require": {
		@@ -964,10 +964,40 @@
		"MIT"
		],
		"authors": [
		{
		"name": "Graham Campbell",
		"email": "hello@gjcampbell.co.uk",
		"homepage": "https://github.com/GrahamCampbell"
		},
		{
		"name": "Michael Dowling",
		"email": "mtdowling@gmail.com",
		"homepage": "https://github.com/mtdowling"
		},
		{
		"name": "Jeremy Lindblom",
		"email": "jeremeamia@gmail.com",
		"homepage": "https://github.com/jeremeamia"
		},
		{
		"name": "George Mponos",
		"email": "gmponos@gmail.com",
		"homepage": "https://github.com/gmponos"
		},
		{
		"name": "Tobias Nyholm",
		"email": "tobias.nyholm@gmail.com",
		"homepage": "https://github.com/Nyholm"
		},
		{
		"name": "Márk Sági-Kazár",
		"email": "mark.sagikazar@gmail.com",
		"homepage": "https://github.com/sagikazarmark"
		},
		{
		"name": "Tobias Schultze",
		"email": "webmaster@tubo-world.de",
		"homepage": "https://github.com/Tobion"
		}
		],
		"description": "Guzzle is a PHP HTTP client library",
		@@ -983,9 +1013,23 @@
		],
		"support": {
		"issues": "https://github.com/guzzle/guzzle/issues",
		"source": "https://github.com/guzzle/guzzle/tree/6.5"
		"source": "https://github.com/guzzle/guzzle/tree/6.5.6"
		},
		"funding": [
		{
		"url": "https://github.com/GrahamCampbell",
		"type": "github"
		},
		{
		"url": "https://github.com/Nyholm",
		"type": "github"
		},
		"time": "2020-06-16T21:01:06+00:00"
		{
		"url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
		"type": "tidelift"
		}
		],
		"time": "2022-05-25T13:19:12+00:00"
		},
		{
		"name": "guzzlehttp/promises",
		@@ -8211,5 +8255,5 @@
		"platform-overrides": {
		"php": "7.3.0"
		},
		"plugin-api-version": "2.2.0"
		"plugin-api-version": "2.3.0"
		}

composer/Metapackage/CoreRecommended/composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		"doctrine/lexer": "1.2.3",
		"doctrine/reflection": "1.2.2",
		"egulias/email-validator": "3.1.2",
		"guzzlehttp/guzzle": "6.5.5",
		"guzzlehttp/guzzle": "6.5.6",
		"guzzlehttp/promises": "1.5.1",
		"guzzlehttp/psr7": "1.8.5",
		"laminas/laminas-diactoros": "2.10.0",

core/composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		"twig/twig": "^2.14.11",
		"doctrine/reflection": "^1.1",
		"doctrine/annotations": "^1.12",
		"guzzlehttp/guzzle": "^6.5.2 \|\| ^7.4.1",
		"guzzlehttp/guzzle": "^6.5.6 \|\| ^7.4.3",
		"symfony-cmf/routing": "^2.1",
		"laminas/laminas-feed": "^2.12",
		"stack/builder": "^1.0",