Merge branch 'master' into 3.1-merge

# Conflicts: # src/grpc-client/composer.json
hyperf · Jul 13, 2023 · 3898469 · 3898469
2 parents 6d30f8b + a14f75c
commit 3898469
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -18,11 +18,17 @@
     },
     "require": {
         "php": ">=8.1",
+        "hyperf/contract": "~3.1.0",
         "hyperf/code-parser": "~3.1.0",
+        "hyperf/context": "~3.1.0",
         "hyperf/coroutine": "~3.1.0",
+        "hyperf/event": "~3.1.0",
         "hyperf/grpc": "~3.1.0",
         "jean85/pretty-package-versions": "^1.2|^2.0"
     },
+    "suggest": {
+        "hyperf/load-balancer": "Use LoadBalancer for GrpcTransporter.(~3.0.0)"
+    },
     "autoload": {
         "psr-4": {
             "Hyperf\\GrpcClient\\": "src/"