Skip to content

Commit 06efbdf

Browse files
committed
Merge branch 'master' into 3.2-merge
# Conflicts: # src/amqp/composer.json # src/async-queue/composer.json # src/cache/composer.json # src/circuit-breaker/composer.json # src/config-apollo/composer.json # src/config-center/composer.json # src/config-etcd/composer.json # src/config-nacos/composer.json # src/config/composer.json # src/constants/composer.json # src/consul/composer.json # src/crontab/composer.json # src/dag/composer.json # src/database-pgsql/composer.json # src/database-sqlite/composer.json # src/database/composer.json # src/db-connection/composer.json # src/db/composer.json # src/devtool/composer.json # src/di/composer.json # src/elasticsearch/composer.json # src/etcd/composer.json # src/exception-handler/composer.json # src/filesystem/composer.json # src/grpc-client/composer.json # src/grpc-server/composer.json # src/http-message/composer.json # src/http-server/composer.json # src/http2-client/composer.json # src/json-rpc/composer.json # src/kafka/composer.json # src/logger/composer.json # src/metric/composer.json # src/migration-generator/composer.json # src/model-cache/composer.json # src/model-listener/composer.json # src/nacos/composer.json # src/nats/composer.json # src/nsq/composer.json # src/paginator/composer.json # src/pool/composer.json # src/process/composer.json # src/rate-limit/composer.json # src/reactive-x/composer.json # src/redis/composer.json # src/resource-grpc/composer.json # src/resource/composer.json # src/retry/composer.json # src/rpc-client/composer.json # src/rpc-multiplex/composer.json # src/rpc-server/composer.json # src/rpc/composer.json # src/scout/composer.json # src/server/composer.json # src/service-governance-consul/composer.json # src/service-governance-nacos/composer.json # src/session/composer.json # src/signal/composer.json # src/snowflake/composer.json # src/socket/composer.json # src/socketio-server/composer.json # src/stringable/composer.json # src/super-globals/composer.json # src/support/composer.json # src/swagger/composer.json # src/task/composer.json # src/testing/composer.json # src/tracer/composer.json # src/translation/composer.json # src/utils/composer.json # src/validation/composer.json # src/view-engine/composer.json # src/view/composer.json # src/watcher/composer.json # src/websocket-client/composer.json # src/websocket-server/composer.json
2 parents 164c865 + cb10353 commit 06efbdf

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
"require": {
1919
"php": ">=8.2",
2020
"hyperf/collection": "~3.2.0",
21+
"hyperf/context": "~3.2.0",
2122
"hyperf/contract": "~3.2.0",
23+
"hyperf/coordinator": "~3.2.0",
24+
"hyperf/engine": "^2.0",
2225
"hyperf/exception-handler": "~3.2.0",
2326
"hyperf/http-server": "~3.2.0",
2427
"hyperf/support": "~3.2.0",
25-
"hyperf/utils": "~3.2.0",
2628
"psr/container": "^1.0 || ^2.0",
2729
"psr/event-dispatcher": "^1.0"
2830
},

0 commit comments

Comments
 (0)