From e368dc08264e04f9e7e7e8b1c3a363c3ea6a96eb Mon Sep 17 00:00:00 2001 From: Jeremy Pry Date: Fri, 8 Sep 2023 18:05:38 -0400 Subject: [PATCH 1/3] Update lib/composer.json to PHP 7.4 --- plugins/woocommerce/lib/composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/woocommerce/lib/composer.json b/plugins/woocommerce/lib/composer.json index 0fda68e1664..71400a68e4e 100644 --- a/plugins/woocommerce/lib/composer.json +++ b/plugins/woocommerce/lib/composer.json @@ -4,7 +4,7 @@ "prefer-stable": true, "minimum-stability": "dev", "require": { - "php": ">=7.2" + "php": ">=7.4" }, "require-dev": { "league/container": "3.3.5", @@ -12,7 +12,7 @@ }, "config": { "platform": { - "php": "7.2" + "php": "7.4" } }, "scripts": { From da2d9755e90052a53f802442a936f5d1de9e6b27 Mon Sep 17 00:00:00 2001 From: Jeremy Pry Date: Fri, 8 Sep 2023 18:05:47 -0400 Subject: [PATCH 2/3] Run composer update --- plugins/woocommerce/lib/composer.lock | 22 +++++++++---------- .../Container/ContainerExceptionInterface.php | 4 +++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/plugins/woocommerce/lib/composer.lock b/plugins/woocommerce/lib/composer.lock index 348867f645b..5322b618a79 100644 --- a/plugins/woocommerce/lib/composer.lock +++ b/plugins/woocommerce/lib/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": "ee5352d3dc7eff84b896ab4900209e53", + "content-hash": "08afc0d13426146cf441a311818703f5", "packages": [], "packages-dev": [ { @@ -88,20 +88,20 @@ }, { "name": "psr/container", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.4.0" }, "type": "library", "autoload": { @@ -130,9 +130,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2021-11-05T16:50:12+00:00" } ], "aliases": [], @@ -141,11 +141,11 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=7.2" + "php": ">=7.4" }, "platform-dev": [], "platform-overrides": { - "php": "7.2" + "php": "7.4" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.6.0" } diff --git a/plugins/woocommerce/lib/packages/Psr/Container/ContainerExceptionInterface.php b/plugins/woocommerce/lib/packages/Psr/Container/ContainerExceptionInterface.php index dfadc2354db..b7ee1f49a69 100644 --- a/plugins/woocommerce/lib/packages/Psr/Container/ContainerExceptionInterface.php +++ b/plugins/woocommerce/lib/packages/Psr/Container/ContainerExceptionInterface.php @@ -2,9 +2,11 @@ namespace Automattic\WooCommerce\Vendor\Psr\Container; +use Throwable; + /** * Base interface representing a generic exception in a container. */ -interface ContainerExceptionInterface +interface ContainerExceptionInterface extends Throwable { } From 84c9e7551c9ed0b67e19412890c00e9b6e8c3809 Mon Sep 17 00:00:00 2001 From: Jeremy Pry Date: Fri, 8 Sep 2023 18:48:53 -0400 Subject: [PATCH 3/3] Add changelog file --- plugins/woocommerce/changelog/bug-php-7.4-lib | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 plugins/woocommerce/changelog/bug-php-7.4-lib diff --git a/plugins/woocommerce/changelog/bug-php-7.4-lib b/plugins/woocommerce/changelog/bug-php-7.4-lib new file mode 100644 index 00000000000..5fc4f8fdfc0 --- /dev/null +++ b/plugins/woocommerce/changelog/bug-php-7.4-lib @@ -0,0 +1,5 @@ +Significance: patch +Type: dev +Comment: Bump PHP version where it was missed in #39820. + +