Upgraded psr/container to ^1.0|^2.0 (#3337)

* Support psr/container ^2.0

* Update composer.json

* Update CHANGELOG-2.2.md
This commit is contained in:
李铭昕 2021-05-11 13:27:43 +08:00 committed by GitHub
parent 3b097dc70a
commit 62f7c49352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 44 additions and 44 deletions

View File

@ -3,3 +3,4 @@
## Dependencies Upgrade
- Upgraded `friendsofphp/php-cs-fixer` to `^3.0`;
- Upgraded `psr/container` to `^1.0|^2.0`;

View File

@ -21,7 +21,7 @@
"ext-json": "*",
"ext-redis": "*",
"ext-swoole": ">=4.5",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0",
"psr/http-message": "^1.0",
"psr/http-server-middleware": "^1.0",
@ -66,7 +66,6 @@
"overtrue/flysystem-cos": "^2.0|^3.0",
"overtrue/flysystem-qiniu": "^1.0",
"php-amqplib/php-amqplib": "^2.9.2",
"php-di/php-di": "^6.0",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^9.4",

View File

@ -22,7 +22,7 @@
"hyperf/process": "~2.1.0",
"hyperf/pool": "~2.1.0",
"php-amqplib/php-amqplib": "^2.9.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0",
"psr/log": "^1.0"
},

View File

@ -16,7 +16,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0",
"hyperf/contract": "~2.1.0",
"hyperf/command": "~2.1.0",

View File

@ -16,7 +16,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/simple-cache": "^1.0",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0"

View File

@ -16,7 +16,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"hyperf/utils": "~2.1.0"
},
"require-dev": {

View File

@ -20,7 +20,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"hyperf/contract": "~2.1.0",
"hyperf/guzzle": "~2.1.0"
},

View File

@ -19,7 +19,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0"
},

View File

@ -19,7 +19,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"hyperf/contract": "~2.1.0"
},
"require-dev": {

View File

@ -20,7 +20,7 @@
"php": ">=7.2",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"symfony/finder": "^5.0"
},
"require-dev": {

View File

@ -18,7 +18,7 @@
"php": ">=7.2",
"hyperf/utils": "~2.1.0",
"nesbot/carbon": "^2.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0"
},
"require-dev": {

View File

@ -23,7 +23,7 @@
"hyperf/contract": "~2.1.0",
"hyperf/pool": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0"
"psr/container": "^1.0|^2.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14",

View File

@ -21,7 +21,7 @@
"doctrine/annotations": "^1.6",
"doctrine/instantiator": "^1.0",
"nikic/php-parser": "^4.1",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"roave/better-reflection": "^4.0",
"symfony/finder": "^5.0",
"vlucas/phpdotenv": "^5.0"

View File

@ -19,7 +19,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/http-server-middleware": "^1.0",
"psr/http-message": "^1.0",
"hyperf/contract": "~2.1.0"

View File

@ -19,7 +19,7 @@
"hyperf/contract": "~2.1.0",
"hyperf/dispatcher": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/http-message": "^1.0"
},
"autoload": {

View File

@ -22,7 +22,7 @@
"fig/http-message-util": "^1.1.2",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0",
"psr/log": "^1.0"
},

View File

