diff --git a/script/Command/GenVersion.php b/script/Command/GenVersion.php index f19a4b800..914af934b 100644 --- a/script/Command/GenVersion.php +++ b/script/Command/GenVersion.php @@ -74,7 +74,7 @@ public function __invoke(App $app): void } if ($this->updated > 0 && $app->getBoolOpt('c')) { - self::gitCommit('update: update the version to composer.json'); + self::gitCommit("update: add {$this->version} for all component composer.json"); } echo Color::render("Complete\n", 'cyan'); diff --git a/src/bean/src/Container.php b/src/bean/src/Container.php index ccb67d63c..4464b3462 100644 --- a/src/bean/src/Container.php +++ b/src/bean/src/Container.php @@ -1048,13 +1048,14 @@ private function newProperty( $propertyValue = $this->newPropertyArray($propertyValue, $id); } + // Refer config or bean if ($propertyInject->isRef()) { $propertyValue = $this->getRefValue($propertyValue, $id); - } - // Optimize: Value not exists, skip call setter - if ($propertyValue === null) { - continue; + // Optimize: Value not exists, skip call setter + if ($propertyValue === null) { + continue; + } } // Parser property type diff --git a/src/websocket-server/src/Message/Response.php b/src/websocket-server/src/Message/Response.php index f2780962b..ed116b780 100644 --- a/src/websocket-server/src/Message/Response.php +++ b/src/websocket-server/src/Message/Response.php @@ -183,6 +183,11 @@ public function send(Connection $conn = null): int return 0; } + // Fix: No response data + if ($this->content === '' && $this->data === null) { + return 0; + } + /** @noinspection CallableParameterUseCaseInTypeContextInspection */ $conn = $conn ?: Session::mustGet(); $server = $conn->getServer();