From f6962a8241280c1c4d985e39050bfae5064f2776 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 22 Jun 2022 08:42:52 +0200 Subject: [PATCH 1/2] SW-26736 - Upgrade guzzlehttp/guzzle to v7.4.5 --- UPGRADE-5.7.md | 4 ++-- composer.json | 4 ++-- composer.lock | 30 +++++++++++++++--------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 769f4c29398..15211a7de0c 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -25,8 +25,8 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `elasticsearch/elasticsearch` to version 7.17.0 * Updated `friendsofphp/proxy-manager-lts` to version 1.0.12 * Updated `google/cloud-storage` to version 1.27.1 -* Updated `guzzlehttp/guzzle` to version 7.4.4 -* Updated `guzzlehttp/psr7` to version 2.3.0 +* Updated `guzzlehttp/guzzle` to version 7.4.5 +* Updated `guzzlehttp/psr7` to version 2.4.0 * Updated `laminas/laminas-escaper` to version 2.10.0 * Updated `monolog/monolog` to version 2.7.0 * Updated `mpdf/mpdf` to version 8.1.1 diff --git a/composer.json b/composer.json index 8336f78862c..bd3256865fd 100644 --- a/composer.json +++ b/composer.json @@ -53,8 +53,8 @@ "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.12", "google/cloud-storage": "1.27.1", - "guzzlehttp/guzzle": "~7.4.4", - "guzzlehttp/psr7": "2.3.0", + "guzzlehttp/guzzle": "~7.4.5", + "guzzlehttp/psr7": "2.4.0", "laminas/laminas-code": "4.5.1", "laminas/laminas-escaper": "2.10.0", "league/flysystem": "~1.1.4", diff --git a/composer.lock b/composer.lock index 2071690e14d..3a6ec3c3255 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": "e570e2140d73b90be176ab8f7b3cdc35", + "content-hash": "5c91af0db0e1f45a7cc813c2f6755cba", "packages": [ { "name": "aws/aws-crt-php", @@ -2071,22 +2071,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.4.4", + "version": "7.4.5", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8" + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e3ff079b22820c2029d4c2a87796b6a0b8716ad8", - "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "guzzlehttp/psr7": "^1.9 || ^2.4", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -2175,7 +2175,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.4" + "source": "https://github.com/guzzle/guzzle/tree/7.4.5" }, "funding": [ { @@ -2191,7 +2191,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T21:39:15+00:00" + "time": "2022-06-20T22:16:13+00:00" }, { "name": "guzzlehttp/promises", @@ -2279,16 +2279,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee" + "reference": "13388f00956b1503577598873fffb5ae994b5737" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/83260bb50b8fc753c72d14dc1621a2dac31877ee", - "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737", + "reference": "13388f00956b1503577598873fffb5ae994b5737", "shasum": "" }, "require": { @@ -2312,7 +2312,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -2374,7 +2374,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.3.0" + "source": "https://github.com/guzzle/psr7/tree/2.4.0" }, "funding": [ { @@ -2390,7 +2390,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T08:26:02+00:00" + "time": "2022-06-20T21:43:11+00:00" }, { "name": "laminas/laminas-code", From ce0e187843852110ed84878b8eb372b437273e2e Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 22 Jun 2022 08:44:11 +0200 Subject: [PATCH 2/2] SW-26736 - Update PHPUnit dependency --- UPGRADE-5.7.md | 2 +- composer.lock | 55 +++++++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 15211a7de0c..ad7834c7a4c 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -30,7 +30,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `laminas/laminas-escaper` to version 2.10.0 * Updated `monolog/monolog` to version 2.7.0 * Updated `mpdf/mpdf` to version 8.1.1 -* Updated `phpunit/phpunit` to version 9.5.20 +* Updated `phpunit/phpunit` to version 9.5.21 * Updated `symfony/browser-kit` to version 4.4.37 * Updated `symfony/config` to version 4.4.42 * Updated `symfony/console` to version 4.4.42 diff --git a/composer.lock b/composer.lock index 3a6ec3c3255..c6f68bd94e7 100644 --- a/composer.lock +++ b/composer.lock @@ -58,16 +58,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.225.1", + "version": "3.228.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "b795c9c14997dac771f66d1f6cbadb62c742373a" + "reference": "4ff51d01da43aa3bd36eef921a9cd4e0ff843fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b795c9c14997dac771f66d1f6cbadb62c742373a", - "reference": "b795c9c14997dac771f66d1f6cbadb62c742373a", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4ff51d01da43aa3bd36eef921a9cd4e0ff843fab", + "reference": "4ff51d01da43aa3bd36eef921a9cd4e0ff843fab", "shasum": "" }, "require": { @@ -75,9 +75,9 @@ "ext-json": "*", "ext-pcre": "*", "ext-simplexml": "*", - "guzzlehttp/guzzle": "^5.3.3 || ^6.2.1 || ^7.0", + "guzzlehttp/guzzle": "^6.5.7 || ^7.4.4", "guzzlehttp/promises": "^1.4.0", - "guzzlehttp/psr7": "^1.7.0 || ^2.1.1", + "guzzlehttp/psr7": "^1.8.5 || ^2.3", "mtdowling/jmespath.php": "^2.6", "php": ">=5.5" }, @@ -143,9 +143,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.225.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.228.0" }, - "time": "2022-06-09T18:19:43+00:00" + "time": "2022-06-21T18:13:25+00:00" }, { "name": "bcremer/line-reader", @@ -1847,16 +1847,16 @@ }, { "name": "google/auth", - "version": "v1.21.0", + "version": "v1.21.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "73392bad2eb6852eea9084b6bbdec752515cb849" + "reference": "aa3b9ca29258ac6347ce3c8937a2418c5d78f840" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/73392bad2eb6852eea9084b6bbdec752515cb849", - "reference": "73392bad2eb6852eea9084b6bbdec752515cb849", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/aa3b9ca29258ac6347ce3c8937a2418c5d78f840", + "reference": "aa3b9ca29258ac6347ce3c8937a2418c5d78f840", "shasum": "" }, "require": { @@ -1899,27 +1899,27 @@ "support": { "docs": "https://googleapis.github.io/google-auth-library-php/main/", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.21.0" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.21.1" }, - "time": "2022-04-13T20:35:52+00:00" + "time": "2022-05-16T19:34:15+00:00" }, { "name": "google/cloud-core", - "version": "v1.46.0", + "version": "v1.46.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "784a1d361c7dbc5de133feac590f549798c80f5e" + "reference": "ee8ad36aa59773669ca0cd5e1ffeccac7a78d083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/784a1d361c7dbc5de133feac590f549798c80f5e", - "reference": "784a1d361c7dbc5de133feac590f549798c80f5e", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/ee8ad36aa59773669ca0cd5e1ffeccac7a78d083", + "reference": "ee8ad36aa59773669ca0cd5e1ffeccac7a78d083", "shasum": "" }, "require": { "google/auth": "^1.18", - "guzzlehttp/guzzle": "^5.3|^6.5.6|^7.4.3", + "guzzlehttp/guzzle": "^5.3|^6.5.7|^7.4.4", "guzzlehttp/promises": "^1.3", "guzzlehttp/psr7": "^1.7|^2.0", "monolog/monolog": "^1.1|^2.0", @@ -1964,9 +1964,9 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.46.0" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.46.1" }, - "time": "2022-06-02T21:53:43+00:00" + "time": "2022-06-15T21:38:50+00:00" }, { "name": "google/cloud-storage", @@ -8936,16 +8936,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.20", + "version": "9.5.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba" + "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1", + "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1", "shasum": "" }, "require": { @@ -8979,7 +8979,6 @@ "sebastian/version": "^3.0.2" }, "require-dev": { - "ext-pdo": "*", "phpspec/prophecy-phpunit": "^2.0.1" }, "suggest": { @@ -9023,7 +9022,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21" }, "funding": [ { @@ -9035,7 +9034,7 @@ "type": "github" } ], - "time": "2022-04-01T12:37:26+00:00" + "time": "2022-06-19T12:14:25+00:00" }, { "name": "sebastian/cli-parser",