Skip to content

Commit d886ed6

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 77a4468 + 0d0d725 commit d886ed6

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

composer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@
1313
"ext-posix": "*",
1414
"hyperf/codec": "~3.2.0",
1515
"hyperf/command": "~3.2.0",
16+
"hyperf/contract": "~3.2.0",
17+
"hyperf/coordinator": "~3.2.0",
18+
"hyperf/coroutine": "~3.2.0",
1619
"hyperf/di": "~3.2.0",
20+
"hyperf/engine": "^2.0",
1721
"hyperf/framework": "~3.2.0",
22+
"hyperf/stringable": "~3.2.0",
1823
"hyperf/support": "~3.2.0"
1924
},
2025
"autoload": {

src/Option.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ public function getDriver(): string
6060

6161
public function getBin(): string
6262
{
63+
if (str_contains($this->bin, ' ')) {
64+
// If the binary path contains spaces, we need to wrap it in quotes.
65+
return '"' . $this->bin . '"';
66+
}
67+
6368
return $this->bin;
6469
}
6570

0 commit comments

Comments
 (0)