@ -13,7 +13,7 @@
"php": ">=7.0",
"guzzlehttp/guzzle": "^6.3|^7.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/http-message": "^1.0"
},
"require-dev": {

View File

@ -18,7 +18,7 @@
"psr/container": "Required to replace RequestParserInterface."
},
"require-dev": {
"psr/container": "^1.0"
"psr/container": "^1.0|^2.0"
},
"autoload": {
"psr-4": {

View File

@ -26,7 +26,7 @@
"hyperf/server": "~2.1.0",
"hyperf/utils": "~2.1.0",
"nikic/fast-route": "^1.3",
"psr/container": "^1.0"
"psr/container": "^1.0|^2.0"
},
"require-dev": {
"hyperf/di": "~2.1.0",

View File

@ -17,7 +17,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/log": "^1.0",
"hyperf/contract": "~2.1.0",
"hyperf/load-balancer": "~2.1.0",

View File

@ -20,7 +20,7 @@
"hyperf/process": "~2.1.0",
"hyperf/utils": "~2.1.0",
"longlang/phpkafka": "^1.1",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/log": "^1.0"
},
"autoload": {

View File

@ -17,7 +17,7 @@
"require": {
"php": ">=7.2",
"psr/log": "^1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0",
"monolog/monolog": "^2.0"

View File

@ -16,7 +16,7 @@
"hyperf/contract": "~2.1.0",
"hyperf/guzzle": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0",
"psr/http-message": "^1.0"
},

View File

@ -17,7 +17,7 @@
"require": {
"php": ">=7.2",
"psr/simple-cache": "^1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"hyperf/contract": "~2.1.0",
"hyperf/db-connection": "~2.1.0",
"hyperf/utils": "~2.1.0"

View File

@ -22,7 +22,7 @@
"hyperf/di": "~2.1.0",
"hyperf/event": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/log": "^1.0"
},
"require-dev": {

View File

@ -21,7 +21,7 @@
"hyperf/pool": "~2.1.0",
"hyperf/utils": "~2.1.0",
"ircmaxell/random-lib": "^1.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0"
},
"require-dev": {

View File

@ -31,7 +31,7 @@
"hyperf/command": "~2.1.0",
"hyperf/contract": "~2.1.0",
"nikic/php-parser": "^4.1",
"psr/container": "^1.0"
"psr/container": "^1.0|^2.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14",

View File

@ -17,7 +17,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0"
},

View File

@ -16,7 +16,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0"

View File

@ -17,7 +17,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/simple-cache": "^1.0",
"hyperf/utils": "~2.1.0",
"bandwidth-throttle/token-bucket": "^2.0"

View File

@ -21,7 +21,7 @@
"hyperf/contract": "~2.1.0",
"hyperf/pool": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0"
"psr/container": "^1.0|^2.0"
},
"require-dev": {
"hyperf/di": "~2.1.0",

View File

@ -21,7 +21,7 @@
"hyperf/http-message": "~2.1.0",
"hyperf/paginator": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0"
"psr/container": "^1.0|^2.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.16",

View File

@ -16,7 +16,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"hyperf/utils": "~2.1.0"
},
"require-dev": {

View File

@ -19,7 +19,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"hyperf/rpc": "~2.1.0",
"hyperf/load-balancer": "~2.1.0",
"hyperf/utils": "~2.1.0",

View File

@ -17,7 +17,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/log": "^1.0",
"psr/event-dispatcher": "^1.0",
"symfony/console": "^5.0",

View File

@ -17,7 +17,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0"
},

View File

@ -19,7 +19,7 @@
"php": ">=7.2",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/http-server-middleware": "^1.0",
"psr/log": "^1.0"
},

View File

@ -20,7 +20,7 @@
"hyperf/contract": "~2.1.0",
"hyperf/framework": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0",
"psr/log": "^1.0",
"symfony/property-access": "^5.0",

View File

@ -20,7 +20,7 @@
},
"require": {
"php": ">=7.2",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"phpunit/phpunit": "^9.4",
"hyperf/contract": "~2.1.0",
"hyperf/http-message": "~2.1.0",

View File

@ -24,7 +24,7 @@
"php": ">=7.2",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0"
"psr/container": "^1.0|^2.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14",

View File

@ -28,7 +28,7 @@
"hyperf/utils": "~2.1.0",
"hyperf/translation": "~2.1.0",
"nesbot/carbon": "^2.21",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0",
"psr/http-message": "^1.0"
},

View File

@ -19,7 +19,7 @@
"php": ">=7.2",
"hyperf/contract": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/log": "^1.0"
},
"require-dev": {

View File

@ -20,7 +20,7 @@
"hyperf/contract": "~2.1.0",
"hyperf/http-message": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/log": "^1.0"
},
"require-dev": {

View File

@ -21,7 +21,7 @@
"hyperf/exception-handler": "~2.1.0",
"hyperf/http-server": "~2.1.0",
"hyperf/utils": "~2.1.0",
"psr/container": "^1.0",
"psr/container": "^1.0|^2.0",
"psr/event-dispatcher": "^1.0",
"psr/log": "^1.0"
},