diff --git a/composer.json b/composer.json index 5f18d77c827..999b2cab67d 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,8 @@ "automattic/jetpack-autoloader": "2.11.18", "automattic/jetpack-identity-crisis": "0.8.43", "automattic/jetpack-sync": "1.47.7", - "woocommerce/subscriptions-core": "6.3.0" + "woocommerce/subscriptions-core": "6.3.0", + "psr/container": "^1.1" }, "require-dev": { "composer/installers": "1.10.0", diff --git a/composer.lock b/composer.lock index 4733ecf1614..67b78b093c5 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": "8129af4ef3d43b59f758a73688c5b91e", + "content-hash": "f45536a544c784b5c85d2e507cb43d42", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -938,6 +938,54 @@ ], "time": "2021-01-14T11:07:16+00:00" }, + { + "name": "psr/container", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.1" + }, + "time": "2021-03-05T17:36:06+00:00" + }, { "name": "woocommerce/subscriptions-core", "version": "6.3.0", @@ -3461,54 +3509,6 @@ ], "time": "2022-02-18T12:54:07+00:00" }, - { - "name": "psr/container", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" - }, - "time": "2021-03-05T17:36:06+00:00" - }, { "name": "psr/log", "version": "1.1.4", diff --git a/lib/composer.json b/lib/composer.json index 823f8f1c240..5021123f4b9 100644 --- a/lib/composer.json +++ b/lib/composer.json @@ -4,8 +4,7 @@ "minimum-stability": "dev", "require-dev": { "league/container": "4.2", - "coenjacobs/mozart": "0.7.1", - "psr/container": "^1.1" + "coenjacobs/mozart": "0.7.1" }, "license": "GPL-3.0-or-later", "scripts": { @@ -21,7 +20,9 @@ "dep_namespace": "WCPay\\Vendor\\", "dep_directory": "/packages/", "packages": [ - "league/container", + "league/container" + ], + "excluded_packages":[ "psr/container" ], "classmap_directory": "/classmaps/", diff --git a/lib/composer.lock b/lib/composer.lock index f2f4bb4b335..f530136d9cc 100644 --- a/lib/composer.lock +++ b/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": "3aba07fadc9c18f4990a3cc73152afa8", + "content-hash": "5f729373382094e28edcbed07d0c9f67", "packages": [], "packages-dev": [ { @@ -243,26 +243,26 @@ }, { "name": "league/mime-type-detection", - "version": "1.14.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", - "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", "shasum": "" }, "require": { "ext-fileinfo": "*", - "php": "^7.4 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "phpstan/phpstan": "^0.12.68", - "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0" + "phpunit/phpunit": "^8.5.8 || ^9.3" }, "type": "library", "autoload": { @@ -283,7 +283,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" }, "funding": [ { @@ -295,26 +295,32 @@ "type": "tidelift" } ], - "time": "2023-10-17T14:13:20+00:00" + "time": "2022-04-17T13:12:02+00:00" }, { "name": "psr/container", - "version": "1.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "reference": "90db7b9ac2a2c5b849fcb69dde58f3ae182c68f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/php-fig/container/zipball/90db7b9ac2a2c5b849fcb69dde58f3ae182c68f5", + "reference": "90db7b9ac2a2c5b849fcb69dde58f3ae182c68f5", "shasum": "" }, "require": { "php": ">=7.4.0" }, + "default-branch": true, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -341,9 +347,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/master" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2022-07-19T17:36:59+00:00" }, { "name": "symfony/console", @@ -351,12 +357,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "f4f71842f24c2023b91237c72a365306f3c58827" + "reference": "b504a3d266ad2bb632f196c0936ef2af5ff6e273" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/f4f71842f24c2023b91237c72a365306f3c58827", - "reference": "f4f71842f24c2023b91237c72a365306f3c58827", + "url": "https://api.github.com/repos/symfony/console/zipball/b504a3d266ad2bb632f196c0936ef2af5ff6e273", + "reference": "b504a3d266ad2bb632f196c0936ef2af5ff6e273", "shasum": "" }, "require": { @@ -442,7 +448,7 @@ "type": "tidelift" } ], - "time": "2023-08-07T06:12:30+00:00" + "time": "2023-07-19T20:11:33+00:00" }, { "name": "symfony/deprecation-contracts", @@ -576,7 +582,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "1.x-dev", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -639,7 +645,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/main" }, "funding": [ { @@ -659,7 +665,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "1.x-dev", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -721,7 +727,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/main" }, "funding": [ { @@ -741,7 +747,7 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "1.x-dev", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -806,7 +812,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/main" }, "funding": [ { @@ -826,7 +832,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "1.x-dev", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -890,7 +896,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/main" }, "funding": [ { @@ -910,7 +916,7 @@ }, { "name": "symfony/polyfill-php73", - "version": "1.x-dev", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -970,7 +976,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php73/tree/main" }, "funding": [ { @@ -990,7 +996,7 @@ }, { "name": "symfony/polyfill-php80", - "version": "1.x-dev", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", @@ -1054,7 +1060,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php80/tree/main" }, "funding": [ { @@ -1074,22 +1080,21 @@ }, { "name": "symfony/service-contracts", - "version": "2.5.x-dev", + "version": "3.0.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3" + "reference": "24ce74899f476f56d7e6c148c809afef0b7de19c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a2329596ddc8fd568900e3fc76cba42489ecc7f3", - "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24ce74899f476f56d7e6c148c809afef0b7de19c", + "reference": "24ce74899f476f56d7e6c148c809afef0b7de19c", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1|^3" + "php": ">=8.0.2", + "psr/container": "^2.0" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -1100,7 +1105,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -1137,7 +1142,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/2.5" + "source": "https://github.com/symfony/service-contracts/tree/3.0" }, "funding": [ { @@ -1153,7 +1158,7 @@ "type": "tidelift" } ], - "time": "2023-04-21T15:04:16+00:00" + "time": "2023-01-01T08:36:10+00:00" }, { "name": "symfony/string", diff --git a/lib/packages/League/Container/Argument/ArgumentResolverTrait.php b/lib/packages/League/Container/Argument/ArgumentResolverTrait.php index e47705daac4..74ce1829b60 100644 --- a/lib/packages/League/Container/Argument/ArgumentResolverTrait.php +++ b/lib/packages/League/Container/Argument/ArgumentResolverTrait.php @@ -7,7 +7,7 @@ use WCPay\Vendor\League\Container\DefinitionContainerInterface; use WCPay\Vendor\League\Container\Exception\{ContainerException, NotFoundException}; use WCPay\Vendor\League\Container\ReflectionContainer; -use WCPay\Vendor\Psr\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use ReflectionFunctionAbstract; use ReflectionNamedType; diff --git a/lib/packages/League/Container/Container.php b/lib/packages/League/Container/Container.php index 7c166e74550..7492f25dadf 100644 --- a/lib/packages/League/Container/Container.php +++ b/lib/packages/League/Container/Container.php @@ -10,7 +10,7 @@ use WCPay\Vendor\League\Container\ServiceProvider\{ServiceProviderAggregate, ServiceProviderAggregateInterface, ServiceProviderInterface}; -use WCPay\Vendor\Psr\Container\ContainerInterface; +use Psr\Container\ContainerInterface; class Container implements DefinitionContainerInterface { diff --git a/lib/packages/League/Container/Definition/Definition.php b/lib/packages/League/Container/Definition/Definition.php index 2f27dfe4ef4..c414eb662ec 100644 --- a/lib/packages/League/Container/Definition/Definition.php +++ b/lib/packages/League/Container/Definition/Definition.php @@ -12,7 +12,7 @@ }; use WCPay\Vendor\League\Container\ContainerAwareTrait; use WCPay\Vendor\League\Container\Exception\ContainerException; -use WCPay\Vendor\Psr\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use ReflectionClass; class Definition implements ArgumentResolverInterface, DefinitionInterface diff --git a/lib/packages/League/Container/DefinitionContainerInterface.php b/lib/packages/League/Container/DefinitionContainerInterface.php index 35dfd8c9b9c..bbbc9d6302c 100644 --- a/lib/packages/League/Container/DefinitionContainerInterface.php +++ b/lib/packages/League/Container/DefinitionContainerInterface.php @@ -7,7 +7,7 @@ use WCPay\Vendor\League\Container\Definition\DefinitionInterface; use WCPay\Vendor\League\Container\Inflector\InflectorInterface; use WCPay\Vendor\League\Container\ServiceProvider\ServiceProviderInterface; -use WCPay\Vendor\Psr\Container\ContainerInterface; +use Psr\Container\ContainerInterface; interface DefinitionContainerInterface extends ContainerInterface { diff --git a/lib/packages/League/Container/Exception/ContainerException.php b/lib/packages/League/Container/Exception/ContainerException.php index bf708cfb9c0..3fafac188e8 100644 --- a/lib/packages/League/Container/Exception/ContainerException.php +++ b/lib/packages/League/Container/Exception/ContainerException.php @@ -4,7 +4,7 @@ namespace WCPay\Vendor\League\Container\Exception; -use WCPay\Vendor\Psr\Container\ContainerExceptionInterface; +use Psr\Container\ContainerExceptionInterface; use RuntimeException; class ContainerException extends RuntimeException implements ContainerExceptionInterface diff --git a/lib/packages/League/Container/Exception/NotFoundException.php b/lib/packages/League/Container/Exception/NotFoundException.php index bcb9ab16835..0fa330e14ab 100644 --- a/lib/packages/League/Container/Exception/NotFoundException.php +++ b/lib/packages/League/Container/Exception/NotFoundException.php @@ -4,7 +4,7 @@ namespace WCPay\Vendor\League\Container\Exception; -use WCPay\Vendor\Psr\Container\NotFoundExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; use InvalidArgumentException; class NotFoundException extends InvalidArgumentException implements NotFoundExceptionInterface diff --git a/lib/packages/League/Container/ReflectionContainer.php b/lib/packages/League/Container/ReflectionContainer.php index cbd0e4e6b3b..86cf38306ad 100644 --- a/lib/packages/League/Container/ReflectionContainer.php +++ b/lib/packages/League/Container/ReflectionContainer.php @@ -7,7 +7,7 @@ use WCPay\Vendor\League\Container\Argument\{ArgumentResolverInterface, ArgumentResolverTrait}; use WCPay\Vendor\League\Container\Exception\ContainerException; use WCPay\Vendor\League\Container\Exception\NotFoundException; -use WCPay\Vendor\Psr\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use ReflectionClass; use ReflectionFunction; use ReflectionMethod; diff --git a/lib/packages/Psr/Container/ContainerExceptionInterface.php b/lib/packages/Psr/Container/ContainerExceptionInterface.php deleted file mode 100644 index c5e801c584f..00000000000 --- a/lib/packages/Psr/Container/ContainerExceptionInterface.php +++ /dev/null @@ -1,12 +0,0 @@ -get( $id );