From da224acba2120b67af2dfae149e4a3387450f72d Mon Sep 17 00:00:00 2001 From: huangzhhui Date: Thu, 20 Jun 2019 01:10:45 +0800 Subject: [PATCH] Optimized --- src/http-server/composer.json | 2 +- src/rate-limit/composer.json | 4 ++++ src/rate-limit/src/Annotation/RateLimit.php | 1 - src/redis/composer.json | 10 ++++++---- src/rpc-client/composer.json | 5 ++++- src/rpc-server/composer.json | 2 +- src/rpc/composer.json | 3 ++- src/service-governance/composer.json | 7 ++++--- src/tracer/composer.json | 7 ++++++- src/utils/composer.json | 1 + 10 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/http-server/composer.json b/src/http-server/composer.json index 7699dca0b..46710fa88 100644 --- a/src/http-server/composer.json +++ b/src/http-server/composer.json @@ -31,7 +31,7 @@ "friendsofphp/php-cs-fixer": "^2.9" }, "suggest": { - "hyperf/di": "Require this component for annotation." + "hyperf/di": "Required to use annotations." }, "autoload": { "files": [ diff --git a/src/rate-limit/composer.json b/src/rate-limit/composer.json index 69672d33b..aa685f7d0 100644 --- a/src/rate-limit/composer.json +++ b/src/rate-limit/composer.json @@ -28,6 +28,10 @@ "hyperf/redis": "~1.0.0" }, "suggest": { + "hyperf/contract": "Required to use annotations.", + "hyperf/di": "Required to use annotations.", + "hyperf/http-server": "Required to use annotations.", + "hyperf/redis": "Required to use RedisStorage." }, "autoload": { "files": [ diff --git a/src/rate-limit/src/Annotation/RateLimit.php b/src/rate-limit/src/Annotation/RateLimit.php index 88b1ef8b7..aafd73e62 100644 --- a/src/rate-limit/src/Annotation/RateLimit.php +++ b/src/rate-limit/src/Annotation/RateLimit.php @@ -12,7 +12,6 @@ declare(strict_types=1); namespace Hyperf\RateLimit\Annotation; -use Doctrine\Common\Annotations\Annotation\Target; use Hyperf\Di\Annotation\AbstractAnnotation; /** diff --git a/src/redis/composer.json b/src/redis/composer.json index 98588010f..2bdfddea8 100644 --- a/src/redis/composer.json +++ b/src/redis/composer.json @@ -12,18 +12,20 @@ }, "require": { "php": ">=7.2", - "hyperf/database": "~1.0.0", - "hyperf/di": "~1.0.0", - "hyperf/event": "~1.0.0", - "hyperf/pool": "~1.0.0" + "psr/container": "^1.0", + "hyperf/contract": "~1.0.0", + "hyperf/pool": "~1.0.0", + "hyperf/utils": "~1.0.0" }, "require-dev": { + "hyperf/di": "~1.0.0", "malukenho/docheader": "^0.1.6", "mockery/mockery": "^1.0", "phpunit/phpunit": "^7.0.0", "friendsofphp/php-cs-fixer": "^2.9" }, "suggest": { + "hyperf/di": "Create the RedisPool via dependency injection." }, "autoload": { "files": [ diff --git a/src/rpc-client/composer.json b/src/rpc-client/composer.json index e10d6522f..76194637a 100644 --- a/src/rpc-client/composer.json +++ b/src/rpc-client/composer.json @@ -15,6 +15,8 @@ "require": { "php": ">=7.2", "psr/container": "^1.0", + "hyperf/rpc": "~1.0.0", + "hyperf/load-balancer": "~1.0.0", "hyperf/utils": "~1.0.0" }, "require-dev": { @@ -25,7 +27,8 @@ }, "suggest": { "hyperf/consul": "For fetch the nodes info from consul.", - "hyperf/di": "For better container experience." + "hyperf/di": "For better container experience.", + "hyperf/pool": "Required to use connection pool." }, "autoload": { "files": [ diff --git a/src/rpc-server/composer.json b/src/rpc-server/composer.json index 2ee6768e2..81fb2471a 100644 --- a/src/rpc-server/composer.json +++ b/src/rpc-server/composer.json @@ -23,7 +23,7 @@ "friendsofphp/php-cs-fixer": "^2.9" }, "suggest": { - "hyperf/di": "Require this component for annotation." + "hyperf/di": "Required to use annotations." }, "autoload": { "files": [ diff --git a/src/rpc/composer.json b/src/rpc/composer.json index a20a7246e..1106f66c5 100644 --- a/src/rpc/composer.json +++ b/src/rpc/composer.json @@ -12,7 +12,8 @@ }, "require": { "php": ">=7.2", - "hyperf/contract": "~1.0.0" + "hyperf/contract": "~1.0.0", + "hyperf/utils": "~1.0.0" }, "require-dev": { "malukenho/docheader": "^0.1.6", diff --git a/src/service-governance/composer.json b/src/service-governance/composer.json index 384ba4b2e..02614c80a 100644 --- a/src/service-governance/composer.json +++ b/src/service-governance/composer.json @@ -13,17 +13,18 @@ "require": { "php": ">=7.2", "hyperf/consul": "~1.0.0", - "hyperf/contract": "~1.0.0", - "hyperf/event": "~1.0.0", - "hyperf/guzzle": "~1.0.0" + "hyperf/contract": "~1.0.0" }, "require-dev": { + "hyperf/event": "~1.0.0", "malukenho/docheader": "^0.1.6", "mockery/mockery": "^1.0", "phpunit/phpunit": "^7.0.0", "friendsofphp/php-cs-fixer": "^2.9" }, "suggest": { + "hyperf/event": "Required to use RegisterServiceListener.", + "hyperf/framework": "Required to use RegisterServiceListener." }, "autoload": { "files": [ diff --git a/src/tracer/composer.json b/src/tracer/composer.json index b7dd15980..881464cc3 100644 --- a/src/tracer/composer.json +++ b/src/tracer/composer.json @@ -12,17 +12,22 @@ }, "require": { "php": ">=7.2", + "psr/http-message": "^1.0", + "hyperf/contract": "~1.0.0", "hyperf/di": "~1.0.0", - "hyperf/event": "~1.0.0", + "hyperf/guzzle": "~1.0.0", + "hyperf/utils": "~1.0.0", "openzipkin/zipkin": "^1.3.2" }, "require-dev": { + "hyperf/event": "~1.0.0", "malukenho/docheader": "^0.1.6", "mockery/mockery": "^1.0", "phpunit/phpunit": "^7.0.0", "friendsofphp/php-cs-fixer": "^2.9" }, "suggest": { + "hyperf/event": "Required to use DbQueryExecutedListener." }, "autoload": { "files": [ diff --git a/src/utils/composer.json b/src/utils/composer.json index aeea2c530..372b6f27d 100644 --- a/src/utils/composer.json +++ b/src/utils/composer.json @@ -16,6 +16,7 @@ "hyperf/contract": "~1.0.0" }, "require-dev": { + "symfony/var-dumper": "^4.1", "malukenho/docheader": "^0.1.6", "mockery/mockery": "^1.0", "phpunit/phpunit": "^7.0.0",