fix: add SIGHUP/SIGTERM handling, modernize PHP support and CI

Signal handling fixes:
- SignalListener: add SIGHUP/SIGTERM handling for both Swoole
  and Workerman drivers in master and worker processes
- Prevent 100% CPU when IDE terminal is closed by ensuring
  graceful shutdown on terminal hangup

PHP version support:
- Widen PHP constraint to 8.3, 8.4, 8.5
- Bump doctrine/dbal from ^2.13.1 to ^4.4
- Bump php-cs-fixer to ^3.64, phpstan to ^1.12
- Bump swoole/ide-helper to ^5.0
- Drop phpunit ^8.5 (EOL), keep ^9.0

CI updates:
- actions/checkout@v3 → @v4 (Node.js 20 deprecated)
- Bump static analysis/code style PHP from 8.1 to 8.3
This commit is contained in:
crazywhalecc
2026-06-17 15:11:57 +08:00
parent a249fb5bfb
commit 3a57294e48
16 changed files with 45 additions and 41 deletions

View File

@@ -41,7 +41,7 @@ class CommandArgument extends AnnotationBase implements ErgodicAnnotation
string $type = 'string',
public bool $required = false,
public string $prompt = '',
public null|array|\Closure|float|int|string $default = '',
public array|\Closure|float|int|string|null $default = '',
public int $timeout = 60,
public int $error_prompt_policy = 1
) {

View File

@@ -87,7 +87,7 @@ class BotContext implements ContextInterface
* @noinspection PhpDocMissingThrowsInspection
* @noinspection PhpUnhandledExceptionInspection
*/
public function prompt(array|MessageSegment|string|\Stringable $prompt = '', int $timeout = 600, array|MessageSegment|string|\Stringable $timeout_prompt = '', int $option = ZM_PROMPT_NONE): null|array|OneBotEvent|string
public function prompt(array|MessageSegment|string|\Stringable $prompt = '', int $timeout = 600, array|MessageSegment|string|\Stringable $timeout_prompt = '', int $option = ZM_PROMPT_NONE): array|OneBotEvent|string|null
{
if (!container()->has('bot.event')) {
throw new OneBot12Exception('bot()->prompt() can only be used in message event');
@@ -268,7 +268,7 @@ class BotContext implements ContextInterface
* @return null|array|OneBotEvent|string 根据不同匹配类型返回不同的东西
* @throws OneBot12Exception
*/
private function applyPromptReturn(mixed $result, int $option): null|array|OneBotEvent|string
private function applyPromptReturn(mixed $result, int $option): array|OneBotEvent|string|null
{
// 必须是 OneBotEvent 且是消息类型
if (!$result instanceof OneBotEvent || $result->type !== 'message') {

View File

@@ -30,10 +30,13 @@ class SignalListener
switch (Framework::getInstance()->getDriver()->getName()) {
case 'swoole':
Process::signal(SIGINT, [$this, 'onWorkerInt']);
Process::signal(SIGTERM, [$this, 'onWorkerInt']);
Process::signal(SIGHUP, [$this, 'onWorkerInt']);
break;
case 'workerman':
Worker::$globalEvent->add(SIGINT, EventInterface::EV_SIGNAL, [$this, 'onWorkerInt']);
Worker::$globalEvent->add(SIGTERM, EventInterface::EV_SIGNAL, fn () => Worker::stopAll(15));
Worker::$globalEvent->add(SIGHUP, EventInterface::EV_SIGNAL, fn () => Worker::stopAll(15));
if (function_exists('pcntl_signal')) {
pcntl_signal(SIGUSR1, SIG_IGN, false);
}
@@ -51,10 +54,9 @@ class SignalListener
{
$driver = Framework::getInstance()->getDriver()->getName();
if ($driver === 'swoole') {
Process::signal(SIGINT, function () {
$stopHandler = function () {
echo "\r";
logger()->notice('Master 进程收到中断信号 SIGINT');
logger()->notice('正在停止服务器');
logger()->notice('Master 进程收到中断信号,正在停止服务器');
Framework::getInstance()->stop();
if (extension_loaded('posix')) {
Process::kill(posix_getpid(), SIGTERM);
@@ -62,10 +64,13 @@ class SignalListener
/* @phpstan-ignore-next-line */
Process::kill(Framework::getInstance()->getDriver()->getSwooleServer()->master_pid, SIGTERM);
}
});
};
Process::signal(SIGINT, $stopHandler);
Process::signal(SIGTERM, $stopHandler);
Process::signal(SIGHUP, $stopHandler);
} elseif ($driver === 'workerman') {
if (!extension_loaded('pcntl') || !extension_loaded('posix')) {
logger()->error('请安装 pcntl 和 posix 扩展以支持 SIGINT 监听');
logger()->error('请安装 pcntl 和 posix 扩展以支持信号监听');
return;
}
@@ -73,15 +78,14 @@ class SignalListener
logger()->warning('重启ing');
Worker::reloadSelf();
}, false);
pcntl_signal(SIGTERM, function () {
Worker::stopAll();
}, false);
pcntl_signal(SIGINT, function () {
$stopMaster = function () {
echo "\r";
logger()->notice('Master 进程收到中断信号 SIGINT');
logger()->notice('正在停止服务器');
logger()->notice('Master 进程收到中断信号,正在停止服务器');
Worker::stopAll();
}, false);
};
pcntl_signal(SIGTERM, $stopMaster, false);
pcntl_signal(SIGINT, $stopMaster, false);
pcntl_signal(SIGHUP, $stopMaster, false);
}
}

View File

@@ -50,7 +50,7 @@ class Framework
public const VERSION_ID = 726;
/** @var string 版本名称 */
public const VERSION = '3.2.6';
public const VERSION = '3.2.7';
/**
* @var RuntimePreferences 运行时偏好(环境信息&参数)
@@ -61,7 +61,7 @@ class Framework
protected array $argv;
/** @var null|Driver|SwooleDriver|WorkermanDriver OneBot驱动 */
protected null|Driver|SwooleDriver|WorkermanDriver $driver = null;
protected Driver|SwooleDriver|WorkermanDriver|null $driver = null;
/** @var array<array<string, string>> 启动注解列表 */
protected array $setup_annotations = [];

View File

@@ -31,7 +31,7 @@ class ProcessStateManager
* @throws ZMKnownException
* @internal
*/
public static function removeProcessState(int $type, null|int|string $id_or_name = null): void
public static function removeProcessState(int $type, int|string|null $id_or_name = null): void
{
switch ($type) {
case ZM_PROCESS_MASTER:

View File

@@ -104,7 +104,7 @@ class LightCache implements KVInterface
/**
* @throws InvalidArgumentException
*/
public function set(string $key, mixed $value, null|\DateInterval|int $ttl = null): bool
public function set(string $key, mixed $value, \DateInterval|int|null $ttl = null): bool
{
$this->validateKey($key);
self::$caches[$this->name][$key] = $value;
@@ -139,7 +139,7 @@ class LightCache implements KVInterface
}
}
public function setMultiple(iterable $values, null|\DateInterval|int $ttl = null): bool
public function setMultiple(iterable $values, \DateInterval|int|null $ttl = null): bool
{
foreach ($values as $k => $v) {
if (!$this->set($k, $v, $ttl)) {

View File

@@ -35,7 +35,7 @@ class KVRedis implements KVInterface
return $ret;
}
public function set(string $key, mixed $value, null|\DateInterval|int $ttl = null): bool
public function set(string $key, mixed $value, \DateInterval|int|null $ttl = null): bool
{
/** @var ZMRedis $redis */
$redis = RedisPool::pool($this->pool_name)->get();
@@ -78,7 +78,7 @@ class KVRedis implements KVInterface
RedisPool::pool($this->pool_name)->put($redis);
}
public function setMultiple(iterable $values, null|\DateInterval|int $ttl = null): bool
public function setMultiple(iterable $values, \DateInterval|int|null $ttl = null): bool
{
/** @var ZMRedis $redis */
$redis = RedisPool::pool($this->pool_name)->get();

View File

@@ -99,7 +99,7 @@ class MessageUtil
return $ls;
}
public static function getAltMessage(null|array|MessageSegment|string $message): string
public static function getAltMessage(array|MessageSegment|string|null $message): string
{
if ($message === null) {
return '';