Commit e5888e58 authored by catch's avatar catch
Browse files

Issue #3282342 by xjm: Forward-port Guzzle updates, because the private... 

Issue #3282342 by xjm: Forward-port Guzzle updates, because the private testrunner doesn't like me today
parent d69212e1

composer.lock

+8 −8
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ 
            "dist": {

                "type": "path",

                "url": "core",

                "reference": "83153b5e19ab1f2f3f93e955261edd90860a7422"

                "reference": "78bbfc3df240b4eda4a4862733490c55dacbf5d1"

            },

            "require": {

                "asm89/stack-cors": "^2.0.2",
@@ -461,7 +461,7 @@ 
                "ext-spl": "*",

                "ext-tokenizer": "*",

                "ext-xml": "*",

                "guzzlehttp/guzzle": "^7.3.0",

                "guzzlehttp/guzzle": "^7.4.3",

                "guzzlehttp/psr7": "^2.2.0",

                "masterminds/html5": "^2.1",

                "pear/archive_tar": "^1.4.14",
@@ -814,16 +814,16 @@ 
        },

        {

            "name": "guzzlehttp/guzzle",

            "version": "7.4.2",

            "version": "7.4.3",

            "source": {

                "type": "git",

                "url": "https://github.com/guzzle/guzzle.git",

                "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4"

                "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4",

                "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4",

                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",

                "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",

                "shasum": ""

            },

            "require": {
@@ -918,7 +918,7 @@ 
            ],

            "support": {

                "issues": "https://github.com/guzzle/guzzle/issues",

                "source": "https://github.com/guzzle/guzzle/tree/7.4.2"

                "source": "https://github.com/guzzle/guzzle/tree/7.4.3"

            },

            "funding": [

                {
@@ -934,7 +934,7 @@ 
                    "type": "tidelift"

                }

            ],

            "time": "2022-03-20T14:16:28+00:00"

            "time": "2022-05-25T13:24:33+00:00"

        },

        {

            "name": "guzzlehttp/promises",

composer/Metapackage/CoreRecommended/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
        "doctrine/annotations": "1.13.2",

        "doctrine/lexer": "1.2.3",

        "egulias/email-validator": "3.1.2",

        "guzzlehttp/guzzle": "7.4.2",

        "guzzlehttp/guzzle": "7.4.3",

        "guzzlehttp/promises": "1.5.1",

        "guzzlehttp/psr7": "2.2.1",

        "masterminds/html5": "2.7.5",

core/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        "symfony/yaml": "^6.0",

        "twig/twig": "^3.3.8",

        "doctrine/annotations": "^1.12",

        "guzzlehttp/guzzle": "^7.3.0",

        "guzzlehttp/guzzle": "^7.4.3",

        "guzzlehttp/psr7": "^2.2.0",

        "egulias/email-validator": "^2.1.22|^3.0",

        "masterminds/html5": "^2.1",