add cs fixer and PHPStan and activate it (build 436)

.gitignore

@@ -13,9 +13,16 @@ composer.lock
 /runtime/
 /tmp/
 /temp/
+
+# go-cqhttp快速安装启动相关（可能被废弃）
 /ext/go-cqhttp/data/
 /ext/go-cqhttp/logs/
 /ext/go-cqhttp/config.hjson
 /ext/go-cqhttp/device.json
 /ext/go-cqhttp/go-cqhttp
 /ext/go-cqhttp/session.token
+
+.zm_worker_*.pid
+
+# Git Hook 的相关锁文件
+cghooks.lock

.php-cs-fixer.php

@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @since 2.7.0
+ */
+
+return (new PhpCsFixer\Config())
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR12' => true,
+        '@Symfony' => true,
+        '@PhpCsFixer' => true,
+        'array_syntax' => [
+            'syntax' => 'short',
+        ],
+        'list_syntax' => [
+            'syntax' => 'short',
+        ],
+        'concat_space' => [
+            'spacing' => 'one',
+        ],
+        'blank_line_before_statement' => [
+            'statements' => [
+                'declare',
+            ],
+        ],
+        'ordered_imports' => [
+            'imports_order' => [
+                'class',
+                'function',
+                'const',
+            ],
+            'sort_algorithm' => 'alpha',
+        ],
+        'single_line_comment_style' => [
+            'comment_types' => [
+            ],
+        ],
+        'yoda_style' => [
+            'always_move_variable' => false,
+            'equal' => false,
+            'identical' => false,
+        ],
+        'multiline_whitespace_before_semicolons' => [
+            'strategy' => 'no_multi_line',
+        ],
+        'constant_case' => [
+            'case' => 'lower',
+        ],
+        'class_attributes_separation' => true,
+        'combine_consecutive_unsets' => true,
+        'declare_strict_types' => true,
+        'linebreak_after_opening_tag' => true,
+        'lowercase_static_reference' => true,
+        'no_useless_else' => true,
+        'no_unused_imports' => true,
+        'not_operator_with_successor_space' => false,
+        'not_operator_with_space' => false,
+        'ordered_class_elements' => true,
+        'php_unit_strict' => false,
+        'phpdoc_separation' => false,
+        'single_quote' => true,
+        'standardize_not_equals' => true,
+        'multiline_comment_opening_closing' => true,
+        'phpdoc_summary' => false,
+        'class_reference_name_casing' => false,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude('vendor')
+            ->exclude('docs')
+            ->in(__DIR__ . '/src')
+    )
+    ->setUsingCache(false);

.run/Run watcher.run.xml

@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run watcher" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="bin/watcher" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

bin/watcher

@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+
+_red="\e[33m"
+_green="\e[32m"
+_reset="\e[0m"
+
+unix_s=$(uname -s)
+
+unix_release=$(
+    marked_release=""
+    if [ "$unix_s" = "Linux" ]; then
+        echo $HOME | grep com.termux >/dev/null
+        if [ $? == 0 ]; then
+            marked_release="termux"
+        elif [ -f "/etc/redhat-release" ]; then
+            if [ "$(cat /etc/redhat-release | awk '{print $1}' | grep -v '^$')" = "CentOS" ]; then
+                marked_release="CentOS"
+            else
+                marked_release="unknown"
+            fi
+        elif [ -f "/etc/os-release" ]; then
+            cat /etc/os-release | grep Alpine > /dev/null
+            if [ $? == 0 ]; then
+                marked_release="Alpine"
+            fi
+        fi
+        if [ "$marked_release" = "" ]; then
+            if [ -f "/etc/issue" ]; then
+                marked_release=$(cat /etc/issue | grep -v '^$' | awk '{print $1}')
+            else
+                marked_release="unknown"
+            fi
+        fi
+    elif [ "$unix_s" = "Darwin" ]; then
+        marked_release=$(sw_vers | grep ProductName | awk '{print $2" "$3" "$4}')
+    fi
+    echo $marked_release
+)
+unix_release=$(echo $unix_release | xargs)
+
+function echo_error() {
+    echo -e "${_red}$1${_reset}"
+}
+
+function echo_info() {
+    echo -e "${_green}$1${_reset}"
+}
+
+function install_test() {
+    which fswatch >/dev/null
+    if [ $? != 0 ]; then
+        operate_confirm "fswatch还没有安装，是否确认安装？" && install_fswatch
+    fi
+}
+function install_fswatch() {
+    if [ "$unix_s" = "Linux" ]; then
+        case $unix_release in
+        "Kali" | "Ubuntu" | "Debian" | "Raspbian" | 'Pop!_OS')
+            sudo apt-get install fswatch -y ;;
+        #"termux") pkg install $1 -y ;;
+        "CentOS")
+            curl -o fswatch.tgz https://download.fastgit.org/emcrisostomo/fswatch/releases/download/1.16.0/fswatch-1.16.0.tar.gz && \
+                tar -xzf fswatch.tgz && \
+                cd fswatch-1.16.0 && \
+                ./configure && \
+                make && \
+                sudo make install && \
+                cd .. && \
+                rm -rf fswatch.tgz fswatch-1.16.0
+                ;;
+        #"Alpine") apk add $1 ;;
+        *)
+            echo_error "不支持的 Linux 发行版：$unix_release"
+            exit 1
+            ;;
+        esac
+    elif [ "$unix_s" = "Darwin" ]; then
+        brew install fswatch
+    else
+        echo_error "不支持的操作系统：$unix_s"
+        exit 1
+    fi
+}
+function operate_confirm() {
+    echo -n $(echo_info "$1 [Y/n]  ")
+    read operate
+    operate=$(echo $operate | tr A-Z a-z)
+    if [[ "$operate" = "y" || "$operate" = "" ]]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+echo_info "当前系统：$unix_release"
+install_test
+if [ $? -ne 0 ]; then
+    exit 1
+else
+    echo_info "程序路径：$(which fswatch)"
+fi
+watch_dir="./src"
+if [ ! -d "$watch_dir" ]; then
+    echo_error "src目录不存在！"
+    exit 1
+else
+    echo_info "监听目录：$watch_dir"
+fi
+_pid=$(cat .daemon_pid | awk -F"\"pid\": " '{print $2}' | grep -v ^$ | sed 's/,//g')
+if [ "$_pid" = "" ]; then
+    echo_error "未检测到框架进程"
+    exit 1
+fi
+fswatch $watch_dir | while read file
+do
+    echo "Detect file change: $file"
+    kill -USR1 $_pid
+done

composer.json

@@ -6,7 +6,18 @@
     "extra": {
         "exclude_annotate": [
             "src/ZM"
-        ]
+        ],
+        "hooks": {
+            "post-merge": "composer install",
+            "pre-commit": [
+                "echo committing as $(git config user.name)",
+                "./vendor/bin/php-cs-fixer fix --dry-run --diff ./src"
+            ],
+            "pre-push": [
+                "./vendor/bin/php-cs-fixer fix --dry-run --diff ./src",
+                "composer analyse"
+            ]
+        }
     },
     "authors": [
         {
@@ -17,10 +28,11 @@
     "prefer-stable": true,
     "bin": [
         "bin/start",
-        "bin/phpunit-swoole"
+        "bin/phpunit-swoole",
+        "bin/watcher"
     ],
     "require": {
-        "php": ">=7.2",
+        "php": "^7.2 || ^7.3 || ^7.4 || ^8.0 || ^8.1",
         "ext-json": "*",
         "ext-posix": "*",
         "doctrine/annotations": "~1.12 || ~1.4.0",
@@ -52,8 +64,28 @@
             "src/ZM/global_functions.php"
         ]
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Module\\": "src/Module",
+            "Custom\\": "src/Custom"
+        }
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "sort-packages": true
+    },
     "require-dev": {
         "swoole/ide-helper": "@dev",
-        "phpunit/phpunit": "^8.5 || ^9.0"
+        "phpunit/phpunit": "^8.5 || ^9.0",
+        "brainmaestro/composer-git-hooks": "^2.8",
+        "friendsofphp/php-cs-fixer": "^3.2 != 3.7.0",
+        "phpstan/phpstan": "^1.1"
+    },
+    "scripts": {
+        "post-install-cmd": [
+            "[ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/cghooks add"
+        ],
+        "analyse": "phpstan analyse --memory-limit 300M -l 0 ./src",
+        "cs-fix": "php-cs-fixer fix $1"
     }
 }

config/global.php

@@ -1,65 +1,67 @@
 <?php
-/** @noinspection PhpFullyQualifiedNameUsageInspection */
+
 /** @noinspection PhpComposerExtensionStubsInspection */
 
-/** bind host */
+declare(strict_types=1);
+
+/* bind host */
 $config['host'] = '0.0.0.0';
 
-/** bind port */
+/* bind port */
 $config['port'] = 20001;
 
-/** 框架开到公网或外部的HTTP访问链接，通过 DataProvider::getFrameworkLink() 获取 */
+/* 框架开到公网或外部的HTTP访问链接，通过 DataProvider::getFrameworkLink() 获取 */
 $config['http_reverse_link'] = 'http://127.0.0.1:' . $config['port'];
 
-/** 框架是否启动debug模式，当debug模式为true时，启用热更新（需要安装inotify扩展） */
+/* 框架是否启动debug模式，当debug模式为true时，启用热更新（需要安装inotify扩展） */
 $config['debug_mode'] = false;
 
-/** 存放框架内文件数据的目录 */
+/* 存放框架内文件数据的目录 */
 $config['zm_data'] = realpath(WORKING_DIR) . '/zm_data/';
 
-/** 存放各个模块配置文件的目录 */
+/* 存放各个模块配置文件的目录 */
 $config['config_dir'] = $config['zm_data'] . 'config/';
 
-/** 存放崩溃和运行日志的目录 */
+/* 存放崩溃和运行日志的目录 */
 $config['crash_dir'] = $config['zm_data'] . 'crash/';
 
-/** 对应swoole的server->set参数 */
+/* 对应swoole的server->set参数 */
 $config['swoole'] = [
     'log_file' => $config['crash_dir'] . 'swoole_error.log',
     //'worker_num' => swoole_cpu_num(), //如果你只有一个 OneBot 实例连接到框架并且代码没有复杂的CPU密集计算，则可把这里改为1使用全局变量
     'dispatch_mode' => 2, //包分配原则，见 https://wiki.swoole.com/#/server/setting?id=dispatch_mode
     'max_coroutine' => 300000,
-    'max_wait_time' => 5
+    'max_wait_time' => 5,
     //'task_worker_num' => 4,
     //'task_enable_coroutine' => true
 ];
 
-
-/** 一些框架与框架运行时设置的调整 */
+/* 一些框架与框架运行时设置的调整 */
 $config['runtime'] = [
     'swoole_coroutine_hook_flags' => SWOOLE_HOOK_ALL & (~SWOOLE_HOOK_CURL),
     'swoole_server_mode' => SWOOLE_PROCESS,
     'middleware_error_policy' => 1,
     'reload_delay_time' => 800,
-    'global_middleware_binding' => []
+    'global_middleware_binding' => [],
+    'save_console_log_file' => false, // 改为目标路径，则将 Console 输出的日志保存到文件
 ];
 
-/** 轻量字符串缓存，默认开启 */
+/* 轻量字符串缓存，默认开启 */
 $config['light_cache'] = [
     'size' => 512,                       //最多允许储存的条数（需要2的倍数）
     'max_strlen' => 32768,               //单行字符串最大长度（需要2的倍数）
     'hash_conflict_proportion' => 0.6,   //Hash冲突率（越大越好，但是需要的内存更多）
     'persistence_path' => $config['zm_data'] . '_cache.json',
-    'auto_save_interval' => 900
+    'auto_save_interval' => 900,
 ];
 
-/** 大容量跨进程变量存储（2.2.0可用） */
+/* 大容量跨进程变量存储（2.2.0可用） */
 $config['worker_cache'] = [
     'worker' => 0,
-    'transaction_timeout' => 30000
+    'transaction_timeout' => 30000,
 ];
 
-/** MySQL数据库连接信息，host留空则启动时不创建sql连接池 */
+/* MySQL数据库连接信息，host留空则启动时不创建sql连接池 */
 $config['mysql_config'] = [
     'host' => '',
     'port' => 3306,
@@ -71,54 +73,54 @@ $config['mysql_config'] = [
     'pool_size' => 64,
     'options' => [
         PDO::ATTR_STRINGIFY_FETCHES => false,
-        PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC
-    ]
+        PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+    ],
 ];
 
-/** Redis连接信息，host留空则启动时不创建Redis连接池 */
+/* Redis连接信息，host留空则启动时不创建Redis连接池 */
 $config['redis_config'] = [
     'host' => '',
     'port' => 6379,
     'timeout' => 1,
     'db_index' => 0,
-    'auth' => ''
+    'auth' => '',
 ];
 
-/** onebot连接约定的token */
+/* onebot连接约定的token */
 $config['access_token'] = '';
 
-/** HTTP服务器固定请求头的返回 */
+/* HTTP服务器固定请求头的返回 */
 $config['http_header'] = [
     'Server' => 'zhamao-framework',
-    'Content-Type' => 'text/html; charset=utf-8'
+    'Content-Type' => 'text/html; charset=utf-8',
 ];
 
-/** HTTP服务器在指定状态码下回复的页面（默认） */
+/* HTTP服务器在指定状态码下回复的页面（默认） */
 $config['http_default_code_page'] = [
-    '404' => '404.html'
+    '404' => '404.html',
 ];
 
-/** zhamao-framework在框架启动时初始化的atomic们 */
+/* zhamao-framework在框架启动时初始化的atomic们 */
 $config['init_atomics'] = [
     //'custom_atomic_name' => 0, //自定义添加的Atomic
 ];
 
-/** 终端日志显示等级（0-4） */
+/* 终端日志显示等级（0-4） */
 $config['info_level'] = 2;
 
-/** 上下文接口类 implemented from ContextInterface */
+/* 上下文接口类 implemented from ContextInterface */
 $config['context_class'] = \ZM\Context\Context::class;
 
-/** 静态文件访问 */
+/* 静态文件访问 */
 $config['static_file_server'] = [
     'status' => false,
     'document_root' => realpath(__DIR__ . '/../') . '/resources/html',
     'document_index' => [
-        'index.html'
-    ]
+        'index.html',
+    ],
 ];
 
-/** 机器人解析模块，关闭后无法使用如CQCommand等注解(上面的modules即将废弃) */
+/* 机器人解析模块，关闭后无法使用如CQCommand等注解(上面的modules即将废弃) */
 $config['onebot'] = [
     'status' => true,
     'single_bot_mode' => false,
@@ -127,18 +129,18 @@ $config['onebot'] = [
     'message_command_policy' => 'interrupt',
 ];
 
-/** 一个远程简易终端，使用nc直接连接即可，但是不建议开放host为0.0.0.0(远程连接) */
+/* 一个远程简易终端，使用nc直接连接即可，但是不建议开放host为0.0.0.0(远程连接) */
 $config['remote_terminal'] = [
     'status' => false,
     'host' => '127.0.0.1',
     'port' => 20002,
-    'token' => ''
+    'token' => '',
 ];
 
-/** 模块(插件)加载器的相关设置 */
+/* 模块(插件)加载器的相关设置 */
 $config['module_loader'] = [
     'enable_hotload' => false,
-    'load_path' => $config['zm_data'] . 'modules'
+    'load_path' => $config['zm_data'] . 'modules',
 ];
 
 return $config;

docs/component/common/task-worker.md

@@ -2,7 +2,7 @@
 
 此类管理的是 TaskWorker 相关工作。有关使用 TaskWorker 的教程，见 [进阶 - 使用 TaskWorker 进程处理密集运算](/advanced/task-worker)
 
-类定义：`\ZM\Utils\TaskManager`
+类定义：`\ZM\Utils\Manager\TaskManager`
 
 使用 TaskWorker 需要先在 `global.php` 配置文件中开启！
 

docs/component/store/data-provider.md

@@ -8,6 +8,10 @@ DataProvider 是框架内提供的一个简易的文件管理类。
 
 同 `working_dir()`。
 
+## DataProvider::getSourceRootDir()
+
+获取用户的源码根目录，除 Phar 模式外与 `getWorkingDir()` 相同。
+
 ## DataProvider::getFrameworkLink()
 
 同 `ZMConfig::get("global", "http_reverse_link")`，获取反向代理的链接。
@@ -46,6 +50,45 @@ DataProvider::getDataFolder("TestModule"); // 例如返回 /root/zhamao-framewor
 
 文件名同上 `saveToJson()` 的定义，解析后的返回值为原先的内容或 `null`（如果文件不存在或 json 解析失败）。
 
+## DataProvider::scanDirFiles()
+
+递归或非递归扫描目录，返回相对目录的文件列表或绝对目录的文件列表。（非常好用）
+
+定义：`scanDirFiles($dir, $recursive = true, $relative = false)`
+
+`$dir` 为要扫描的目录，`$recursive` 为是否递归，`$relative` 为是否返回相对目录的文件列表。
+
+从给定的目录下开始遍历整个目录，如果将 `$recursive` 设置为 `true`，则会递归扫描子目录，否则将返回包含目录的文件列表。
+
+如果将 `$relative` 设置为 `true`，则会返回文件列表的相对路径，否则返回绝对路径。
+
+例如：假设目录 `/home/test/` 下有两个文件：`test1.txt` 和 `testdir/test2.txt`：如果将 `$recursive` 设置为 `true`，`$relative` 设置为 `false`，则返回的文件列表为：
+
+```json
+[
+    "/home/test/test1.txt",
+    "home/test/testdir/test2.txt"
+]
+```
+
+相同条件下，如果将 `$relative` 设置为 `true`：
+
+```json
+[
+    "test1.txt",
+    "testdir/test2.txt"
+]
+```
+
+如果再把 `$recursive` 设置为 `false`：
+
+```json
+[
+    "test1.txt",
+    "testdir"
+]
+```
+
 ## 其他文件读取
 
 框架比较贴近原生的 PHP，所以推荐直接使用原生的方法来读写文件（`file_get_contents` 和 `file_put_contents`）。但有一点要注意，框架内最好使用**工作目录或者绝对路径**。

docs/faq/usual-question.md

@@ -6,9 +6,18 @@
 
 但是如果因为用户的误操作，导致炸毛框架其中的一个或多个进程阻塞，或者比如将框架挂在 screen 等守护但是守护服务进程被杀掉，总之就是无法使用 Ctrl+C 的方式正常关闭框架，这时就需要正确地杀掉所有框架进程（这固然可能会造成内存的缓存数据丢失）。
 
+### v2.7.0 及以上版本教程
+
+- 安全关框架指令：`./zhamao server:stop`
+- 万能杀死所有框架进程指令：`./zhamao server:stop --force`
+- 监视框架是否在运行：`./zhamao server:status`
+- Worker 进程卡死：连续按 5 次 Ctrl+C 即可强行杀掉所有进程（SIGKILL）
+
+### v2.6.6 及以下版本教程
+
 !!! warning "注意"
 
-	下方涉及 `ps` 命令后使用 `grep` 过滤的框架进程方式，如果你的服务器同时有其他使用 PHP 启动的服务，命令行刚好有 `server` 字样，可能会导致误杀，如果有影响的话，建议将 `grep server` 换成你启动时命令行的特殊参数或手动排除！
+    下方涉及 `ps` 命令后使用 `grep` 过滤的框架进程方式，如果你的服务器同时有其他使用 PHP 启动的服务，命令行刚好有 `server` 字样，可能会导致误杀，如果有影响的话，建议将 `grep server` 换成你启动时命令行的特殊参数或手动排除！
 
 **一、**首先，使用 `ps`、`htop`、`netstat -nlp` 等命令确定框架的入口进程（也就是 Master 进程的 pid）。
 

docs/guide/basic-config.md

@@ -58,6 +58,7 @@
 | `middleware_error_policy`     | 中间件错误处理策略，见 [中间件 - 错误处理策略](../../event/middleware/#_6) | 1                                       |
 | `reload_delay_time`           | 框架 reload 重载命令接收后延迟的时间（毫秒，0 为不等待）     | 800                                     |
 | `global_middleware_binding`   | 给注解事件绑定全局中间件，见 [中间件 - 全局中间件](../../event/middleware/#_6) | `[]`                                    |
+| `save_console_log_file`   | 当这里输入字符串路径时，所有 `Console::xxx()` 输出的日志都将保存到目标文件 | false                                    |
 
 ### 子表 **light_cache**
 

docs/index.md

@@ -1,7 +1,5 @@
 # 介绍
 
-> 本文档为炸毛框架 v2 版本，如需查看 v1 版本，[点我](https://docs-v1.zhamao.xin/)。
-
 !!! tip "提示"
 
 	编写文档需要较大精力，你也可以参与到本文档的建设中来，比如找错字，增加或更正内容，每页文档可直接点击右上方铅笔图标直接跳转至 GitHub 进行编辑，编辑后自动 Fork 并生成 Pull Request，以此来贡献此文档！

docs/update/build-update.md

@@ -4,6 +4,15 @@
 
 同时此处将只使用 build 版本号进行区分。
 
+## build 434 (2022-1-8)
+
+- 修复框架在 PHP 8.1 下运行时的一些问题
+- 新增 Console 日志输出到文件的功能
+
+## build 433 (2021-12-28)
+
+- 修复 OneBotV11 因 IDE 自动优化导致 API 接口发生变化的问题
+
 ## build 432 (2021-12-25)
 
 - 新增 GoCqhttpAPI 包，用于支持额外的 OneBot Action（API）

docs/update/config.md

@@ -2,6 +2,10 @@
 
 这里将会记录各个主版本的框架升级后，涉及 `global.php` 的更新日志，你可以根据这里描述的内容与你的旧配置文件进行合并。
 
+## v2.6.6 (build 434)
+
+- 新增 `$config['runtime']` 下的 `save_console_log_file` 项。
+
 ## v2.6.0 (build 427)
 
 - 新增 `$config['runtime']` 下的 `reload_delay_time`、`global_middleware_binding` 项。

docs/update/v2.md

@@ -1,5 +1,18 @@
 # 更新日志（v2 版本）
 
+## v2.6.6（build 434）
+
+> 更新时间：2022.1.8
+
+- 修复框架在 PHP 8.1 下运行时的一些问题
+- 新增 Console 日志输出到文件的功能
+
+## v2.6.5（build 433）
+
+> 更新时间：2021.12.28
+
+- 修复 OneBotV11 因 IDE 自动优化导致 API 接口发生变化的问题
+
 ## v2.6.4（build 432）
 
 > 更新时间：2021.12.25

instant-demo.php

@@ -1,6 +1,8 @@
 <?php
 
-require_once "vendor/autoload.php";
+declare(strict_types=1);
+
+require_once 'vendor/autoload.php';
 
 use ZM\Annotation\CQ\CQCommand;
 use ZM\Annotation\Swoole\OnOpenEvent;
@@ -9,17 +11,16 @@ use ZM\Console\Console;
 use ZM\Module\InstantModule;
 use ZM\ZMServer;
 
-$weather = new InstantModule("weather");
+$weather = new InstantModule('weather');
 
-
-$weather->onEvent(OnOpenEvent::class, ['connect_type' => 'qq'], function(ConnectionObject $conn) {
-    Console::info("机器人 " . $conn->getOption("connect_id") . " 已连接！");
+$weather->onEvent(OnOpenEvent::class, ['connect_type' => 'qq'], function (ConnectionObject $conn) {
+    Console::info('机器人 ' . $conn->getOption('connect_id') . ' 已连接！');
 });
 
-$weather->onEvent(CQCommand::class, ['match' => '你好'], function() {
-    ctx()->reply("hello呀！");
+$weather->onEvent(CQCommand::class, ['match' => '你好'], function () {
+    ctx()->reply('hello呀！');
 });
 
-$app = new ZMServer("app-name");
+$app = new ZMServer('app-name');
 $app->addModule($weather);
-$app->run();
+$app->run();

mkdocs.yml

@@ -106,6 +106,7 @@ nav:
           - Console 终端: component/common/console.md
           - TaskWorker 管理: component/common/task-worker.md
           - Terminal 终端: component/common/remote-terminal.md
+          - EventTracer 事件追踪器: component/comon/event-tracer.md
       - HTTP 服务器工具类:
           - HTTP 和 WebSocket 客户端: component/http/zmrequest.md
           - HTTP 路由管理: component/http/route-manager.md

phpstan.neon

@@ -0,0 +1,7 @@
+parameters:
+  reportUnmatchedIgnoredErrors: false
+  level: 0
+  paths:
+    - ./src/
+  ignoreErrors:
+    - '#Used constant OS_TYPE_(LINUX|WINDOWS) not found#'

src/Custom/Annotation/Example.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Custom\Annotation;
 
@@ -11,7 +12,6 @@ use ZM\Annotation\Interfaces\CustomAnnotation;
  * Class CustomAnnotation
  * @Annotation
  * @Target("ALL")
- * @package Custom\Annotation
  */
 class Example extends AnnotationBase implements CustomAnnotation
 {

src/Custom/global_function.php

@@ -1,11 +1,10 @@
-<?php /** @noinspection PhpFullyQualifiedNameUsageInspection */ #plain
+<?php
 
-//这里写你的全局函数
-/**
- * @param callable $func
- * @param string $name
- * @noinspection PhpUnused
- */
-function pgo(callable $func, $name = "default") {
-    \ZM\Utils\CoroutinePool::go($func, $name);
+declare(strict_types=1);
+
+use ZM\Utils\CoroutinePool;
+
+function pgo(callable $func, string $name = 'default')
+{
+    CoroutinePool::go($func, $name);
 }

src/Module/Example/Hello.php

@@ -1,20 +1,22 @@
-<?php /** @noinspection PhpMissingReturnTypeInspection */
+<?php
+
+declare(strict_types=1);
 
 namespace Module\Example;
 
 use ZM\Annotation\CQ\CQBefore;
+use ZM\Annotation\CQ\CQCommand;
 use ZM\Annotation\CQ\CQMessage;
 use ZM\Annotation\Http\Middleware;
+use ZM\Annotation\Http\RequestMapping;
 use ZM\Annotation\Swoole\OnCloseEvent;
 use ZM\Annotation\Swoole\OnOpenEvent;
 use ZM\Annotation\Swoole\OnRequestEvent;
 use ZM\API\CQ;
-use ZM\API\TuringAPI;
 use ZM\API\OneBotV11;
+use ZM\API\TuringAPI;
 use ZM\ConnectionManager\ConnectionObject;
 use ZM\Console\Console;
-use ZM\Annotation\CQ\CQCommand;
-use ZM\Annotation\Http\RequestMapping;
 use ZM\Event\EventDispatcher;
 use ZM\Exception\InterruptException;
 use ZM\Module\QQBot;
@@ -24,7 +26,6 @@ use ZM\Utils\ZMUtil;
 
 /**
  * Class Hello
- * @package Module\Example
  * @since 2.0
  */
 class Hello
@@ -41,41 +42,49 @@ class Hello
      * 使用命令 .reload 发给机器人远程重载，注意将 user_id 换成你自己的 QQ
      * @CQCommand(".reload",user_id=627577391)
      */
-    public function reload() {
-        ctx()->reply("重启中...");
+    public function reload()
+    {
+        ctx()->reply('重启中...');
         ZMUtil::reload();
     }
 
     /**
      * @CQCommand("我是谁")
      */
-    public function whoami() {
+    public function whoami()
+    {
         $bot = ctx()->getRobot()->getLoginInfo();
-        $bot_id = $bot["data"]["user_id"];
-        $r = OneBotV11::get($bot_id); 
+        $bot_id = $bot['data']['user_id'];
+        $r = OneBotV11::get($bot_id);
         $QQid = ctx()->getUserId();
-        $nick = $r->getStrangerInfo($QQid)["data"]["nickname"];
-        return "你是" . $nick . "，QQ号是" . $QQid;
+        $nick = $r->getStrangerInfo($QQid)['data']['nickname'];
+        return '你是' . $nick . '，QQ号是' . $QQid;
     }
 
     /**
      * 向机器人发送"你好啊"，也可回复这句话
      * @CQCommand(match="你好",alias={"你好啊","你是谁"})
      */
-    public function hello() {
-        return "你好啊，我是由炸毛框架构建的机器人！";
+    public function hello()
+    {
+        return '你好啊，我是由炸毛框架构建的机器人！';
     }
 
     /**
      * 一个最基本的第三方 API 接口使用示例
      * @CQCommand("一言")
      */
-    public function hitokoto() {
-        $api_result = ZMRequest::get("https://v1.hitokoto.cn/");
-        if ($api_result === false) return "接口请求出错，请稍后再试！";
+    public function hitokoto()
+    {
+        $api_result = ZMRequest::get('https://v1.hitokoto.cn/');
+        if ($api_result === false) {
+            return '接口请求出错，请稍后再试！';
+        }
         $obj = json_decode($api_result, true);
-        if ($obj === null) return "接口解析出错！可能返回了非法数据！";
-        return $obj["hitokoto"] . "\n----「" . $obj["from"] . "」";
+        if ($obj === null) {
+            return '接口解析出错！可能返回了非法数据！';
+        }
+        return $obj['hitokoto'] . "\n----「" . $obj['from'] . '」';
     }
 
     /**
@@ -83,33 +92,36 @@ class Hello
      * @CQCommand(start_with="机器人",end_with="机器人",message_type="group")
      * @CQMessage(message_type="private",level=1)
      */
-    public function turingAPI() {
+    public function turingAPI()
+    {
         $user_id = ctx()->getUserId();
-        $api = ""; // 请在这里填入你的图灵机器人的apikey
-        if ($api === "") return false; //如果没有填入apikey则此功能关闭
+        $api = ''; // 请在这里填入你的图灵机器人的apikey
+        if ($api === '') {
+            return false;
+        } //如果没有填入apikey则此功能关闭
         if (($this->_running_annotation ?? null) instanceof CQCommand) {
-            $msg = ctx()->getFullArg("我在！有什么事吗？");
+            $msg = ctx()->getFullArg('我在！有什么事吗？');
         } else {
             $msg = ctx()->getMessage();
         }
         ctx()->setMessage($msg);
         if (MessageUtil::matchCommand($msg, ctx()->getData())->status === false) {
             return TuringAPI::getTuringMsg($msg, $user_id, $api);
-        } else {
-            QQBot::getInstance()->handle(ctx()->getData(), ctx()->getCache("level") + 1);
-            //执行嵌套消息，递归层级+1
-            return true;
         }
+        QQBot::getInstance()->handle(ctx()->getData(), ctx()->getCache('level') + 1);
+        //执行嵌套消息，递归层级+1
+        return true;
     }
 
     /**
      * 响应at机器人的消息
      * @CQBefore("message")
      */
-    public function changeAt() {
+    public function changeAt()
+    {
         if (MessageUtil::isAtMe(ctx()->getMessage(), ctx()->getRobotId())) {
-            $msg = str_replace(CQ::at(ctx()->getRobotId()), "", ctx()->getMessage());
-            ctx()->setMessage("机器人" . $msg);
+            $msg = str_replace(CQ::at(ctx()->getRobotId()), '', ctx()->getMessage());
+            ctx()->setMessage('机器人' . $msg);
             Console::info(ctx()->getMessage());
         }
         return true;
@@ -123,15 +135,16 @@ class Hello
      * @CQCommand(pattern="*从*到*的随机数")
      * @return string
      */
-    public function randNum() {
+    public function randNum()
+    {
         // 获取第一个数字类型的参数
-        $num1 = ctx()->getNumArg("请输入第一个数字");
+        $num1 = ctx()->getNumArg('请输入第一个数字');
         // 获取第二个数字类型的参数
-        $num2 = ctx()->getNumArg("请输入第二个数字");
+        $num2 = ctx()->getNumArg('请输入第二个数字');
         $a = min(intval($num1), intval($num2));
         $b = max(intval($num1), intval($num2));
         // 回复用户结果
-        return "随机数是：" . mt_rand($a, $b);
+        return '随机数是：' . mt_rand($a, $b);
     }
 
     /**
@@ -139,8 +152,9 @@ class Hello
      * @RequestMapping("/httpTimer")
      * @Middleware("timer")
      */
-    public function timer() {
-        return "This page is used as testing TimerMiddleware! Do not use it in production.";
+    public function timer()
+    {
+        return 'This page is used as testing TimerMiddleware! Do not use it in production.';
     }
 
     /**
@@ -148,8 +162,9 @@ class Hello
      * @RequestMapping("/index")
      * @RequestMapping("/")
      */
-    public function index() {
-        return "Hello Zhamao!";
+    public function index()
+    {
+        return 'Hello Zhamao!';
     }
 
     /**
@@ -158,8 +173,9 @@ class Hello
      * @param $param
      * @return string
      */
-    public function paramGet($param) {
-        return "Hello, " . $param["name"];
+    public function paramGet($param)
+    {
+        return 'Hello, ' . $param['name'];
     }
 
     /**
@@ -167,17 +183,18 @@ class Hello
      * @OnOpenEvent("qq")
      * @param $conn
      */
-    public function onConnect(ConnectionObject $conn) {
-        Console::info("机器人 " . $conn->getOption("connect_id") . " 已连接！");
+    public function onConnect(ConnectionObject $conn)
+    {
+        Console::info('机器人 ' . $conn->getOption('connect_id') . ' 已连接！');
     }
 
     /**
      * 在机器人断开连接后向终端输出信息
      * @OnCloseEvent("qq")
-     * @param ConnectionObject $conn
      */
-    public function onDisconnect(ConnectionObject $conn) {
-        Console::info("机器人 " . $conn->getOption("connect_id") . " 已断开连接！");
+    public function onDisconnect(ConnectionObject $conn)
+    {
+        Console::info('机器人 ' . $conn->getOption('connect_id') . ' 已断开连接！');
     }
 
     /**
@@ -185,7 +202,8 @@ class Hello
      * @OnRequestEvent(rule="ctx()->getRequest()->server['request_uri'] == '/favicon.ico'",level=200)
      * @throws InterruptException
      */
-    public function onRequest() {
+    public function onRequest()
+    {
         EventDispatcher::interrupt();
     }
 
@@ -193,8 +211,9 @@ class Hello
      * 框架会默认关闭未知的WebSocket链接，因为这个绑定的事件，你可以根据你自己的需求进行修改
      * @OnOpenEvent("default")
      */
-    public function closeUnknownConn() {
-        Console::info("Unknown connection , I will close it.");
+    public function closeUnknownConn()
+    {
+        Console::info('Unknown connection , I will close it.');
         server()->disconnect(ctx()->getConnection()->getFd());
     }
 }

src/Module/Middleware/TimerMiddleware.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Module\Middleware;
 
 use Exception;
@@ -13,7 +15,6 @@ use ZM\Http\MiddlewareInterface;
 /**
  * Class TimerMiddleware
  * 示例中间件：用于统计路由函数运行时间用的
- * @package Module\Middleware
  * @MiddlewareClass("timer")
  */
 class TimerMiddleware implements MiddlewareInterface
@@ -22,9 +23,9 @@ class TimerMiddleware implements MiddlewareInterface
 
     /**
      * @HandleBefore()
-     * @return bool
      */
-    public function onBefore(): bool {
+    public function onBefore(): bool
+    {
         $this->starttime = microtime(true);
         return true;
     }
@@ -32,17 +33,18 @@ class TimerMiddleware implements MiddlewareInterface
     /**
      * @HandleAfter()
      */
-    public function onAfter() {
-        Console::info("Using " . round((microtime(true) - $this->starttime) * 1000, 3) . " ms.");
+    public function onAfter()
+    {
+        Console::info('Using ' . round((microtime(true) - $this->starttime) * 1000, 3) . ' ms.');
     }
 
     /**
      * @HandleException(\Exception::class)
-     * @param Exception $e
      * @throws Exception
      */
-    public function onException(Exception $e) {
-        Console::error("Using " . round((microtime(true) - $this->starttime) * 1000, 3) . " ms but an Exception occurred.");
+    public function onException(Exception $e)
+    {
+        Console::error('Using ' . round((microtime(true) - $this->starttime) * 1000, 3) . ' ms but an Exception occurred.');
         throw $e;
     }
 }

src/ZM/API/CQ.php

@@ -1,11 +1,9 @@
-<?php /** @noinspection PhpUnused */
-
-/** @noinspection PhpMissingReturnTypeInspection */
+<?php
 
+declare(strict_types=1);
 
 namespace ZM\API;
 
-
 use ZM\Console\Console;
 use ZM\Entity\CQObject;
 
@@ -16,12 +14,13 @@ class CQ
      * @param $qq
      * @return string
      */
-    public static function at($qq) {
-        if (is_numeric($qq) || $qq === "all") {
-            return "[CQ:at,qq=" . $qq . "]";
+    public static function at($qq)
+    {
+        if (is_numeric($qq) || $qq === 'all') {
+            return '[CQ:at,qq=' . $qq . ']';
         }
-        Console::warning(zm_internal_errcode("E00035") . "传入的QQ号码($qq)错误！");
-        return " ";
+        Console::warning(zm_internal_errcode('E00035') . "传入的QQ号码({$qq})错误！");
+        return ' ';
     }
 
     /**
@@ -29,127 +28,130 @@ class CQ
      * @param $id
      * @return string
      */
-    public static function face($id) {
+    public static function face($id)
+    {
         if (is_numeric($id)) {
-            return "[CQ:face,id=" . $id . "]";
+            return '[CQ:face,id=' . $id . ']';
         }
-        Console::warning(zm_internal_errcode("E00035") . "传入的face id($id)错误！");
-        return " ";
+        Console::warning(zm_internal_errcode('E00035') . "传入的face id({$id})错误！");
+        return ' ';
     }
 
     /**
      * 发送图片
      * @param $file
-     * @param bool $cache
-     * @param bool $flash
-     * @param bool $proxy
-     * @param int $timeout
      * @return string
      */
-    public static function image($file, bool $cache = true, bool $flash = false, bool $proxy = true, int $timeout = -1) {
+    public static function image($file, bool $cache = true, bool $flash = false, bool $proxy = true, int $timeout = -1)
+    {
         return
-            "[CQ:image,file=" . self::encode($file, true) .
-            (!$cache ? ",cache=0" : "") .
-            ($flash ? ",type=flash" : "") .
-            (!$proxy ? ",proxy=false" : "") .
-            ($timeout != -1 ? (",timeout=" . $timeout) : "") .
-            "]";
+            '[CQ:image,file=' . self::encode($file, true) .
+            (!$cache ? ',cache=0' : '') .
+            ($flash ? ',type=flash' : '') .
+            (!$proxy ? ',proxy=false' : '') .
+            ($timeout != -1 ? (',timeout=' . $timeout) : '') .
+            ']';
     }
 
     /**
      * 发送语音
      * @param $file
-     * @param bool $magic
-     * @param bool $cache
-     * @param bool $proxy
-     * @param int $timeout
      * @return string
      */
-    public static function record($file, bool $magic = false, bool $cache = true, bool $proxy = true, int $timeout = -1) {
+    public static function record($file, bool $magic = false, bool $cache = true, bool $proxy = true, int $timeout = -1)
+    {
         return
-            "[CQ:record,file=" . self::encode($file, true) .
-            (!$cache ? ",cache=0" : "") .
-            ($magic ? ",magic=1" : "") .
-            (!$proxy ? ",proxy=false" : "") .
-            ($timeout != -1 ? (",timeout=" . $timeout) : "") .
-            "]";
+            '[CQ:record,file=' . self::encode($file, true) .
+            (!$cache ? ',cache=0' : '') .
+            ($magic ? ',magic=1' : '') .
+            (!$proxy ? ',proxy=false' : '') .
+            ($timeout != -1 ? (',timeout=' . $timeout) : '') .
+            ']';
     }
 
     /**
      * 发送短视频
      * @param $file
-     * @param bool $cache
-     * @param bool $proxy
-     * @param int $timeout
      * @return string
      */
-    public static function video($file, bool $cache = true, bool $proxy = true, int $timeout = -1) {
+    public static function video($file, bool $cache = true, bool $proxy = true, int $timeout = -1)
+    {
         return
-            "[CQ:video,file=" . self::encode($file, true) .
-            (!$cache ? ",cache=0" : "") .
-            (!$proxy ? ",proxy=false" : "") .
-            ($timeout != -1 ? (",timeout=" . intval($timeout)) : "") .
-            "]";
+            '[CQ:video,file=' . self::encode($file, true) .
+            (!$cache ? ',cache=0' : '') .
+            (!$proxy ? ',proxy=false' : '') .
+            ($timeout != -1 ? (',timeout=' . $timeout) : '') .
+            ']';
     }
 
     /**
      * 发送投掷骰子（只能在单条回复中单独使用）
      * @return string
      */
-    public static function rps() {
-        return "[CQ:rps]";
+    public static function rps()
+    {
+        return '[CQ:rps]';
     }
 
     /**
      * 发送掷骰子表情（只能在单条回复中单独使用）
      * @return string
      */
-    public static function dice() {
-        return "[CQ:dice]";
+    public static function dice()
+    {
+        return '[CQ:dice]';
     }
 
     /**
      * 戳一戳（原窗口抖动，仅支持好友消息使用）
      * @return string
      */
-    public static function shake() {
-        return "[CQ:shake]";
+    public static function shake()
+    {
+        return '[CQ:shake]';
     }
 
     /**
      * 发送新的戳一戳
      * @param $type
      * @param $id
-     * @param string $name
      * @return string
      */
-    public static function poke($type, $id, string $name = "") {
-        return "[CQ:poke,type=$type,id=$id" . ($name != "" ? (",name=" . self::encode($name, true)) : "") . "]";
+    public static function poke($type, $id, string $name = '')
+    {
+        return "[CQ:poke,type={$type},id={$id}" . ($name != '' ? (',name=' . self::encode($name, true)) : '') . ']';
     }
 
     /**
      * 发送匿名消息
-     * @param int $ignore
      * @return string
      */
-    public static function anonymous(int $ignore = 1) {
-        return "[CQ:anonymous" . ($ignore != 1 ? ",ignore=0" : "") . "]";
+    public static function anonymous(int $ignore = 1)
+    {
+        return '[CQ:anonymous' . ($ignore != 1 ? ',ignore=0' : '') . ']';
     }
 
     /**
      * 发送链接分享（只能在单条回复中单独使用）
      * @param $url
      * @param $title
-     * @param null $content
-     * @param null $image
+     * @param  null   $content
+     * @param  null   $image
      * @return string
      */
-    public static function share($url, $title, $content = null, $image = null) {
-        if ($content === null) $c = "";
-        else $c = ",content=" . self::encode($content, true);
-        if ($image === null) $i = "";
-        else $i = ",image=" . self::encode($image, true);
-        return "[CQ:share,url=" . self::encode($url, true) . ",title=" . self::encode($title, true) . $c . $i . "]";
+    public static function share($url, $title, $content = null, $image = null)
+    {
+        if ($content === null) {
+            $c = '';
+        } else {
+            $c = ',content=' . self::encode($content, true);
+        }
+        if ($image === null) {
+            $i = '';
+        } else {
+            $i = ',image=' . self::encode($image, true);
+        }
+        return '[CQ:share,url=' . self::encode($url, true) . ',title=' . self::encode($title, true) . $c . $i . ']';
     }
 
     /**
@@ -158,25 +160,25 @@ class CQ
      * @param $id
      * @return string
      */
-    public static function contact($type, $id) {
-        return "[CQ:contact,type=$type,id=$id]";
+    public static function contact($type, $id)
+    {
+        return "[CQ:contact,type={$type},id={$id}]";
     }
 
     /**
      * 发送位置
      * @param $lat
      * @param $lon
-     * @param string $title
-     * @param string $content
      * @return string
      */
-    public static function location($lat, $lon, string $title = "", string $content = "") {
-        return "[CQ:location" .
-            ",lat=" . self::encode($lat, true) .
-            ",lon=" . self::encode($lon, true) .
-            ($title != "" ? (",title=" . self::encode($title, true)) : "") .
-            ($content != "" ? (",content=" . self::encode($content, true)) : "") .
-            "]";
+    public static function location($lat, $lon, string $title = '', string $content = '')
+    {
+        return '[CQ:location' .
+            ',lat=' . self::encode($lat, true) .
+            ',lon=' . self::encode($lon, true) .
+            ($title != '' ? (',title=' . self::encode($title, true)) : '') .
+            ($content != '' ? (',content=' . self::encode($content, true)) : '') .
+            ']';
     }
 
     /**
@@ -191,101 +193,119 @@ class CQ
      *  $image 为音乐卡片的图片链接地址（可忽略）
      * @param $type
      * @param $id_or_url
-     * @param null $audio
-     * @param null $title
-     * @param null $content
-     * @param null $image
+     * @param  null   $audio
+     * @param  null   $title
+     * @param  null   $content
+     * @param  null   $image
      * @return string
      */
-    public static function music($type, $id_or_url, $audio = null, $title = null, $content = null, $image = null) {
+    public static function music($type, $id_or_url, $audio = null, $title = null, $content = null, $image = null)
+    {
         switch ($type) {
-            case "qq":
-            case "163":
-            case "xiami":
-                return "[CQ:music,type=$type,id=$id_or_url]";
-            case "custom":
+            case 'qq':
+            case '163':
+            case 'xiami':
+                return "[CQ:music,type={$type},id={$id_or_url}]";
+            case 'custom':
                 if ($title === null || $audio === null) {
-                    Console::warning(zm_internal_errcode("E00035") . "传入CQ码实例的标题和音频链接不能为空！");
-                    return " ";
+                    Console::warning(zm_internal_errcode('E00035') . '传入CQ码实例的标题和音频链接不能为空！');
+                    return ' ';
                 }
-                if ($content === null) $c = "";
-                else $c = ",content=" . self::encode($content, true);
-                if ($image === null) $i = "";
-                else $i = ",image=" . self::encode($image, true);
-                return "[CQ:music,type=custom,url=" .
+                if ($content === null) {
+                    $c = '';
+                } else {
+                    $c = ',content=' . self::encode($content, true);
+                }
+                if ($image === null) {
+                    $i = '';
+                } else {
+                    $i = ',image=' . self::encode($image, true);
+                }
+                return '[CQ:music,type=custom,url=' .
                     self::encode($id_or_url, true) .
-                    ",audio=" . self::encode($audio, true) . ",title=" . self::encode($title, true) . $c . $i .
-                    "]";
+                    ',audio=' . self::encode($audio, true) . ',title=' . self::encode($title, true) . $c . $i .
+                    ']';
             default:
-                Console::warning(zm_internal_errcode("E00035") . "传入的music type($type)错误！");
-                return " ";
+                Console::warning(zm_internal_errcode('E00035') . "传入的music type({$type})错误！");
+                return ' ';
         }
     }
 
-    public static function forward($id) {
-        return "[CQ:forward,id=".self::encode($id)."]";
+    public static function forward($id)
+    {
+        return '[CQ:forward,id=' . self::encode($id) . ']';
     }
 
-    public static function node($user_id, $nickname, $content) {
-        return "[CQ:node,user_id=$user_id,nickname=" . self::encode($nickname, true) . ",content=" . self::encode($content, true) . "]";
+    public static function node($user_id, $nickname, $content)
+    {
+        return "[CQ:node,user_id={$user_id},nickname=" . self::encode($nickname, true) . ',content=' . self::encode($content, true) . ']';
     }
 
-    public static function xml($data) {
-        return "[CQ:xml,data=" . self::encode($data, true) . "]";
+    public static function xml($data)
+    {
+        return '[CQ:xml,data=' . self::encode($data, true) . ']';
     }
 
-    public static function json($data, $resid = 0) {
-        return "[CQ:json,data=" . self::encode($data, true) . ",resid=" . intval($resid) . "]";
+    public static function json($data, $resid = 0)
+    {
+        return '[CQ:json,data=' . self::encode($data, true) . ',resid=' . intval($resid) . ']';
     }
 
-    public static function _custom(string $type_name, $params) {
-        $code = "[CQ:" . $type_name;
+    public static function _custom(string $type_name, $params)
+    {
+        $code = '[CQ:' . $type_name;
         foreach ($params as $k => $v) {
-            $code .= "," . $k . "=" . self::escape($v, true);
+            $code .= ',' . $k . '=' . self::escape($v, true);
         }
-        $code .= "]";
+        $code .= ']';
         return $code;
     }
 
     /**
      * 反转义字符串中的CQ码敏感符号
-     * @param $msg
-     * @param bool $is_content
-     * @return mixed
+     * @param mixed $msg
+     * @param mixed $is_content
      */
-    public static function decode($msg, $is_content = false) {
-        $msg = str_replace(["&amp;", "&#91;", "&#93;"], ["&", "[", "]"], $msg);
-        if ($is_content) $msg = str_replace("&#44;", ",", $msg);
+    public static function decode($msg, $is_content = false)
+    {
+        $msg = str_replace(['&amp;', '&#91;', '&#93;'], ['&', '[', ']'], $msg);
+        if ($is_content) {
+            $msg = str_replace('&#44;', ',', $msg);
+        }
         return $msg;
     }
 
-    public static function replace($str) {
-        $str = str_replace("{{", "[", $str);
-        $str = str_replace("}}", "]", $str);
-        return $str;
+    public static function replace($str)
+    {
+        $str = str_replace('{{', '[', $str);
+        return str_replace('}}', ']', $str);
     }
 
     /**
      * 转义CQ码的特殊字符，同encode
-     * @param $msg
-     * @param bool $is_content
-     * @return mixed
+     * @param mixed $msg
+     * @param mixed $is_content
      */
-    public static function escape($msg, $is_content = false) {
-        $msg = str_replace(["&", "[", "]"], ["&amp;", "&#91;", "&#93;"], $msg);
-        if ($is_content) $msg = str_replace(",", "&#44;", $msg);
+    public static function escape($msg, $is_content = false)
+    {
+        $msg = str_replace(['&', '[', ']'], ['&amp;', '&#91;', '&#93;'], $msg);
+        if ($is_content) {
+            $msg = str_replace(',', '&#44;', $msg);
+        }
         return $msg;
     }
 
     /**
      * 转义CQ码的特殊字符
-     * @param $msg
-     * @param false $is_content
-     * @return mixed
+     * @param mixed $msg
+     * @param mixed $is_content
      */
-    public static function encode($msg, $is_content = false) {
-        $msg = str_replace(["&", "[", "]"], ["&amp;", "&#91;", "&#93;"], $msg);
-        if ($is_content) $msg = str_replace(",", "&#44;", $msg);
+    public static function encode($msg, $is_content = false)
+    {
+        $msg = str_replace(['&', '[', ']'], ['&amp;', '&#91;', '&#93;'], $msg);
+        if ($is_content) {
+            $msg = str_replace(',', '&#44;', $msg);
+        }
         return $msg;
     }
 
@@ -294,12 +314,13 @@ class CQ
      * @param $msg
      * @return string
      */
-    public static function removeCQ($msg) {
-        $final = "";
+    public static function removeCQ($msg)
+    {
+        $final = '';
         $last_end = 0;
         foreach (self::getAllCQ($msg) as $v) {
-            $final .= mb_substr($msg, $last_end, $v["start"] - $last_end);
-            $last_end = $v["end"] + 1;
+            $final .= mb_substr($msg, $last_end, $v['start'] - $last_end);
+            $last_end = $v['end'] + 1;
         }
         $final .= mb_substr($msg, $last_end);
         return $final;
@@ -307,55 +328,58 @@ class CQ
 
     /**
      * 获取消息中第一个CQ码
-     * @param $msg
-     * @param bool $is_object
-     * @return array|CQObject|null
+     * @param mixed $msg
+     * @param mixed $is_object
      */
-    public static function getCQ($msg, $is_object = false) {
-        if (($head = mb_strpos($msg, "[CQ:")) !== false) {
+    public static function getCQ($msg, $is_object = false)
+    {
+        if (($head = mb_strpos($msg, '[CQ:')) !== false) {
             $key_offset = mb_substr($msg, $head);
-            $close = mb_strpos($key_offset, "]");
-            if ($close === false) return null;
-            $content = mb_substr($msg, $head + 4, $close + $head - mb_strlen($msg));
-            $exp = explode(",", $content);
-            $cq["type"] = array_shift($exp);
-            foreach ($exp as $v) {
-                $ss = explode("=", $v);
-                $sk = array_shift($ss);
-                $cq["params"][$sk] = self::decode(implode("=", $ss), true);
+            $close = mb_strpos($key_offset, ']');
+            if ($close === false) {
+                return null;
             }
-            $cq["start"] = $head;
-            $cq["end"] = $close + $head;
+            $content = mb_substr($msg, $head + 4, $close + $head - mb_strlen($msg));
+            $exp = explode(',', $content);
+            $cq['type'] = array_shift($exp);
+            foreach ($exp as $v) {
+                $ss = explode('=', $v);
+                $sk = array_shift($ss);
+                $cq['params'][$sk] = self::decode(implode('=', $ss), true);
+            }
+            $cq['start'] = $head;
+            $cq['end'] = $close + $head;
             return !$is_object ? $cq : CQObject::fromArray($cq);
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
      * 获取消息中所有的CQ码
-     * @param $msg
-     * @param bool $is_object
-     * @return array|CQObject[]
+     * @param mixed $msg
+     * @param mixed $is_object
      */
-    public static function getAllCQ($msg, $is_object = false) {
+    public static function getAllCQ($msg, $is_object = false)
+    {
         $cqs = [];
         $offset = 0;
-        while (($head = mb_strpos(($submsg = mb_substr($msg, $offset)), "[CQ:")) !== false) {
+        while (($head = mb_strpos(($submsg = mb_substr($msg, $offset)), '[CQ:')) !== false) {
             $key_offset = mb_substr($submsg, $head);
-            $tmpmsg = mb_strpos($key_offset, "]");
-            if ($tmpmsg === false) break; // 没闭合，不算CQ码
+            $tmpmsg = mb_strpos($key_offset, ']');
+            if ($tmpmsg === false) {
+                break;
+            } // 没闭合，不算CQ码
             $content = mb_substr($submsg, $head + 4, $tmpmsg + $head - mb_strlen($submsg));
-            $exp = explode(",", $content);
+            $exp = explode(',', $content);
             $cq = [];
-            $cq["type"] = array_shift($exp);
+            $cq['type'] = array_shift($exp);
             foreach ($exp as $v) {
-                $ss = explode("=", $v);
+                $ss = explode('=', $v);
                 $sk = array_shift($ss);
-                $cq["params"][$sk] = self::decode(implode("=", $ss), true);
+                $cq['params'][$sk] = self::decode(implode('=', $ss), true);
             }
-            $cq["start"] = $offset + $head;
-            $cq["end"] = $offset + $tmpmsg + $head;
+            $cq['start'] = $offset + $head;
+            $cq['end'] = $offset + $tmpmsg + $head;
             $offset += $head + $tmpmsg + 1;
             $cqs[] = (!$is_object ? $cq : CQObject::fromArray($cq));
         }

src/ZM/API/CQAPI.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\API;
 
@@ -13,80 +14,89 @@ use ZM\Utils\CoMessage;
 trait CQAPI
 {
     /** @var null|Closure */
-    private static $filter = null;
+    private static $filter;
 
-    public static function registerFilter(callable $callable) {
+    public function __call($name, $arguments)
+    {
+        return false;
+    }
+
+    public static function registerFilter(callable $callable)
+    {
         self::$filter = $callable;
     }
 
+    public function getActionName($suffix, string $method)
+    {
+        $postfix = ($suffix == OneBotV11::API_ASYNC ? '_async' : ($suffix == OneBotV11::API_RATE_LIMITED ? '_rate_limited' : ''));
+        $func_name = strtolower(preg_replace('/(?<=[a-z])([A-Z])/', '_$1', $method));
+        return $func_name . $postfix;
+    }
+
     /**
      * @param $connection
      * @param $reply
      * @param |null $function
-     * @return bool|array
+     * @return array|bool
      */
-    private function processAPI($connection, $reply, $function = null) {
+    private function processAPI($connection, $reply, $function = null)
+    {
         if (is_callable(self::$filter)) {
             $reply2 = call_user_func(self::$filter, $reply);
-            if (is_bool($reply2)) return $reply2;
-            else $reply = $reply2;
+            if (is_bool($reply2)) {
+                return $reply2;
+            }
+            $reply = $reply2;
         }
-        if ($connection->getOption("type") === CONN_WEBSOCKET)
+        if ($connection->getOption('type') === CONN_WEBSOCKET) {
             return $this->processWebsocketAPI($connection, $reply, $function);
-        else
-            return $this->processHttpAPI($connection, $reply, $function);
+        }
+
+        return $this->processHttpAPI($connection, $reply, $function);
     }
 
-    private function processWebsocketAPI($connection, $reply, $function = false) {
-        $api_id = ZMAtomic::get("wait_msg_id")->add(1);
-        $reply["echo"] = $api_id;
+    private function processWebsocketAPI($connection, $reply, $function = false)
+    {
+        $api_id = ZMAtomic::get('wait_msg_id')->add(1);
+        $reply['echo'] = $api_id;
         if (server()->push($connection->getFd(), json_encode($reply))) {
             if ($function === true) {
                 $obj = [
-                    "data" => $reply,
-                    "time" => microtime(true),
-                    "self_id" => $connection->getOption("connect_id"),
-                    "echo" => $api_id
+                    'data' => $reply,
+                    'time' => microtime(true),
+                    'self_id' => $connection->getOption('connect_id'),
+                    'echo' => $api_id,
                 ];
-                return CoMessage::yieldByWS($obj, ["echo"], 30);
+                return CoMessage::yieldByWS($obj, ['echo'], 30);
             }
             return true;
-        } else {
-            Console::warning(zm_internal_errcode("E00036") . "CQAPI send failed, websocket push error.");
-            $response = [
-                "status" => "failed",
-                "retcode" => -1000,
-                "data" => null,
-                "self_id" => $connection->getOption("connect_id")
-            ];
-            SpinLock::lock("wait_api");
-            $r = LightCacheInside::get("wait_api", "wait_api");
-            unset($r[$reply["echo"]]);
-            LightCacheInside::set("wait_api", "wait_api", $r);
-            SpinLock::unlock("wait_api");
-            if ($function === true) return $response;
-            return false;
         }
+        Console::warning(zm_internal_errcode('E00036') . 'CQAPI send failed, websocket push error.');
+        $response = [
+            'status' => 'failed',
+            'retcode' => -1000,
+            'data' => null,
+            'self_id' => $connection->getOption('connect_id'),
+        ];
+        SpinLock::lock('wait_api');
+        $r = LightCacheInside::get('wait_api', 'wait_api');
+        unset($r[$reply['echo']]);
+        LightCacheInside::set('wait_api', 'wait_api', $r);
+        SpinLock::unlock('wait_api');
+        if ($function === true) {
+            return $response;
+        }
+        return false;
     }
 
     /**
      * @param $connection
      * @param $reply
      * @param null $function
-     * @return bool
      * @noinspection PhpUnusedParameterInspection
      */
-    private function processHttpAPI($connection, $reply, $function = null): bool {
-        return false;
-    }
-
-    public function getActionName($suffix, string $method) {
-        $postfix = ($suffix == OneBotV11::API_ASYNC ? '_async' : ($suffix == OneBotV11::API_RATE_LIMITED ? '_rate_limited' : ''));
-        $func_name = strtolower(preg_replace('/(?<=[a-z])([A-Z])/', '_$1', $method));
-        return $func_name . $postfix;
-    }
-
-    public function __call($name, $arguments) {
+    private function processHttpAPI($connection, $reply, $function = null): bool
+    {
         return false;
     }
 }

src/ZM/API/GoCqhttpAPIV11.php

@@ -1,15 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace ZM\API;
 
 class GoCqhttpAPIV11
 {
-    const SUPPORT_VERSION = '1.0.0-beta8';
-
     use CQAPI;
 
+    public const SUPPORT_VERSION = '1.0.0-beta8';
+
     private $connection;
+
     private $callback;
+
     private $prefix;
 
     public function __construct($connection, $callback, $prefix)
@@ -22,90 +26,95 @@ class GoCqhttpAPIV11
     /**
      * 获取频道系统内BOT的资料
      * 响应字段：nickname, tiny_id, avatar_url
-     * @link https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E7%B3%BB%E7%BB%9F%E5%86%85bot%E7%9A%84%E8%B5%84%E6%96%99
+     * @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E7%B3%BB%E7%BB%9F%E5%86%85bot%E7%9A%84%E8%B5%84%E6%96%99
      * @return array|bool
      */
     public function getGuildServiceProfile()
     {
         return $this->processAPI($this->connection, [
-            'action' => $this->getActionName($this->prefix, __FUNCTION__)
+            'action' => $this->getActionName($this->prefix, __FUNCTION__),
         ], $this->callback);
     }
 
     /**
      * 获取频道列表
-     * @link https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E5%88%97%E8%A1%A8
+     * @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E5%88%97%E8%A1%A8
      * @return array|bool
      */
-    public function getGuildList() {
+    public function getGuildList()
+    {
         return $this->processAPI($this->connection, [
-            'action' => $this->getActionName($this->prefix, __FUNCTION__)
+            'action' => $this->getActionName($this->prefix, __FUNCTION__),
         ], $this->callback);
     }
 
     /**
      * 通过访客获取频道元数据
-     * @link https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E9%80%9A%E8%BF%87%E8%AE%BF%E5%AE%A2%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E5%85%83%E6%95%B0%E6%8D%AE
+     * @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E9%80%9A%E8%BF%87%E8%AE%BF%E5%AE%A2%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E5%85%83%E6%95%B0%E6%8D%AE
      * @param $guild_id
      * @return array|bool
      */
-    public function getGuildMetaByGuest($guild_id) {
+    public function getGuildMetaByGuest($guild_id)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
-                'guild_id' => $guild_id
-            ]
+                'guild_id' => $guild_id,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取子频道列表
-     * @link https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E5%AD%90%E9%A2%91%E9%81%93%E5%88%97%E8%A1%A8
+     * @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E5%AD%90%E9%A2%91%E9%81%93%E5%88%97%E8%A1%A8
      * @param $guild_id
-     * @param false $no_cache
+     * @param  false      $no_cache
      * @return array|bool
      */
-    public function getGuildChannelList($guild_id, bool $no_cache = false) {
+    public function getGuildChannelList($guild_id, bool $no_cache = false)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'guild_id' => $guild_id,
-                'no_cache' => $no_cache
-            ]
+                'no_cache' => $no_cache,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取频道成员列表
-     * @link https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
+     * @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
      * @param $guild_id
      * @return array|bool
      */
-    public function getGuildMembers($guild_id) {
+    public function getGuildMembers($guild_id)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
-                'guild_id' => $guild_id
-            ]
+                'guild_id' => $guild_id,
+            ],
         ], $this->callback);
     }
 
     /**
      * 发送信息到子频道
-     * @link https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E5%8F%91%E9%80%81%E4%BF%A1%E6%81%AF%E5%88%B0%E5%AD%90%E9%A2%91%E9%81%93
+     * @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E5%8F%91%E9%80%81%E4%BF%A1%E6%81%AF%E5%88%B0%E5%AD%90%E9%A2%91%E9%81%93
      * @param $guild_id
      * @param $channel_id
      * @param $message
      * @return array|bool
      */
-    public function sendGuildChannelMsg($guild_id, $channel_id, $message) {
+    public function sendGuildChannelMsg($guild_id, $channel_id, $message)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'guild_id' => $guild_id,
                 'channel_id' => $channel_id,
-                'message' => $message
-            ]
+                'message' => $message,
+            ],
         ], $this->callback);
     }
 }

src/ZM/API/OneBotV11.php

@@ -1,5 +1,8 @@
-<?php /** @noinspection PhpUnused */
+<?php
 
+/** @noinspection PhpUnused */
+
+declare(strict_types=1);
 
 namespace ZM\API;
 
@@ -11,50 +14,64 @@ use ZM\Exception\ZMKnownException;
 /**
  * OneBot V11 的 API 实现类
  * Class OneBotV11
- * @package ZM\API
- * @since 2.5
+ * @since 2.5.0
  */
 class OneBotV11
 {
     use CQAPI;
 
-    const API_ASYNC = 1;
-    const API_NORMAL = 0;
-    const API_RATE_LIMITED = 2;
+    public const API_ASYNC = 1;
 
-    /** @var ConnectionObject|null */
+    public const API_NORMAL = 0;
+
+    public const API_RATE_LIMITED = 2;
+
+    /** @var null|ConnectionObject */
     protected $connection;
 
     protected $callback = true;
+
     protected $prefix = 0;
 
-    /**
-     * @param $robot_id
-     * @return ZMRobot
-     * @throws RobotNotFoundException
-     */
-    public static function get($robot_id) {
-        $r = ManagerGM::getAllByName('qq');
-        foreach ($r as $v) {
-            if ($v->getOption('connect_id') == $robot_id) return new ZMRobot($v);
-        }
-        throw new RobotNotFoundException("机器人 " . $robot_id . " 未连接到框架！");
+    public function __construct(ConnectionObject $connection)
+    {
+        $this->connection = $connection;
     }
 
     /**
-     * @return ZMRobot
+     * @param $robot_id
      * @throws RobotNotFoundException
+     * @return ZMRobot
      */
-    public static function getRandom() {
+    public static function get($robot_id)
+    {
         $r = ManagerGM::getAllByName('qq');
-        if ($r == []) throw new RobotNotFoundException("没有任何机器人连接到框架！");
+        foreach ($r as $v) {
+            if ($v->getOption('connect_id') == $robot_id) {
+                return new ZMRobot($v);
+            }
+        }
+        throw new RobotNotFoundException('机器人 ' . $robot_id . ' 未连接到框架！');
+    }
+
+    /**
+     * @throws RobotNotFoundException
+     * @return ZMRobot
+     */
+    public static function getRandom()
+    {
+        $r = ManagerGM::getAllByName('qq');
+        if ($r == []) {
+            throw new RobotNotFoundException('没有任何机器人连接到框架！');
+        }
         return new ZMRobot($r[array_rand($r)]);
     }
 
     /**
      * @return ZMRobot[]
      */
-    public static function getAllRobot() {
+    public static function getAllRobot()
+    {
         $r = ManagerGM::getAllByName('qq');
         $obj = [];
         foreach ($r as $v) {
@@ -63,21 +80,20 @@ class OneBotV11
         return $obj;
     }
 
-    public function __construct(ConnectionObject $connection) {
-        $this->connection = $connection;
-    }
-
-    public function setCallback($callback = true) {
+    public function setCallback($callback = true)
+    {
         $this->callback = $callback;
         return $this;
     }
 
-    public function setPrefix($prefix = self::API_NORMAL) {
+    public function setPrefix($prefix = self::API_NORMAL)
+    {
         $this->prefix = $prefix;
         return $this;
     }
 
-    public function getSelfId() {
+    public function getSelfId()
+    {
         return $this->connection->getOption('connect_id');
     }
 
@@ -85,615 +101,629 @@ class OneBotV11
 
     /**
      * 发送私聊消息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
      * @param $user_id
      * @param $message
-     * @param bool $auto_escape
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function sendPrivateMsg($user_id, $message, $auto_escape = false) {
+    public function sendPrivateMsg($user_id, $message, bool $auto_escape = false)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'user_id' => $user_id,
                 'message' => $message,
-                'auto_escape' => $auto_escape
-            ]
+                'auto_escape' => $auto_escape,
+            ],
         ], $this->callback);
     }
 
     /**
      * 发送群消息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
      * @param $group_id
      * @param $message
-     * @param bool $auto_escape
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function sendGroupMsg($group_id, $message, $auto_escape = false) {
+    public function sendGroupMsg($group_id, $message, bool $auto_escape = false)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
                 'message' => $message,
-                'auto_escape' => $auto_escape
-            ]
+                'auto_escape' => $auto_escape,
+            ],
         ], $this->callback);
     }
 
     /**
      * 发送消息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF
      * @param $message_type
      * @param $target_id
      * @param $message
-     * @param bool $auto_escape
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function sendMsg($message_type, $target_id, $message, $auto_escape = false) {
+    public function sendMsg($message_type, $target_id, $message, bool $auto_escape = false)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'message_type' => $message_type,
                 ($message_type == 'private' ? 'user' : $message_type) . '_id' => $target_id,
                 'message' => $message,
-                'auto_escape' => $auto_escape
-            ]
+                'auto_escape' => $auto_escape,
+            ],
         ], $this->callback);
     }
 
     /**
      * 撤回消息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF
      * @param $message_id
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function deleteMsg($message_id) {
+    public function deleteMsg($message_id)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
-                'message_id' => $message_id
-            ]
+                'message_id' => $message_id,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取消息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_msg-%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_msg-%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF
      * @param $message_id
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function getMsg($message_id) {
+    public function getMsg($message_id)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
-                'message_id' => $message_id
-            ]
+                'message_id' => $message_id,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取合并转发消息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_forward_msg-%E8%8E%B7%E5%8F%96%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_forward_msg-%E8%8E%B7%E5%8F%96%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF
      * @param $id
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function getForwardMsg($id) {
+    public function getForwardMsg($id)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
-                'id' => $id
-            ]
+                'id' => $id,
+            ],
         ], $this->callback);
     }
 
     /**
      * 发送好友赞
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_like-%E5%8F%91%E9%80%81%E5%A5%BD%E5%8F%8B%E8%B5%9E
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_like-%E5%8F%91%E9%80%81%E5%A5%BD%E5%8F%8B%E8%B5%9E
      * @param $user_id
-     * @param int $times
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function sendLike($user_id, $times = 1) {
+    public function sendLike($user_id, int $times = 1)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'user_id' => $user_id,
-                'times' => $times
-            ]
+                'times' => $times,
+            ],
         ], $this->callback);
     }
 
     /**
      * 群组踢人
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
      * @param $group_id
      * @param $user_id
-     * @param bool $reject_add_request
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupKick($group_id, $user_id, $reject_add_request = false) {
+    public function setGroupKick($group_id, $user_id, bool $reject_add_request = false)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
                 'user_id' => $user_id,
-                'reject_add_request' => $reject_add_request
-            ]
+                'reject_add_request' => $reject_add_request,
+            ],
         ], $this->callback);
     }
 
     /**
      * 群组单人禁言
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80
      * @param $group_id
      * @param $user_id
-     * @param $duration
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupBan($group_id, $user_id, $duration = 1800) {
+    public function setGroupBan($group_id, $user_id, int $duration = 1800)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
                 'user_id' => $user_id,
-                'duration' => $duration
-            ]
+                'duration' => $duration,
+            ],
         ], $this->callback);
     }
 
     /**
      * 群组匿名用户禁言
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_anonymous_ban-%E7%BE%A4%E7%BB%84%E5%8C%BF%E5%90%8D%E7%94%A8%E6%88%B7%E7%A6%81%E8%A8%80
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_anonymous_ban-%E7%BE%A4%E7%BB%84%E5%8C%BF%E5%90%8D%E7%94%A8%E6%88%B7%E7%A6%81%E8%A8%80
      * @param $group_id
      * @param $anonymous_or_flag
-     * @param int $duration
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupAnonymousBan($group_id, $anonymous_or_flag, $duration = 1800) {
+    public function setGroupAnonymousBan($group_id, $anonymous_or_flag, int $duration = 1800)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
                 (is_string($anonymous_or_flag) ? 'flag' : 'anonymous') => $anonymous_or_flag,
-                'duration' => $duration
-            ]
+                'duration' => $duration,
+            ],
         ], $this->callback);
     }
 
     /**
      * 群组全员禁言
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80
      * @param $group_id
-     * @param bool $enable
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupWholeBan($group_id, $enable = true) {
+    public function setGroupWholeBan($group_id, bool $enable = true)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
-                'enable' => $enable
-            ]
+                'enable' => $enable,
+            ],
         ], $this->callback);
     }
 
     /**
      * 群组设置管理员
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
      * @param $group_id
      * @param $user_id
-     * @param bool $enable
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupAdmin($group_id, $user_id, $enable = true) {
+    public function setGroupAdmin($group_id, $user_id, bool $enable = true)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
                 'user_id' => $user_id,
-                'enable' => $enable
-            ]
+                'enable' => $enable,
+            ],
         ], $this->callback);
     }
 
     /**
      * 群组匿名
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_anonymous-%E7%BE%A4%E7%BB%84%E5%8C%BF%E5%90%8D
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_anonymous-%E7%BE%A4%E7%BB%84%E5%8C%BF%E5%90%8D
      * @param $group_id
-     * @param bool $enable
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupAnonymous($group_id, $enable = true) {
+    public function setGroupAnonymous($group_id, bool $enable = true)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
-                'enable' => $enable
-            ]
+                'enable' => $enable,
+            ],
         ], $this->callback);
     }
 
     /**
      * 设置群名片（群备注）
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8
      * @param $group_id
      * @param $user_id
-     * @param string $card
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupCard($group_id, $user_id, $card = "") {
+    public function setGroupCard($group_id, $user_id, string $card = '')
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
                 'user_id' => $user_id,
-                'card' => $card
-            ]
+                'card' => $card,
+            ],
         ], $this->callback);
     }
 
     /**
      * 设置群名
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D
      * @param $group_id
      * @param $group_name
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupName($group_id, $group_name) {
+    public function setGroupName($group_id, $group_name)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
-                'group_name' => $group_name
-            ]
+                'group_name' => $group_name,
+            ],
         ], $this->callback);
     }
 
     /**
      * 退出群组
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84
      * @param $group_id
-     * @param bool $is_dismiss
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupLeave($group_id, $is_dismiss = false) {
+    public function setGroupLeave($group_id, bool $is_dismiss = false)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
-                'is_dismiss' => $is_dismiss
-            ]
+                'is_dismiss' => $is_dismiss,
+            ],
         ], $this->callback);
     }
 
     /**
      * 设置群组专属头衔
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94
      * @param $group_id
      * @param $user_id
-     * @param string $special_title
-     * @param int $duration
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupSpecialTitle($group_id, $user_id, $special_title = "", $duration = -1) {
+    public function setGroupSpecialTitle($group_id, $user_id, string $special_title = '', int $duration = -1)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
                 'user_id' => $user_id,
                 'special_title' => $special_title,
-                'duration' => $duration
-            ]
+                'duration' => $duration,
+            ],
         ], $this->callback);
     }
 
     /**
      * 处理加好友请求
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
      * @param $flag
-     * @param bool $approve
-     * @param string $remark
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setFriendAddRequest($flag, $approve = true, $remark = "") {
+    public function setFriendAddRequest($flag, bool $approve = true, string $remark = '')
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'flag' => $flag,
                 'approve' => $approve,
-                'remark' => $remark
-            ]
+                'remark' => $remark,
+            ],
         ], $this->callback);
     }
 
     /**
      * 处理加群请求／邀请
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
      * @param $flag
      * @param $sub_type
-     * @param bool $approve
-     * @param string $reason
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function setGroupAddRequest($flag, $sub_type, $approve = true, $reason = "") {
+    public function setGroupAddRequest($flag, $sub_type, bool $approve = true, string $reason = '')
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'flag' => $flag,
                 'sub_type' => $sub_type,
                 'approve' => $approve,
-                'reason' => $reason
-            ]
+                'reason' => $reason,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取登录号信息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF
+     * @return null|array|bool
      */
-    public function getLoginInfo() {
+    public function getLoginInfo()
+    {
         return $this->processAPI($this->connection, ['action' => $this->getActionName($this->prefix, __FUNCTION__)], $this->callback);
     }
 
     /**
      * 获取陌生人信息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF
      * @param $user_id
-     * @param bool $no_cache
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function getStrangerInfo($user_id, bool $no_cache) {
+    public function getStrangerInfo($user_id, bool $no_cache = false)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'user_id' => $user_id,
-                'no_cache' => $no_cache
-            ]
+                'no_cache' => $no_cache,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取好友列表
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
+     * @return null|array|bool
      */
-    public function getFriendList() {
+    public function getFriendList()
+    {
         return $this->processAPI($this->connection, [
-            'action' => $this->getActionName($this->prefix, __FUNCTION__)
+            'action' => $this->getActionName($this->prefix, __FUNCTION__),
         ], $this->callback);
     }
 
     /**
      * 获取群信息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF
      * @param $group_id
-     * @param bool $no_cache
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function getGroupInfo($group_id, $no_cache = false) {
+    public function getGroupInfo($group_id, bool $no_cache = false)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
-                'no_cache' => $no_cache
-            ]
+                'no_cache' => $no_cache,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取群列表
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
+     * @return null|array|bool
      */
-    public function getGroupList() {
+    public function getGroupList()
+    {
         return $this->processAPI($this->connection, [
-            'action' => $this->getActionName($this->prefix, __FUNCTION__)
+            'action' => $this->getActionName($this->prefix, __FUNCTION__),
         ], $this->callback);
     }
 
     /**
      * 获取群成员信息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
      * @param $group_id
      * @param $user_id
-     * @param bool $no_cache
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function getGroupMemberInfo($group_id, $user_id, bool $no_cache) {
+    public function getGroupMemberInfo($group_id, $user_id, bool $no_cache = false)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
                 'user_id' => $user_id,
-                'no_cache' => $no_cache
-            ]
+                'no_cache' => $no_cache,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取群成员列表
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
      * @param $group_id
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function getGroupMemberList($group_id) {
+    public function getGroupMemberList($group_id)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
-                'group_id' => $group_id
-            ]
+                'group_id' => $group_id,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取群荣誉信息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
      * @param $group_id
      * @param $type
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function getGroupHonorInfo($group_id, $type) {
+    public function getGroupHonorInfo($group_id, $type)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'group_id' => $group_id,
-                'type' => $type
-            ]
+                'type' => $type,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取 CSRF Token
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_csrf_token-%E8%8E%B7%E5%8F%96-csrf-token
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_csrf_token-%E8%8E%B7%E5%8F%96-csrf-token
+     * @return null|array|bool
      */
-    public function getCsrfToken() {
+    public function getCsrfToken()
+    {
         return $this->processAPI($this->connection, [
-            'action' => $this->getActionName($this->prefix, __FUNCTION__)
+            'action' => $this->getActionName($this->prefix, __FUNCTION__),
         ], $this->callback);
     }
 
     /**
      * 获取 QQ 相关接口凭证
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_credentials-%E8%8E%B7%E5%8F%96-qq-%E7%9B%B8%E5%85%B3%E6%8E%A5%E5%8F%A3%E5%87%AD%E8%AF%81
-     * @param string $domain
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_credentials-%E8%8E%B7%E5%8F%96-qq-%E7%9B%B8%E5%85%B3%E6%8E%A5%E5%8F%A3%E5%87%AD%E8%AF%81
+     * @return null|array|bool
      */
-    public function getCredentials($domain = "") {
+    public function getCredentials(string $domain = '')
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
-                'domain' => $domain
-            ]
+                'domain' => $domain,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取语音
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_record-%E8%8E%B7%E5%8F%96%E8%AF%AD%E9%9F%B3
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_record-%E8%8E%B7%E5%8F%96%E8%AF%AD%E9%9F%B3
      * @param $file
      * @param $out_format
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function getRecord($file, $out_format) {
+    public function getRecord($file, $out_format)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
                 'file' => $file,
-                'out_format' => $out_format
-            ]
+                'out_format' => $out_format,
+            ],
         ], $this->callback);
     }
 
     /**
      * 获取图片
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_image-%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_image-%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87
      * @param $file
-     * @return array|bool|null
+     * @return null|array|bool
      */
-    public function getImage($file) {
+    public function getImage($file)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
-                'file' => $file
-            ]
+                'file' => $file,
+            ],
         ], $this->callback);
     }
 
     /**
      * 检查是否可以发送图片
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87
+     * @return null|array|bool
      */
-    public function canSendImage() {
+    public function canSendImage()
+    {
         return $this->processAPI($this->connection, [
-            'action' => $this->getActionName($this->prefix, __FUNCTION__)
+            'action' => $this->getActionName($this->prefix, __FUNCTION__),
         ], $this->callback);
     }
 
     /**
      * 检查是否可以发送语音
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3
+     * @return null|array|bool
      */
-    public function canSendRecord() {
+    public function canSendRecord()
+    {
         return $this->processAPI($this->connection, [
-            'action' => $this->getActionName($this->prefix, __FUNCTION__)
+            'action' => $this->getActionName($this->prefix, __FUNCTION__),
         ], $this->callback);
     }
 
     /**
      * 获取运行状态
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_status-%E8%8E%B7%E5%8F%96%E8%BF%90%E8%A1%8C%E7%8A%B6%E6%80%81
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_status-%E8%8E%B7%E5%8F%96%E8%BF%90%E8%A1%8C%E7%8A%B6%E6%80%81
+     * @return null|array|bool
      */
-    public function getStatus() {
+    public function getStatus()
+    {
         return $this->processAPI($this->connection, [
-            'action' => $this->getActionName($this->prefix, __FUNCTION__)
+            'action' => $this->getActionName($this->prefix, __FUNCTION__),
         ], $this->callback);
     }
 
     /**
      * 获取版本信息
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF
+     * @return null|array|bool
      */
-    public function getVersionInfo() {
+    public function getVersionInfo()
+    {
         return $this->processAPI($this->connection, [
-            'action' => $this->getActionName($this->prefix, __FUNCTION__)
+            'action' => $this->getActionName($this->prefix, __FUNCTION__),
         ], $this->callback);
     }
 
     /**
      * 重启 OneBot 实现
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0
-     * @param int $delay
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0
+     * @return null|array|bool
      */
-    public function setRestart($delay = 0) {
+    public function setRestart(int $delay = 0)
+    {
         return $this->processAPI($this->connection, [
             'action' => $this->getActionName($this->prefix, __FUNCTION__),
             'params' => [
-                'delay' => $delay
-            ]
+                'delay' => $delay,
+            ],
         ], $this->callback);
     }
 
     /**
      * 清理缓存
-     * @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#clean_cache-%E6%B8%85%E7%90%86%E7%BC%93%E5%AD%98
-     * @return array|bool|null
+     * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#clean_cache-%E6%B8%85%E7%90%86%E7%BC%93%E5%AD%98
+     * @return null|array|bool
      */
-    public function cleanCache() {
+    public function cleanCache()
+    {
         return $this->processAPI($this->connection, [
-            'action' => $this->getActionName($this->prefix, __FUNCTION__)
+            'action' => $this->getActionName($this->prefix, __FUNCTION__),
         ], $this->callback);
     }
 
     /**
      * 获取内置支持的扩展API对象
      * 现支持 go-cqhttp 的扩展API
-     * @param string $package_name
-     * @return mixed
      * @throws ZMKnownException
+     * @return mixed
      */
-    public function getExtendedAPI(string $package_name = 'go-cqhttp') {
+    public function getExtendedAPI(string $package_name = 'go-cqhttp')
+    {
         $table = [
             'go-cqhttp' => GoCqhttpAPIV11::class,
         ];
         if (isset($table[$package_name])) {
             return new $table[$package_name]($this->connection, $this->callback, $this->prefix);
-        } else {
-            throw new ZMKnownException(zm_internal_errcode('E00071'), '无法找到对应的调用扩展类');
         }
+        throw new ZMKnownException(zm_internal_errcode('E00071'), '无法找到对应的调用扩展类');
     }
 
-    public function callExtendedAPI($action, $params = []) {
+    public function callExtendedAPI($action, $params = [])
+    {
         return $this->processAPI($this->connection, [
             'action' => $action,
-            'params' => $params
+            'params' => $params,
         ], $this->callback);
     }
-}
+}

src/ZM/API/TuringAPI.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\API;
 
-
 use Swoole\Coroutine\Http\Client;
 use ZM\Console\Console;
 
@@ -16,103 +16,113 @@ class TuringAPI
      * @param $api
      * @return string
      */
-    public static function getTuringMsg($msg, $user_id, $api) {
+    public static function getTuringMsg($msg, $user_id, $api)
+    {
         $origin = $msg;
         if (($cq = CQ::getCQ($msg)) !== null) {//如有CQ码则去除
-            if ($cq["type"] == "image") {
-                $url = $cq["params"]["url"];
-                $msg = str_replace(mb_substr($msg, $cq["start"], $cq["end"] - $cq["start"] + 1), "", $msg);
+            if ($cq['type'] == 'image') {
+                $url = $cq['params']['url'];
+                $msg = str_replace(mb_substr($msg, $cq['start'], $cq['end'] - $cq['start'] + 1), '', $msg);
             }
             $msg = trim($msg);
         }
         //构建将要发送的json包给图灵
         $content = [
-            "reqType" => 0,
-            "userInfo" => [
-                "apiKey" => $api,
-                "userId" => $user_id
-            ]
+            'reqType' => 0,
+            'userInfo' => [
+                'apiKey' => $api,
+                'userId' => $user_id,
+            ],
         ];
-        if ($msg != "") {
-            $content["perception"]["inputText"]["text"] = $msg;
+        if ($msg != '') {
+            $content['perception']['inputText']['text'] = $msg;
         }
         $msg = trim($msg);
-        if (mb_strlen($msg) < 1 && !isset($url)) return "请说出你想说的话";
-        if (isset($url)) {
-            $content["perception"]["inputImage"]["url"] = $url;
-            $content["reqType"] = 1;
+        if (mb_strlen($msg) < 1 && !isset($url)) {
+            return '请说出你想说的话';
         }
-        if (!isset($content["perception"])) return "请说出你想说的话";
-        $client = new Client("openapi.tuling123.com", 80);
-        $client->setHeaders(["Content-type" => "application/json"]);
-        $client->post("/openapi/api/v2", json_encode($content, JSON_UNESCAPED_UNICODE));
+        if (isset($url)) {
+            $content['perception']['inputImage']['url'] = $url;
+            $content['reqType'] = 1;
+        }
+        if (!isset($content['perception'])) {
+            return '请说出你想说的话';
+        }
+        $client = new Client('openapi.tuling123.com', 80);
+        $client->setHeaders(['Content-type' => 'application/json']);
+        $client->post('/openapi/api/v2', json_encode($content, JSON_UNESCAPED_UNICODE));
         $api_return = json_decode($client->body, true);
-        if (!isset($api_return["intent"]["code"])) return "XD 哎呀，我脑子突然短路了，请稍后再问我吧！";
+        if (!isset($api_return['intent']['code'])) {
+            return 'XD 哎呀，我脑子突然短路了，请稍后再问我吧！';
+        }
         $status = self::getResultStatus($api_return);
         if ($status !== true) {
-            if ($status == "err:输入文本内容超长(上限150)") return "你的话太多了！！！";
-            if ($api_return["intent"]["code"] == 4003) {
-                return "哎呀，我刚才有点走神了，可能忘记你说什么了，可以重说一遍吗";
+            if ($status == 'err:输入文本内容超长(上限150)') {
+                return '你的话太多了！！！';
             }
-            Console::error(zm_internal_errcode("E00038") . "图灵机器人发送错误！\n错误原始内容：" . $origin . "\n来自：" . $user_id . "\n错误信息：" . $status);
+            if ($api_return['intent']['code'] == 4003) {
+                return '哎呀，我刚才有点走神了，可能忘记你说什么了，可以重说一遍吗';
+            }
+            Console::error(zm_internal_errcode('E00038') . "图灵机器人发送错误！\n错误原始内容：" . $origin . "\n来自：" . $user_id . "\n错误信息：" . $status);
             //echo json_encode($r, 128|256);
-            return "哎呀，我刚才有点走神了，要不一会儿换一种问题试试？";
+            return '哎呀，我刚才有点走神了，要不一会儿换一种问题试试？';
         }
-        $result = $api_return["results"];
+        $result = $api_return['results'];
         //Console::info(Console::setColor(json_encode($result, 128 | 256), "green"));
-        $final = "";
+        $final = '';
         foreach ($result as $v) {
-            switch ($v["resultType"]) {
-                case "url":
-                    $final .= "\n" . $v["values"]["url"];
+            switch ($v['resultType']) {
+                case 'url':
+                    $final .= "\n" . $v['values']['url'];
                     break;
-                case "text":
-                    $final .= "\n" . $v["values"]["text"];
+                case 'text':
+                    $final .= "\n" . $v['values']['text'];
                     break;
-                case "image":
-                    $final .= "\n" . CQ::image($v["values"]["image"]);
+                case 'image':
+                    $final .= "\n" . CQ::image($v['values']['image']);
                     break;
             }
         }
         return trim($final);
     }
 
-    public static function getResultStatus($r) {
-        switch ($r["intent"]["code"]) {
+    public static function getResultStatus($r)
+    {
+        switch ($r['intent']['code']) {
             case 5000:
-                return "err:无解析结果";
+                return 'err:无解析结果';
             case 4000:
             case 6000:
-                return "err:暂不支持该功能";
+                return 'err:暂不支持该功能';
             case 4001:
-                return "err:加密方式错误";
+                return 'err:加密方式错误';
             case 4005:
             case 4002:
-                return "err:无功能权限";
+                return 'err:无功能权限';
             case 4003:
-                return "err:该apikey没有可用请求次数";
+                return 'err:该apikey没有可用请求次数';
             case 4007:
-                return "err:apikey不合法";
+                return 'err:apikey不合法';
             case 4100:
-                return "err:userid获取失败";
+                return 'err:userid获取失败';
             case 4200:
-                return "err:上传格式错误";
+                return 'err:上传格式错误';
             case 4300:
-                return "err:批量操作超过限制";
+                return 'err:批量操作超过限制';
             case 4400:
-                return "err:没有上传合法userid";
+                return 'err:没有上传合法userid';
             case 4500:
-                return "err:userid申请个数超过限制";
+                return 'err:userid申请个数超过限制';
             case 4600:
-                return "err:输入内容为空";
+                return 'err:输入内容为空';
             case 4602:
-                return "err:输入文本内容超长(上限150)";
+                return 'err:输入文本内容超长(上限150)';
             case 7002:
-                return "err:上传信息失败";
+                return 'err:上传信息失败';
             case 8008:
-                return "err:服务器错误";
+                return 'err:服务器错误';
             default:
                 return true;
         }
     }
-}
+}

src/ZM/API/ZMRobot.php

@@ -1,17 +1,14 @@
-<?php /** @noinspection PhpMissingReturnTypeInspection */
-
-/** @noinspection PhpUnused */
+<?php
 
+declare(strict_types=1);
 
 namespace ZM\API;
 
 /**
  * Class ZMRobot
- * @package ZM\Utils
  * @since 1.2
  * @version V11
  */
 class ZMRobot extends OneBotV11
 {
-
 }

src/ZM/Annotation/AnnotationBase.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation;
 
-
 use Closure;
 
 abstract class AnnotationBase
@@ -12,18 +12,27 @@ abstract class AnnotationBase
 
     public $class;
 
-    public function __toString() {
-        $str = __CLASS__ . ": ";
+    public function __toString()
+    {
+        $str = __CLASS__ . ': ';
         foreach ($this as $k => $v) {
-            $str .= "\n\t" . $k . " => ";
-            if (is_string($v)) $str .= "\"$v\"";
-            elseif (is_numeric($v)) $str .= $v;
-            elseif (is_bool($v)) $str .= ($v ? "TRUE" : "FALSE");
-            elseif (is_array($v)) $str .= json_encode($v, JSON_UNESCAPED_UNICODE);
-            elseif ($v instanceof Closure) $str .= "@AnonymousFunction";
-            elseif (is_null($v)) $str .= "NULL";
-            else $str .= "@Unknown";
+            $str .= "\n\t" . $k . ' => ';
+            if (is_string($v)) {
+                $str .= "\"{$v}\"";
+            } elseif (is_numeric($v)) {
+                $str .= $v;
+            } elseif (is_bool($v)) {
+                $str .= ($v ? 'TRUE' : 'FALSE');
+            } elseif (is_array($v)) {
+                $str .= json_encode($v, JSON_UNESCAPED_UNICODE);
+            } elseif ($v instanceof Closure) {
+                $str .= '@AnonymousFunction';
+            } elseif (is_null($v)) {
+                $str .= 'NULL';
+            } else {
+                $str .= '@Unknown';
+            }
         }
         return $str;
     }
-}
+}

src/ZM/Annotation/AnnotationParser.php

@@ -1,13 +1,10 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use ZM\Annotation\CQ\CQCommand;
-use ZM\Annotation\Interfaces\ErgodicAnnotation;
-use ZM\Config\ZMConfig;
-use ZM\Console\Console;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionMethod;
@@ -17,8 +14,11 @@ use ZM\Annotation\Http\HandleException;
 use ZM\Annotation\Http\Middleware;
 use ZM\Annotation\Http\MiddlewareClass;
 use ZM\Annotation\Http\RequestMapping;
+use ZM\Annotation\Interfaces\ErgodicAnnotation;
 use ZM\Annotation\Interfaces\Level;
 use ZM\Annotation\Module\Closed;
+use ZM\Config\ZMConfig;
+use ZM\Console\Console;
 use ZM\Exception\AnnotationException;
 use ZM\Utils\Manager\RouteManager;
 use ZM\Utils\ZMUtil;
@@ -30,23 +30,27 @@ class AnnotationParser
     private $start_time;
 
     private $annotation_map = [];
+
     private $middleware_map = [];
+
     private $middlewares = [];
 
     /** @var null|AnnotationReader */
-    private $reader = null;
+    private $reader;
+
     private $req_mapping = [];
 
     /**
      * AnnotationParser constructor.
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->start_time = microtime(true);
         //$this->loadAnnotationClasses();
         $this->req_mapping[0] = [
             'id' => 0,
             'pid' => -1,
-            'name' => '/'
+            'name' => '/',
         ];
     }
 
@@ -54,13 +58,14 @@ class AnnotationParser
      * 注册各个模块类的注解和模块level的排序
      * @throws ReflectionException
      */
-    public function registerMods() {
+    public function registerMods()
+    {
         foreach ($this->path_list as $path) {
-            Console::debug("parsing annotation in " . $path[0].":".$path[1]);
+            Console::debug('parsing annotation in ' . $path[0] . ':' . $path[1]);
             $all_class = ZMUtil::getClassesPsr4($path[0], $path[1]);
             $this->reader = new AnnotationReader();
             foreach ($all_class as $v) {
-                Console::debug("正在检索 " . $v);
+                Console::debug('正在检索 ' . $v);
                 $reflection_class = new ReflectionClass($v);
                 $methods = $reflection_class->getMethods(ReflectionMethod::IS_PUBLIC);
                 $class_annotations = $this->reader->getClassAnnotations($reflection_class);
@@ -85,22 +90,21 @@ class AnnotationParser
                 */
 
                 // 生成主树
-                $this->annotation_map[$v]["class_annotations"] = $class_annotations;
-                $this->annotation_map[$v]["methods"] = $methods;
+                $this->annotation_map[$v]['class_annotations'] = $class_annotations;
+                $this->annotation_map[$v]['methods'] = $methods;
                 foreach ($methods as $method) {
-                    $this->annotation_map[$v]["methods_annotations"][$method->getName()] = $this->reader->getMethodAnnotations($method);
+                    $this->annotation_map[$v]['methods_annotations'][$method->getName()] = $this->reader->getMethodAnnotations($method);
                 }
 
-
-                foreach ($this->annotation_map[$v]["class_annotations"] as $vs) {
+                foreach ($this->annotation_map[$v]['class_annotations'] as $vs) {
                     $vs->class = $v;
 
                     //预处理1：将适用于每一个函数的注解到类注解重新注解到每个函数下面
                     if ($vs instanceof ErgodicAnnotation) {
-                        foreach (($this->annotation_map[$v]["methods"] ?? []) as $method) {
+                        foreach (($this->annotation_map[$v]['methods'] ?? []) as $method) {
                             $copy = clone $vs;
                             $copy->method = $method->getName();
-                            $this->annotation_map[$v]["methods_annotations"][$method->getName()][] = $copy;
+                            $this->annotation_map[$v]['methods_annotations'][$method->getName()][] = $copy;
                         }
                     }
 
@@ -108,23 +112,24 @@ class AnnotationParser
                     if ($vs instanceof Closed) {
                         unset($this->annotation_map[$v]);
                         continue 2;
-                    } elseif ($vs instanceof MiddlewareClass) {
+                    }
+                    if ($vs instanceof MiddlewareClass) {
                         //注册中间件本身的类，标记到 middlewares 属性中
-                        Console::debug("正在注册中间件 " . $reflection_class->getName());
+                        Console::debug('正在注册中间件 ' . $reflection_class->getName());
                         $rs = $this->registerMiddleware($vs, $reflection_class);
-                        $this->middlewares[$rs["name"]] = $rs;
+                        $this->middlewares[$rs['name']] = $rs;
                     }
                 }
 
                 $inserted = [];
 
                 //预处理3：处理每个函数上面的特殊注解，就是需要操作一些东西的
-                foreach (($this->annotation_map[$v]["methods_annotations"] ?? []) as $method_name => $methods_annotations) {
+                foreach (($this->annotation_map[$v]['methods_annotations'] ?? []) as $method_name => $methods_annotations) {
                     foreach ($methods_annotations as $method_anno) {
-                        /** @var AnnotationBase $method_anno */
+                        /* @var AnnotationBase $method_anno */
                         $method_anno->class = $v;
                         $method_anno->method = $method_name;
-                        if (!($method_anno instanceof Middleware) && ($middlewares = ZMConfig::get("global", "runtime")["global_middleware_binding"][get_class($method_anno)] ?? []) !== []) {
+                        if (!($method_anno instanceof Middleware) && ($middlewares = ZMConfig::get('global', 'runtime')['global_middleware_binding'][get_class($method_anno)] ?? []) !== []) {
                             if (!isset($inserted[$v][$method_name])) {
                                 // 在这里在其他中间件前插入插入全局的中间件
                                 foreach ($middlewares as $middleware) {
@@ -146,23 +151,25 @@ class AnnotationParser
                 }
             }
         }
-        Console::debug("解析注解完毕！");
+        Console::debug('解析注解完毕！');
     }
 
-    public function generateAnnotationEvents(): array {
+    public function generateAnnotationEvents(): array
+    {
         $o = [];
         foreach ($this->annotation_map as $obj) {
             // 这里的ErgodicAnnotation是为了解决类上的注解可穿透到方法上的问题
-            foreach (($obj["class_annotations"] ?? []) as $class_annotation) {
-                if ($class_annotation instanceof ErgodicAnnotation) continue;
-                else $o[get_class($class_annotation)][] = $class_annotation;
+            foreach (($obj['class_annotations'] ?? []) as $class_annotation) {
+                if ($class_annotation instanceof ErgodicAnnotation) {
+                    continue;
+                }
+                $o[get_class($class_annotation)][] = $class_annotation;
             }
-            foreach (($obj["methods_annotations"] ?? []) as $methods_annotations) {
+            foreach (($obj['methods_annotations'] ?? []) as $methods_annotations) {
                 foreach ($methods_annotations as $annotation) {
                     $o[get_class($annotation)][] = $annotation;
                 }
             }
-
         }
         foreach ($o as $k => $v) {
             $this->sortByLevel($o, $k);
@@ -170,55 +177,36 @@ class AnnotationParser
         return $o;
     }
 
-    /**
-     * @return array
-     */
-    public function getMiddlewares(): array { return $this->middlewares; }
+    public function getMiddlewares(): array
+    {
+        return $this->middlewares;
+    }
 
-    /**
-     * @return array
-     */
-    public function getMiddlewareMap(): array { return $this->middleware_map; }
+    public function getMiddlewareMap(): array
+    {
+        return $this->middleware_map;
+    }
 
-    /**
-     * @return array
-     */
-    public function getReqMapping(): array { return $this->req_mapping; }
+    public function getReqMapping(): array
+    {
+        return $this->req_mapping;
+    }
 
     /**
      * @param $path
      * @param $indoor_name
      */
-    public function addRegisterPath($path, $indoor_name) { $this->path_list[] = [$path, $indoor_name]; }
-
-    //private function below
-
-    private function registerMiddleware(MiddlewareClass $vs, ReflectionClass $reflection_class): array {
-        $result = [
-            "class" => "\\" . $reflection_class->getName(),
-            "name" => $vs->name
-        ];
-
-        foreach ($reflection_class->getMethods() as $vss) {
-            $method_annotations = $this->reader->getMethodAnnotations($vss);
-            foreach ($method_annotations as $vsss) {
-                if ($vsss instanceof HandleBefore) $result["before"] = $vss->getName();
-                if ($vsss instanceof HandleAfter) $result["after"] = $vss->getName();
-                if ($vsss instanceof HandleException) {
-                    $result["exceptions"][$vsss->class_name] = $vss->getName();
-                }
-            }
-        }
-        return $result;
+    public function addRegisterPath($path, $indoor_name)
+    {
+        $this->path_list[] = [$path, $indoor_name];
     }
 
     /**
-     * @internal 用于 level 排序
      * @param $events
-     * @param string $class_name
-     * @param string $prefix
+     * @internal 用于 level 排序
      */
-    public function sortByLevel(&$events, string $class_name, $prefix = "") {
+    public function sortByLevel(&$events, string $class_name, string $prefix = '')
+    {
         if (is_a($class_name, Level::class, true)) {
             $class_name .= $prefix;
             usort($events[$class_name], function ($a, $b) {
@@ -232,12 +220,13 @@ class AnnotationParser
     /**
      * @throws AnnotationException
      */
-    public function verifyMiddlewares() {
-        if ((ZMConfig::get("global", "runtime")["middleware_error_policy"] ?? 1) === 2) {
+    public function verifyMiddlewares()
+    {
+        if ((ZMConfig::get('global', 'runtime')['middleware_error_policy'] ?? 1) === 2) {
             //我承认套三层foreach很不优雅，但是这个会很快的。
-            foreach($this->middleware_map as $class => $v) {
-                foreach ($v as $method => $vs) {
-                    foreach($vs as $mid) {
+            foreach ($this->middleware_map as $v) {
+                foreach ($v as $vs) {
+                    foreach ($vs as $mid) {
                         if (!isset($this->middlewares[$mid->middleware])) {
                             throw new AnnotationException("Annotation parse error: Unknown MiddlewareClass named \"{$mid->middleware}\"!");
                         }
@@ -246,4 +235,35 @@ class AnnotationParser
             }
         }
     }
+
+    public function getRunTime()
+    {
+        return microtime(true) - $this->start_time;
+    }
+
+    //private function below
+
+    private function registerMiddleware(MiddlewareClass $vs, ReflectionClass $reflection_class): array
+    {
+        $result = [
+            'class' => '\\' . $reflection_class->getName(),
+            'name' => $vs->name,
+        ];
+
+        foreach ($reflection_class->getMethods() as $vss) {
+            $method_annotations = $this->reader->getMethodAnnotations($vss);
+            foreach ($method_annotations as $vsss) {
+                if ($vsss instanceof HandleBefore) {
+                    $result['before'] = $vss->getName();
+                }
+                if ($vsss instanceof HandleAfter) {
+                    $result['after'] = $vss->getName();
+                }
+                if ($vsss instanceof HandleException) {
+                    $result['exceptions'][$vsss->class_name] = $vss->getName();
+                }
+            }
+        }
+        return $result;
+    }
 }

src/ZM/Annotation/CQ/CQAPIResponse.php

@@ -1,16 +1,15 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\CQ;
 
-
 use Doctrine\Common\Annotations\Annotation\Required;
 use Doctrine\Common\Annotations\Annotation\Target;
 use ZM\Annotation\AnnotationBase;
 
 /**
  * Class CQAPIResponse
- * @package ZM\Annotation\CQ
  * @Annotation
  * @Target("METHOD")
  */

src/ZM/Annotation/CQ/CQAfter.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\CQ;
 
@@ -11,7 +12,6 @@ use ZM\Annotation\Interfaces\Level;
  * Class CQAfter
  * @Annotation
  * @Target("METHOD")
- * @package ZM\Annotation\CQ
  */
 class CQAfter extends AnnotationBase implements Level
 {
@@ -26,14 +26,16 @@ class CQAfter extends AnnotationBase implements Level
     /**
      * @return mixed
      */
-    public function getLevel() {
+    public function getLevel()
+    {
         return $this->level;
     }
 
     /**
      * @param mixed $level
      */
-    public function setLevel($level) {
+    public function setLevel($level)
+    {
         $this->level = $level;
     }
 }

src/ZM/Annotation/CQ/CQBefore.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\CQ;
 
-
 use Doctrine\Common\Annotations\Annotation\Required;
 use Doctrine\Common\Annotations\Annotation\Target;
 use ZM\Annotation\AnnotationBase;
@@ -13,7 +13,6 @@ use ZM\Annotation\Interfaces\Level;
  * Class CQBefore
  * @Annotation
  * @Target("METHOD")
- * @package ZM\Annotation\CQ
  */
 class CQBefore extends AnnotationBase implements Level
 {
@@ -28,15 +27,16 @@ class CQBefore extends AnnotationBase implements Level
     /**
      * @return mixed
      */
-    public function getLevel(): int {
+    public function getLevel(): int
+    {
         return $this->level;
     }
 
     /**
      * @param mixed $level
      */
-    public function setLevel($level) {
+    public function setLevel($level)
+    {
         $this->level = $level;
     }
-
-}
+}

src/ZM/Annotation/CQ/CQCommand.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\CQ;
 
@@ -11,43 +12,55 @@ use ZM\Annotation\Interfaces\Level;
  * Class CQCommand
  * @Annotation
  * @Target("ALL")
- * @package ZM\Annotation\CQ
  */
 class CQCommand extends AnnotationBase implements Level
 {
     /** @var string */
-    public $match = "";
+    public $match = '';
+
     /** @var string */
-    public $pattern = "";
+    public $pattern = '';
+
     /** @var string */
-    public $regex = "";
+    public $regex = '';
+
     /** @var string */
-    public $start_with = "";
+    public $start_with = '';
+
     /** @var string */
-    public $end_with = "";
+    public $end_with = '';
+
     /** @var string */
-    public $keyword = "";
+    public $keyword = '';
+
     /** @var string[] */
     public $alias = [];
+
     /** @var string */
-    public $message_type = "";
+    public $message_type = '';
+
     /** @var int */
     public $user_id = 0;
+
     /** @var int */
     public $group_id = 0;
+
     /** @var int */
     public $discuss_id = 0;
+
     /** @var int */
     public $level = 20;
 
-    /**
-     * @return int
-     */
-    public function getLevel(): int { return $this->level; }
+    public function getLevel(): int
+    {
+        return $this->level;
+    }
 
     /**
      * @param int $level
      */
-    public function setLevel($level) { $this->level = $level; }
-
+    public function setLevel($level)
+    {
+        $this->level = $level;
+    }
 }

src/ZM/Annotation/CQ/CQMessage.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\CQ;
 
@@ -11,30 +12,39 @@ use ZM\Annotation\Interfaces\Level;
  * Class CQMessage
  * @Annotation
  * @Target("ALL")
- * @package ZM\Annotation\CQ
  */
 class CQMessage extends AnnotationBase implements Level
 {
     /**
      * @var string
      */
-    public $message_type = "";
+    public $message_type = '';
+
     /** @var int */
     public $user_id = 0;
+
     /** @var int */
     public $group_id = 0;
+
     /** @var int */
     public $discuss_id = 0;
+
     /** @var string */
-    public $message = "";
+    public $message = '';
+
     /** @var string */
-    public $raw_message = "";
+    public $raw_message = '';
+
     /** @var int */
     public $level = 20;
 
-    public function getLevel(): int { return $this->level; }
+    public function getLevel(): int
+    {
+        return $this->level;
+    }
 
-    public function setLevel($level) {
+    public function setLevel($level)
+    {
         $this->level = $level;
     }
-}
+}

src/ZM/Annotation/CQ/CQMetaEvent.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\CQ;
 
@@ -12,7 +13,6 @@ use ZM\Annotation\Interfaces\Level;
  * Class CQMetaEvent
  * @Annotation
  * @Target("ALL")
- * @package ZM\Annotation\CQ
  */
 class CQMetaEvent extends AnnotationBase implements Level
 {
@@ -21,18 +21,23 @@ class CQMetaEvent extends AnnotationBase implements Level
      * @Required()
      */
     public $meta_event_type = '';
+
     /** @var int */
     public $level;
 
     /**
      * @return mixed
      */
-    public function getLevel(): int { return $this->level; }
+    public function getLevel(): int
+    {
+        return $this->level;
+    }
 
     /**
      * @param int $level
      */
-    public function setLevel($level) {
+    public function setLevel($level)
+    {
         $this->level = $level;
     }
-}
+}

src/ZM/Annotation/CQ/CQNotice.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\CQ;
 
@@ -11,32 +12,34 @@ use ZM\Annotation\Interfaces\Level;
  * Class CQNotice
  * @Annotation
  * @Target("ALL")
- * @package ZM\Annotation\CQ
  */
 class CQNotice extends AnnotationBase implements Level
 {
     /** @var string */
-    public $notice_type = "";
+    public $notice_type = '';
+
     /** @var string */
-    public $sub_type = "";
+    public $sub_type = '';
+
     /** @var int */
     public $group_id = 0;
+
     /** @var int */
     public $operator_id = 0;
+
     /** @var int */
     public $level = 20;
 
-    /**
-     * @return int
-     */
-    public function getLevel(): int {
+    public function getLevel(): int
+    {
         return $this->level;
     }
 
     /**
      * @param int $level
      */
-    public function setLevel($level) {
+    public function setLevel($level)
+    {
         $this->level = $level;
     }
-}
+}

src/ZM/Annotation/CQ/CQRequest.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\CQ;
 
@@ -11,32 +12,34 @@ use ZM\Annotation\Interfaces\Level;
  * Class CQRequest
  * @Annotation
  * @Target("ALL")
- * @package ZM\Annotation\CQ
  */
 class CQRequest extends AnnotationBase implements Level
 {
     /** @var string */
-    public $request_type = "";
+    public $request_type = '';
+
     /** @var string */
-    public $sub_type = "";
+    public $sub_type = '';
+
     /** @var int */
     public $user_id = 0;
+
     /** @var string */
-    public $comment = "";
+    public $comment = '';
+
     /** @var int */
     public $level = 20;
 
-    /**
-     * @return int
-     */
-    public function getLevel(): int {
+    public function getLevel(): int
+    {
         return $this->level;
     }
 
     /**
      * @param int $level
      */
-    public function setLevel($level) {
+    public function setLevel($level)
+    {
         $this->level = $level;
     }
-}
+}

src/ZM/Annotation/Command/TerminalCommand.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Command;
 
@@ -9,7 +10,6 @@ use ZM\Annotation\AnnotationBase;
 
 /**
  * Class TerminalCommand
- * @package ZM\Annotation\Command
  * @Annotation
  * @Target("METHOD")
  */
@@ -26,5 +26,5 @@ class TerminalCommand extends AnnotationBase
     /**
      * @var string
      */
-    public $description = "";
-}
+    public $description = '';
+}

src/ZM/Annotation/Http/Controller.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Http;
 
@@ -12,7 +13,6 @@ use ZM\Annotation\Interfaces\ErgodicAnnotation;
  * Class Controller
  * @Annotation
  * @Target("CLASS")
- * @package ZM\Annotation\Http
  */
 class Controller extends AnnotationBase implements ErgodicAnnotation
 {

src/ZM/Annotation/Http/HandleAfter.php

@@ -1,15 +1,14 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Http;
 
-
 use Doctrine\Common\Annotations\Annotation\Target;
 use ZM\Annotation\AnnotationBase;
 
 /**
  * Class HandleAfter
- * @package ZM\Annotation\Http
  * @Annotation
  * @Target("METHOD")
  */

src/ZM/Annotation/Http/HandleBefore.php

@@ -1,15 +1,14 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Http;
 
-
 use Doctrine\Common\Annotations\Annotation\Target;
 use ZM\Annotation\AnnotationBase;
 
 /**
  * Class HandleBefore
- * @package ZM\Annotation\Http
  * @Annotation
  * @Target("METHOD")
  */

src/ZM/Annotation/Http/HandleException.php

@@ -1,16 +1,15 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Http;
 
-
 use Doctrine\Common\Annotations\Annotation\Target;
 use Exception;
 use ZM\Annotation\AnnotationBase;
 
 /**
  * Class HandleException
- * @package ZM\Annotation\Http
  * @Annotation
  * @Target("METHOD")
  */
@@ -20,4 +19,4 @@ class HandleException extends AnnotationBase
      * @var string
      */
     public $class_name = Exception::class;
-}
+}

src/ZM/Annotation/Http/Middleware.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Http;
 
-
 use Doctrine\Common\Annotations\Annotation\Required;
 use Doctrine\Common\Annotations\Annotation\Target;
 use ZM\Annotation\AnnotationBase;
@@ -11,7 +11,6 @@ use ZM\Annotation\Interfaces\ErgodicAnnotation;
 
 /**
  * Class Middleware
- * @package ZM\Annotation\Http
  * @Annotation
  * @Target("ALL")
  */

src/ZM/Annotation/Http/MiddlewareClass.php

@@ -1,16 +1,15 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Http;
 
-
 use Doctrine\Common\Annotations\Annotation\Required;
 use Doctrine\Common\Annotations\Annotation\Target;
 use ZM\Annotation\AnnotationBase;
 
 /**
  * Class MiddlewareClass
- * @package ZM\Annotation\Http
  * @Annotation
  * @Target("CLASS")
  */

src/ZM/Annotation/Http/RequestMapping.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Http;
 
@@ -11,7 +12,6 @@ use ZM\Annotation\AnnotationBase;
  * Class RequestMapping
  * @Annotation
  * @Target("METHOD")
- * @package ZM\Annotation\Http
  */
 class RequestMapping extends AnnotationBase
 {

src/ZM/Annotation/Http/RequestMethod.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Http;
 
@@ -9,21 +10,26 @@ use ZM\Annotation\AnnotationBase;
 /**
  * Class RequestMethod
  * @Annotation
- * @package ZM\Annotation\Http
  */
 class RequestMethod extends AnnotationBase
 {
+    public const GET = 'GET';
+
+    public const POST = 'POST';
+
+    public const PUT = 'PUT';
+
+    public const PATCH = 'PATCH';
+
+    public const DELETE = 'DELETE';
+
+    public const OPTIONS = 'OPTIONS';
+
+    public const HEAD = 'HEAD';
+
     /**
      * @var string
      * @Required()
      */
     public $method = self::GET;
-
-    public const GET = 'GET';
-    public const POST = 'POST';
-    public const PUT = 'PUT';
-    public const PATCH = 'PATCH';
-    public const DELETE = 'DELETE';
-    public const OPTIONS = 'OPTIONS';
-    public const HEAD = 'HEAD';
 }

src/ZM/Annotation/Interfaces/CustomAnnotation.php

@@ -1,10 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Interfaces;
 
-
 interface CustomAnnotation
 {
-
-}
+}

src/ZM/Annotation/Interfaces/ErgodicAnnotation.php

@@ -1,10 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Interfaces;
 
-
 interface ErgodicAnnotation
 {
-
 }

src/ZM/Annotation/Interfaces/Level.php

@@ -1,12 +1,12 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Interfaces;
 
-
 interface Level
 {
     public function getLevel();
 
     public function setLevel($level);
-}
+}

src/ZM/Annotation/Interfaces/Rule.php

@@ -1,10 +1,10 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Interfaces;
 
-
 interface Rule
 {
     public function getRule();
-}
+}

src/ZM/Annotation/Module/Closed.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Module;
 
@@ -10,9 +11,7 @@ use ZM\Annotation\AnnotationBase;
  * Class Closed
  * @Annotation
  * @Target("CLASS")
- * @package ZM\Annotation\Module
  */
 class Closed extends AnnotationBase
 {
-
-}
+}

src/ZM/Annotation/Swoole/OnCloseEvent.php

@@ -1,21 +1,20 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
-
 use Doctrine\Common\Annotations\Annotation\Target;
 
 /**
  * @Annotation
  * @Target("METHOD")
  * Class OnCloseEvent
- * @package ZM\Annotation\Swoole
  */
 class OnCloseEvent extends OnSwooleEventBase
 {
     /**
      * @var string
      */
-    public $connect_type = "default";
-}
+    public $connect_type = 'default';
+}

src/ZM/Annotation/Swoole/OnManagerStartEvent.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZM\Annotation\Swoole;
+
+use Doctrine\Common\Annotations\Annotation\Target;
+
+/**
+ * @Annotation
+ * @Target("METHOD")
+ * @since 2.7.0
+ */
+class OnManagerStartEvent extends OnSwooleEventBase
+{
+}

src/ZM/Annotation/Swoole/OnMessageEvent.php

@@ -1,21 +1,20 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
-
 use Doctrine\Common\Annotations\Annotation\Target;
 
 /**
  * @Annotation
  * @Target("METHOD")
  * Class OnMessageEvent
- * @package ZM\Annotation\Swoole
  */
 class OnMessageEvent extends OnSwooleEventBase
 {
     /**
      * @var string
      */
-    public $connect_type = "default";
-}
+    public $connect_type = 'default';
+}

src/ZM/Annotation/Swoole/OnOpenEvent.php

@@ -1,21 +1,20 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
-
 use Doctrine\Common\Annotations\Annotation\Target;
 
 /**
  * @Annotation
  * @Target("METHOD")
  * Class OnOpenEvent
- * @package ZM\Annotation\Swoole
  */
 class OnOpenEvent extends OnSwooleEventBase
 {
     /**
      * @var string
      */
-    public $connect_type = "default";
-}
+    public $connect_type = 'default';
+}

src/ZM/Annotation/Swoole/OnPipeMessageEvent.php

@@ -1,16 +1,15 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
-
 use Doctrine\Common\Annotations\Annotation\Required;
 use Doctrine\Common\Annotations\Annotation\Target;
 use ZM\Annotation\AnnotationBase;
 
 /**
  * Class OnPipeMessageEvent
- * @package ZM\Annotation\Swoole
  * @Annotation
  * @Target("METHOD")
  */
@@ -21,4 +20,4 @@ class OnPipeMessageEvent extends AnnotationBase
      * @Required()
      */
     public $action;
-}
+}

src/ZM/Annotation/Swoole/OnRequestEvent.php

@@ -1,17 +1,16 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
-
 use Doctrine\Common\Annotations\Annotation\Target;
 
 /**
  * @Annotation
  * @Target("METHOD")
  * Class OnRequestEvent
- * @package ZM\Annotation\Swoole
  */
 class OnRequestEvent extends OnSwooleEventBase
 {
-}
+}

src/ZM/Annotation/Swoole/OnSave.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
@@ -8,11 +9,9 @@ use ZM\Annotation\AnnotationBase;
 
 /**
  * Class OnSave
- * @package ZM\Annotation\Swoole
  * @Annotation
  * @Target("METHOD")
  */
 class OnSave extends AnnotationBase
 {
-
 }

src/ZM/Annotation/Swoole/OnSetup.php

@@ -1,15 +1,14 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
-
 use Doctrine\Common\Annotations\Annotation\Target;
 use ZM\Annotation\AnnotationBase;
 
 /**
  * Class ZMSetup
- * @package ZM\Annotation\Swoole
  * @Annotation
  * @Target("METHOD")
  */

src/ZM/Annotation/Swoole/OnStart.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
@@ -8,7 +9,6 @@ use ZM\Annotation\AnnotationBase;
 
 /**
  * Class OnWorkerStart
- * @package ZM\Annotation\Swoole
  * @Annotation
  * @Target("METHOD")
  */

src/ZM/Annotation/Swoole/OnSwooleEvent.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
@@ -10,7 +11,6 @@ use Doctrine\Common\Annotations\Annotation\Target;
  * Class OnSwooleEvent
  * @Annotation
  * @Target("METHOD")
- * @package ZM\Annotation\Swoole
  */
 class OnSwooleEvent extends OnSwooleEventBase
 {
@@ -20,17 +20,13 @@ class OnSwooleEvent extends OnSwooleEventBase
      */
     public $type;
 
-    /**
-     * @return string
-     */
-    public function getType(): string {
+    public function getType(): string
+    {
         return $this->type;
     }
 
-    /**
-     * @param string $type
-     */
-    public function setType(string $type) {
+    public function setType(string $type)
+    {
         $this->type = $type;
     }
 }

src/ZM/Annotation/Swoole/OnSwooleEventBase.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
-
 use ZM\Annotation\AnnotationBase;
 use ZM\Annotation\Interfaces\Level;
 use ZM\Annotation\Interfaces\Rule;
@@ -13,37 +13,33 @@ abstract class OnSwooleEventBase extends AnnotationBase implements Level, Rule
     /**
      * @var string
      */
-    public $rule = "";
+    public $rule = '';
+
     /**
      * @var int
      */
     public $level = 20;
 
-    /**
-     * @return string
-     */
-    public function getRule(): string {
-        return $this->rule !== "" ? $this->rule : true;
+    public function getRule()
+    {
+        return $this->rule !== '' ? $this->rule : true;
     }
 
-    /**
-     * @param string $rule
-     */
-    public function setRule(string $rule) {
+    public function setRule(string $rule)
+    {
         $this->rule = $rule;
     }
 
-    /**
-     * @return int
-     */
-    public function getLevel(): int {
+    public function getLevel(): int
+    {
         return $this->level;
     }
 
     /**
      * @param int $level
      */
-    public function setLevel($level) {
+    public function setLevel($level)
+    {
         $this->level = $level;
     }
-}
+}

src/ZM/Annotation/Swoole/OnTask.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
@@ -10,7 +11,6 @@ use ZM\Annotation\Interfaces\Rule;
 
 /**
  * Class OnTask
- * @package ZM\Annotation\Swoole
  * @Annotation
  * @Target("METHOD")
  */
@@ -25,12 +25,13 @@ class OnTask extends AnnotationBase implements Rule
     /**
      * @var string
      */
-    public $rule = "";
+    public $rule = '';
 
     /**
      * @return mixed
      */
-    public function getRule(): string {
+    public function getRule(): string
+    {
         return $this->rule;
     }
-}
+}

src/ZM/Annotation/Swoole/OnTaskEvent.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
@@ -7,10 +8,9 @@ use Doctrine\Common\Annotations\Annotation\Target;
 
 /**
  * Class OnTaskEvent
- * @package ZM\Annotation\Swoole
  * @Annotation
  * @Target("METHOD")
  */
 class OnTaskEvent extends OnSwooleEventBase
 {
-}
+}

src/ZM/Annotation/Swoole/OnTick.php

@@ -1,16 +1,15 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
-
 use Doctrine\Common\Annotations\Annotation\Required;
 use Doctrine\Common\Annotations\Annotation\Target;
 use ZM\Annotation\AnnotationBase;
 
 /**
  * Class OnTick
- * @package ZM\Annotation\Swoole
  * @Annotation
  * @Target("METHOD")
  * @since 1.2

src/ZM/Annotation/Swoole/SwooleHandler.php

@@ -1,16 +1,15 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Annotation\Swoole;
 
-
 use Doctrine\Common\Annotations\Annotation\Required;
 use Doctrine\Common\Annotations\Annotation\Target;
 use ZM\Annotation\AnnotationBase;
 
 /**
  * Class SwooleHandler
- * @package ZM\Annotation\Swoole
  * @Annotation
  * @Target("ALL")
  */

src/ZM/Command/BuildCommand.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command;
 
@@ -16,44 +17,52 @@ class BuildCommand extends Command
 {
     // the name of the command (the part after "bin/console")
     protected static $defaultName = 'build';
+
     /**
      * @var OutputInterface
      */
-    private $output = null;
+    private $output;
 
-    protected function configure() {
-        $this->setDescription("Build an \".phar\" file | 将项目构建一个phar包");
-        $this->setHelp("此功能将会把整个项目打包为phar");
-        $this->addOption("target", "D", InputOption::VALUE_REQUIRED, "Output Directory | 指定输出目录");
+    protected function configure()
+    {
+        $this->setDescription('Build an ".phar" file | 将项目构建一个phar包');
+        $this->setHelp('此功能将会把整个项目打包为phar');
+        $this->addOption('target', 'D', InputOption::VALUE_REQUIRED, 'Output Directory | 指定输出目录');
         // ...
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         $this->output = $output;
-        $target_dir = $input->getOption("target") ?? (WORKING_DIR);
-        if (mb_strpos($target_dir, "../")) $target_dir = realpath($target_dir);
+        $target_dir = $input->getOption('target') ?? (WORKING_DIR);
+        if (mb_strpos($target_dir, '../')) {
+            $target_dir = realpath($target_dir);
+        }
         if ($target_dir === false) {
-            $output->writeln(TermColor::color8(31) . zm_internal_errcode("E00039") . "Error: No such file or directory (" . $target_dir . ")" . TermColor::RESET);
+            $output->writeln(TermColor::color8(31) . zm_internal_errcode('E00039') . 'Error: No such file or directory (' . $target_dir . ')' . TermColor::RESET);
             return 1;
         }
-        $output->writeln("Target: " . $target_dir);
-        if (mb_substr($target_dir, -1, 1) !== '/') $target_dir .= "/";
+        $output->writeln('Target: ' . $target_dir);
+        if (mb_substr($target_dir, -1, 1) !== '/') {
+            $target_dir .= '/';
+        }
         if (ini_get('phar.readonly') == 1) {
-            $output->writeln(TermColor::color8(31) . zm_internal_errcode("E00040") . "You need to set \"phar.readonly\" to \"Off\"!");
-            $output->writeln(TermColor::color8(31) . "See: https://stackoverflow.com/questions/34667606/cant-enable-phar-writing");
+            $output->writeln(TermColor::color8(31) . zm_internal_errcode('E00040') . 'You need to set "phar.readonly" to "Off"!');
+            $output->writeln(TermColor::color8(31) . 'See: https://stackoverflow.com/questions/34667606/cant-enable-phar-writing');
             return 1;
         }
         if (!is_dir($target_dir)) {
-            $output->writeln(TermColor::color8(31) . zm_internal_errcode("E00039") . "Error: No such file or directory ($target_dir)" . TermColor::RESET);
+            $output->writeln(TermColor::color8(31) . zm_internal_errcode('E00039') . "Error: No such file or directory ({$target_dir})" . TermColor::RESET);
             return 1;
         }
-        $filename = "server.phar";
+        $filename = 'server.phar';
         $this->build($target_dir, $filename);
 
         return 0;
     }
 
-    private function build($target_dir, $filename) {
+    private function build($target_dir, $filename)
+    {
         @unlink($target_dir . $filename);
         $phar = new Phar($target_dir . $filename);
         $phar->startBuffering();
@@ -62,7 +71,7 @@ class BuildCommand extends Command
         $all = DataProvider::scanDirFiles(DataProvider::getSourceRootDir(), true, true);
 
         $all = array_filter($all, function ($x) {
-            $dirs = preg_match("/(^(bin|config|resources|src|vendor)\/|^(composer\.json|README\.md)$)/", $x);
+            $dirs = preg_match('/(^(bin|config|resources|src|vendor)\\/|^(composer\\.json|README\\.md)$)/', $x);
             return !($dirs !== 1);
         });
 
@@ -71,15 +80,15 @@ class BuildCommand extends Command
 
         $archive_dir = DataProvider::getSourceRootDir();
         foreach ($all as $k => $v) {
-            $phar->addFile($archive_dir . "/" . $v, $v);
-            $progress->current($k + 1, "Adding " . $v);
+            $phar->addFile($archive_dir . '/' . $v, $v);
+            $progress->current($k + 1, 'Adding ' . $v);
         }
 
         $phar->setStub(
             "#!/usr/bin/env php\n" .
-            $phar->createDefaultStub(LOAD_MODE == 0 ? "src/entry.php" : "vendor/zhamao/framework/src/entry.php")
+            $phar->createDefaultStub(LOAD_MODE == 0 ? 'src/entry.php' : 'vendor/zhamao/framework/src/entry.php')
         );
         $phar->stopBuffering();
-        $this->output->writeln("Successfully built. Location: " . $target_dir . "$filename");
+        $this->output->writeln('Successfully built. Location: ' . $target_dir . "{$filename}");
     }
 }

src/ZM/Command/CheckConfigCommand.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command;
 
@@ -14,49 +15,53 @@ class CheckConfigCommand extends Command
 
     private $need_update = false;
 
-    protected function configure() {
-        $this->setDescription("检查配置文件是否和框架当前版本有更新");
+    protected function configure()
+    {
+        $this->setDescription('检查配置文件是否和框架当前版本有更新');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         if (LOAD_MODE !== 1) {
-            $output->writeln("<error>仅限在Composer依赖模式中使用此命令！</error>");
+            $output->writeln('<error>仅限在Composer依赖模式中使用此命令！</error>');
             return 1;
         }
-        $current_cfg = getcwd() . "/config/";
-        $remote_cfg = include_once FRAMEWORK_ROOT_DIR . "/config/global.php";
-        if (file_exists($current_cfg . "global.php")) {
-            $this->check($remote_cfg, "global.php", $output);
+        $current_cfg = getcwd() . '/config/';
+        $remote_cfg = include_once FRAMEWORK_ROOT_DIR . '/config/global.php';
+        if (file_exists($current_cfg . 'global.php')) {
+            $this->check($remote_cfg, 'global.php', $output);
         }
-        if (file_exists($current_cfg . "global.development.php")) {
-            $this->check($remote_cfg, "global.development.php", $output);
+        if (file_exists($current_cfg . 'global.development.php')) {
+            $this->check($remote_cfg, 'global.development.php', $output);
         }
-        if (file_exists($current_cfg . "global.staging.php")) {
-            $this->check($remote_cfg, "global.staging.php", $output);
+        if (file_exists($current_cfg . 'global.staging.php')) {
+            $this->check($remote_cfg, 'global.staging.php', $output);
         }
-        if (file_exists($current_cfg . "global.production.php")) {
-            $this->check($remote_cfg, "global.production.php", $output);
+        if (file_exists($current_cfg . 'global.production.php')) {
+            $this->check($remote_cfg, 'global.production.php', $output);
         }
         if ($this->need_update === true) {
-            $output->writeln("<comment>有配置文件需要更新，详情见文档 `https://framework.zhamao.xin/update/config`</comment>");
+            $output->writeln('<comment>有配置文件需要更新，详情见文档 `https://framework.zhamao.xin/update/config`</comment>');
         } else {
-            $output->writeln("<info>配置文件暂无更新！</info>");
+            $output->writeln('<info>配置文件暂无更新！</info>');
         }
 
         return 0;
     }
 
     /**
-     * @noinspection PhpIncludeInspection
+     * @param mixed $remote
+     * @param mixed $local
      */
-    private function check($remote, $local, OutputInterface $out) {
-        $local_file = include_once WORKING_DIR . "/config/".$local;
+    private function check($remote, $local, OutputInterface $out)
+    {
+        $local_file = include_once WORKING_DIR . '/config/' . $local;
         if ($local_file === true) {
-            $local_file = ZMConfig::get("global");
+            $local_file = ZMConfig::get('global');
         }
-        foreach($remote as $k => $v) {
+        foreach ($remote as $k => $v) {
             if (!isset($local_file[$k])) {
-                $out->writeln("<comment>配置文件 ".$local . " 需要更新！(当前配置文件缺少 `$k` 字段配置)</comment>");
+                $out->writeln('<comment>配置文件 ' . $local . " 需要更新！(当前配置文件缺少 `{$k}` 字段配置)</comment>");
                 $this->need_update = true;
             }
         }

src/ZM/Command/Daemon/DaemonCommand.php

@@ -1,31 +1,27 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command\Daemon;
 
-
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use ZM\Utils\DataProvider;
+use ZM\Framework;
 
 abstract class DaemonCommand extends Command
 {
-    protected $daemon_file = null;
+    protected $daemon_file;
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
-        $pid_path = DataProvider::getWorkingDir() . "/.daemon_pid";
-        if (!file_exists($pid_path)) {
-            $output->writeln("<comment>没有检测到正在运行的守护进程或框架进程！</comment>");
-            die();
-        }
-        $file = json_decode(file_get_contents($pid_path), true);
-        if ($file === null || posix_getsid(intval($file["pid"])) === false) {
-            $output->writeln("<comment>未检测到正在运行的守护进程或框架进程！</comment>");
-            unlink($pid_path);
-            die();
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $file = Framework::getProcessState(ZM_PROCESS_MASTER);
+        if ($file === false || posix_getsid(intval($file['pid'])) === false) {
+            $output->writeln('<comment>未检测到正在运行的守护进程或框架进程！</comment>');
+            Framework::removeProcessState(ZM_PROCESS_MASTER);
+            exit(1);
         }
         $this->daemon_file = $file;
         return 0;
     }
-}
+}

src/ZM/Command/Daemon/DaemonReloadCommand.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command\Daemon;
 
@@ -11,14 +12,16 @@ class DaemonReloadCommand extends DaemonCommand
 {
     protected static $defaultName = 'daemon:reload';
 
-    protected function configure() {
-        $this->setDescription("重载框架");
+    protected function configure()
+    {
+        $this->setDescription('重载框架');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         parent::execute($input, $output);
-        Process::kill(intval($this->daemon_file["pid"]), SIGUSR1);
-        $output->writeln("<info>成功重载！</info>");
+        Process::kill(intval($this->daemon_file['pid']), SIGUSR1);
+        $output->writeln('<info>成功重载！</info>');
         return 0;
     }
 }

src/ZM/Command/Daemon/DaemonStatusCommand.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command\Daemon;
 
@@ -10,20 +11,23 @@ class DaemonStatusCommand extends DaemonCommand
 {
     protected static $defaultName = 'daemon:status';
 
-    protected function configure() {
-        $this->setDescription("查看框架的运行状态");
+    protected function configure()
+    {
+        $this->setDescription('查看框架的运行状态');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         parent::execute($input, $output);
-        $output->writeln("<info>框架" . ($this->daemon_file["daemon"] ? "以守护进程模式" : "") . "运行中，pid：" . $this->daemon_file["pid"] . "</info>");
-        if ($this->daemon_file["daemon"]) {
-            $output->writeln("<comment>----- 以下是stdout内容 -----</comment>");
-            $stdout = file_get_contents($this->daemon_file["stdout"]);
+        $output->writeln('<info>框架' . ($this->daemon_file['daemon'] ? '以守护进程模式' : '') . '运行中，pid：' . $this->daemon_file['pid'] . '</info>');
+        if ($this->daemon_file['daemon']) {
+            $output->writeln('<comment>----- 以下是stdout内容 -----</comment>');
+            $stdout = file_get_contents($this->daemon_file['stdout']);
             $stdout = explode("\n", $stdout);
             for ($i = 15; $i > 0; --$i) {
-                if (isset($stdout[count($stdout) - $i]))
+                if (isset($stdout[count($stdout) - $i])) {
                     echo $stdout[count($stdout) - $i] . PHP_EOL;
+                }
             }
         }
         return 0;

src/ZM/Command/Daemon/DaemonStopCommand.php

@@ -1,33 +1,36 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command\Daemon;
 
 use Swoole\Process;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use ZM\Utils\DataProvider;
+use ZM\Framework;
 
 class DaemonStopCommand extends DaemonCommand
 {
     protected static $defaultName = 'daemon:stop';
 
-    protected function configure() {
-        $this->setDescription("停止运行的框架");
+    protected function configure()
+    {
+        $this->setDescription('停止运行的框架');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         parent::execute($input, $output);
-        Process::kill(intval($this->daemon_file["pid"]), SIGTERM);
+        Process::kill(intval($this->daemon_file['pid']), SIGTERM);
         $i = 10;
-        while (file_exists(DataProvider::getWorkingDir() . "/.daemon_pid") && $i > 0) {
+        while (Framework::getProcessState(ZM_PROCESS_MASTER) !== false && $i > 0) {
             sleep(1);
             --$i;
         }
         if ($i === 0) {
-            $output->writeln("<error>停止失败，请检查进程pid #" . $this->daemon_file["pid"] . " 是否响应！</error>");
+            $output->writeln('<error>停止失败，请检查进程pid #' . $this->daemon_file['pid'] . ' 是否响应！</error>');
         } else {
-            $output->writeln("<info>成功停止！</info>");
+            $output->writeln('<info>成功停止！</info>');
         }
         return 0;
     }

src/ZM/Command/Generate/SystemdGenerateCommand.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command\Generate;
 
-
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -15,28 +15,31 @@ class SystemdGenerateCommand extends Command
     // the name of the command (the part after "bin/console")
     protected static $defaultName = 'generate:systemd';
 
-    protected function configure() {
-        $this->setDescription("生成框架的 systemd 配置文件");
+    protected function configure()
+    {
+        $this->setDescription('生成框架的 systemd 配置文件');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         ZMConfig::setDirectory(DataProvider::getSourceRootDir() . '/config');
         $path = $this->generate();
-        $output->writeln("<info>成功生成 systemd 文件，位置：" . $path . "</info>");
-        $output->writeln("<info>有关如何使用 systemd 配置文件，请访问 `https://github.com/zhamao-robot/zhamao-framework/issues/36`</info>");
+        $output->writeln('<info>成功生成 systemd 文件，位置：' . $path . '</info>');
+        $output->writeln('<info>有关如何使用 systemd 配置文件，请访问 `https://github.com/zhamao-robot/zhamao-framework/issues/36`</info>');
         return 0;
     }
 
-    private function generate() {
+    private function generate()
+    {
         $s = "[Unit]\nDescription=zhamao-framework Daemon\nAfter=rc-local.service\n\n[Service]\nType=simple";
-        $s .= "\nUser=" . exec("whoami");
+        $s .= "\nUser=" . exec('whoami');
         $s .= "\nGroup=" . exec("groups | awk '{print $1}'");
         $s .= "\nWorkingDirectory=" . getcwd();
         global $argv;
         $s .= "\nExecStart=" . PHP_BINARY . " {$argv[0]} server";
         $s .= "\nRestart=always\n\n[Install]\nWantedBy=multi-user.target\n";
-        @mkdir(getcwd() . "/resources/");
-        file_put_contents(ZMConfig::get("global", "zm_data") . "zhamao.service", $s);
-        return ZMConfig::get("global", "zm_data") . "zhamao.service";
+        @mkdir(getcwd() . '/resources/');
+        file_put_contents(ZMConfig::get('global', 'zm_data') . 'zhamao.service', $s);
+        return ZMConfig::get('global', 'zm_data') . 'zhamao.service';
     }
 }

src/ZM/Command/InitCommand.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command;
 
@@ -11,99 +12,107 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class InitCommand extends Command
 {
-    private $extract_files = [
-        "/zhamao",
-        "/config/global.php",
-        "/.gitignore",
-        "/config/file_header.json",
-        "/config/console_color.json",
-        "/config/motd.txt",
-        "/src/Module/Example/Hello.php",
-        "/src/Module/Middleware/TimerMiddleware.php",
-        "/src/Custom/global_function.php"
-    ];
-
     // the name of the command (the part after "bin/console")
     protected static $defaultName = 'init';
 
-    protected function configure() {
-        $this->setDescription("Initialize framework starter | 初始化框架运行的基础文件");
+    private $extract_files = [
+        '/zhamao',
+        '/config/global.php',
+        '/.gitignore',
+        '/config/file_header.json',
+        '/config/console_color.json',
+        '/config/motd.txt',
+        '/src/Module/Example/Hello.php',
+        '/src/Module/Middleware/TimerMiddleware.php',
+        '/src/Custom/global_function.php',
+    ];
+
+    protected function configure()
+    {
+        $this->setDescription('Initialize framework starter | 初始化框架运行的基础文件');
         $this->setDefinition([
-            new InputOption("force", "F", null, "强制重制，覆盖现有文件")
+            new InputOption('force', 'F', null, '强制重制，覆盖现有文件'),
         ]);
         $this->setHelp("此命令将会解压以下文件到项目的根目录：\n" . implode("\n", $this->getExtractFiles()));
         // ...
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         if (LOAD_MODE === 1) { // 从composer依赖而来的项目模式，最基本的需要初始化的模式
-            $output->writeln("<comment>Initializing files</comment>");
+            $output->writeln('<comment>Initializing files</comment>');
             $base_path = WORKING_DIR;
-            $args = $input->getOption("force");
+            $args = $input->getOption('force');
             foreach ($this->extract_files as $file) {
                 if (!file_exists($base_path . $file) || $args) {
                     $info = pathinfo($file);
-                    @mkdir($base_path . $info["dirname"], 0777, true);
-                    echo "Copying " . $file . PHP_EOL;
-                    $package_name = (json_decode(file_get_contents(__DIR__ . "/../../../composer.json"), true)["name"]);
-                    copy($base_path . "/vendor/" . $package_name . $file, $base_path . $file);
+                    @mkdir($base_path . $info['dirname'], 0777, true);
+                    echo 'Copying ' . $file . PHP_EOL;
+                    $package_name = (json_decode(file_get_contents(__DIR__ . '/../../../composer.json'), true)['name']);
+                    copy($base_path . '/vendor/' . $package_name . $file, $base_path . $file);
                 } else {
-                    echo "Skipping " . $file . " , file exists." . PHP_EOL;
+                    echo 'Skipping ' . $file . ' , file exists.' . PHP_EOL;
                 }
             }
-            chmod($base_path . "/zhamao", 0755);
+            chmod($base_path . '/zhamao', 0755);
             $autoload = [
-                "psr-4" => [
-                    "Module\\" => "src/Module",
-                    "Custom\\" => "src/Custom"
+                'psr-4' => [
+                    'Module\\' => 'src/Module',
+                    'Custom\\' => 'src/Custom',
+                ],
+                'files' => [
+                    'src/Custom/global_function.php',
                 ],
-                "files" => [
-                    "src/Custom/global_function.php"
-                ]
             ];
-            if (file_exists($base_path . "/composer.json")) {
-                $composer = json_decode(file_get_contents($base_path . "/composer.json"), true);
-                if (!isset($composer["autoload"])) {
-                    $composer["autoload"] = $autoload;
+            if (file_exists($base_path . '/composer.json')) {
+                $composer = json_decode(file_get_contents($base_path . '/composer.json'), true);
+                if (!isset($composer['autoload'])) {
+                    $composer['autoload'] = $autoload;
                 } else {
-                    foreach ($autoload["psr-4"] as $k => $v) {
-                        if (!isset($composer["autoload"]["psr-4"][$k])) $composer["autoload"]["psr-4"][$k] = $v;
+                    foreach ($autoload['psr-4'] as $k => $v) {
+                        if (!isset($composer['autoload']['psr-4'][$k])) {
+                            $composer['autoload']['psr-4'][$k] = $v;
+                        }
                     }
-                    foreach ($autoload["files"] as $v) {
-                        if (!in_array($v, $composer["autoload"]["files"])) $composer["autoload"]["files"][] = $v;
+                    foreach ($autoload['files'] as $v) {
+                        if (!in_array($v, $composer['autoload']['files'])) {
+                            $composer['autoload']['files'][] = $v;
+                        }
                     }
                 }
-                file_put_contents($base_path . "/composer.json", json_encode($composer, 64 | 128 | 256));
-                $output->writeln("<info>Executing composer command: `composer dump-autoload`</info>");
-                exec("composer dump-autoload");
+                file_put_contents($base_path . '/composer.json', json_encode($composer, 64 | 128 | 256));
+                $output->writeln('<info>Executing composer command: `composer dump-autoload`</info>');
+                exec('composer dump-autoload');
                 echo PHP_EOL;
             } else {
-                echo(zm_internal_errcode("E00041") . "Error occurred. Please check your updates.\n");
+                echo zm_internal_errcode('E00041') . "Error occurred. Please check your updates.\n";
                 return 1;
             }
-            $output->writeln("<info>Done!</info>");
+            $output->writeln('<info>Done!</info>');
             return 0;
-        } elseif (LOAD_MODE === 2) { //从phar启动的框架包，初始化的模式
+        }
+        if (LOAD_MODE === 2) { //从phar启动的框架包，初始化的模式
             $phar_link = new Phar(__DIR__);
-            $current_dir = pathinfo($phar_link->getPath())["dirname"];
+            $current_dir = pathinfo($phar_link->getPath())['dirname'];
             chdir($current_dir);
-            $phar_link = "phar://" . $phar_link->getPath();
+            $phar_link = 'phar://' . $phar_link->getPath();
             foreach ($this->extract_files as $file) {
                 if (!file_exists($current_dir . $file)) {
                     $info = pathinfo($file);
-                    @mkdir($current_dir . $info["dirname"], 0777, true);
-                    echo "Copying " . $file . PHP_EOL;
+                    @mkdir($current_dir . $info['dirname'], 0777, true);
+                    echo 'Copying ' . $file . PHP_EOL;
                     file_put_contents($current_dir . $file, file_get_contents($phar_link . $file));
                 } else {
-                    echo "Skipping " . $file . " , file exists." . PHP_EOL;
+                    echo 'Skipping ' . $file . ' , file exists.' . PHP_EOL;
                 }
             }
         }
-        $output->writeln(zm_internal_errcode("E00042") . "initialization must be started with composer-project mode!");
+        $output->writeln(zm_internal_errcode('E00042') . 'initialization must be started with composer-project mode!');
         return 1;
     }
 
-    private function getExtractFiles(): array {
+    private function getExtractFiles(): array
+    {
         return $this->extract_files;
     }
 }

src/ZM/Command/Module/ModuleListCommand.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command\Module;
 
-
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -14,67 +14,78 @@ use ZM\Utils\Manager\ModuleManager;
 
 class ModuleListCommand extends Command
 {
-// the name of the command (the part after "bin/console")
+    // the name of the command (the part after "bin/console")
     protected static $defaultName = 'module:list';
 
-    protected function configure() {
-        $this->setDescription("查看所有模块信息");
-        $this->setHelp("此功能将会把炸毛框架的模块列举出来。");
+    protected function configure()
+    {
+        $this->setDescription('查看所有模块信息');
+        $this->setHelp('此功能将会把炸毛框架的模块列举出来。');
         // ...
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         ZMConfig::setDirectory(DataProvider::getSourceRootDir() . '/config');
-        ZMConfig::setEnv($args["env"] ?? "");
-        if (ZMConfig::get("global") === false) {
-            die (zm_internal_errcode("E00007") . "Global config load failed: " . ZMConfig::$last_error . "\nPlease init first!\nSee: https://github.com/zhamao-robot/zhamao-framework/issues/37\n");
+        ZMConfig::setEnv($args['env'] ?? '');
+        if (ZMConfig::get('global') === false) {
+            exit(zm_internal_errcode('E00007') . 'Global config load failed: ' . ZMConfig::$last_error . "\nPlease init first!\nSee: https://github.com/zhamao-robot/zhamao-framework/issues/37\n");
         }
 
         //定义常量
         /** @noinspection PhpIncludeInspection */
-        include_once DataProvider::getFrameworkRootDir() . "/src/ZM/global_defines.php";
+        include_once DataProvider::getFrameworkRootDir() . '/src/ZM/global_defines.php';
 
         Console::init(
-            ZMConfig::get("global", "info_level") ?? 2,
+            ZMConfig::get('global', 'info_level') ?? 2,
             null,
-            $args["log-theme"] ?? "default",
-            ($o = ZMConfig::get("console_color")) === false ? [] : $o
+            $args['log-theme'] ?? 'default',
+            ($o = ZMConfig::get('console_color')) === false ? [] : $o
         );
 
-        $timezone = ZMConfig::get("global", "timezone") ?? "Asia/Shanghai";
+        $timezone = ZMConfig::get('global', 'timezone') ?? 'Asia/Shanghai';
         date_default_timezone_set($timezone);
 
         $list = ModuleManager::getConfiguredModules();
 
         foreach ($list as $v) {
-            echo "[" . Console::setColor($v["name"], "green") . "]" . PHP_EOL;
-            $out_list = ["类型" => "源码(source)"];
-            if (isset($v["version"])) $out_list["版本"] = $v["version"];
-            if (isset($v["description"])) $out_list["描述"] = $v["description"];
-            $out_list["目录"] = str_replace(DataProvider::getSourceRootDir() . "/", "", $v["module-path"]);
+            echo '[' . Console::setColor($v['name'], 'green') . ']' . PHP_EOL;
+            $out_list = ['类型' => '源码(source)'];
+            if (isset($v['version'])) {
+                $out_list['版本'] = $v['version'];
+            }
+            if (isset($v['description'])) {
+                $out_list['描述'] = $v['description'];
+            }
+            $out_list['目录'] = str_replace(DataProvider::getSourceRootDir() . '/', '', $v['module-path']);
             $this->printList($out_list);
         }
         if ($list === []) {
-            echo Console::setColor("没有发现已编写打包配置文件（zm.json）的模块！", "yellow") . PHP_EOL;
+            echo Console::setColor('没有发现已编写打包配置文件（zm.json）的模块！', 'yellow') . PHP_EOL;
         }
         $list = ModuleManager::getPackedModules();
         foreach ($list as $v) {
-            echo "[" . Console::setColor($v["name"], "gold") . "]" . PHP_EOL;
-            $out_list = ["类型" => "模块包(phar)"];
-            if (isset($v["module-config"]["version"])) $out_list["版本"] = $v["module-config"]["version"];
-            if (isset($v["module-config"]["description"])) $out_list["描述"] = $v["module-config"]["description"];
-            $out_list["位置"] = str_replace(DataProvider::getSourceRootDir() . "/", "", $v["phar-path"]);
+            echo '[' . Console::setColor($v['name'], 'gold') . ']' . PHP_EOL;
+            $out_list = ['类型' => '模块包(phar)'];
+            if (isset($v['module-config']['version'])) {
+                $out_list['版本'] = $v['module-config']['version'];
+            }
+            if (isset($v['module-config']['description'])) {
+                $out_list['描述'] = $v['module-config']['description'];
+            }
+            $out_list['位置'] = str_replace(DataProvider::getSourceRootDir() . '/', '', $v['phar-path']);
             $this->printList($out_list);
         }
         if ($list === []) {
-            echo Console::setColor("没有发现已打包且装载的模块！", "yellow") . PHP_EOL;
+            echo Console::setColor('没有发现已打包且装载的模块！', 'yellow') . PHP_EOL;
         }
         return 0;
     }
 
-    private function printList($list) {
+    private function printList($list)
+    {
         foreach ($list as $k => $v) {
-            echo "\t" . $k . ": " . Console::setColor($v, "yellow") . PHP_EOL;
+            echo "\t" . $k . ': ' . Console::setColor($v, 'yellow') . PHP_EOL;
         }
     }
-}
+}

src/ZM/Command/Module/ModulePackCommand.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command\Module;
 
-
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -19,42 +19,47 @@ class ModulePackCommand extends Command
     // the name of the command (the part after "bin/console")
     protected static $defaultName = 'module:pack';
 
-    protected function configure() {
-        $this->addArgument("module-name", InputArgument::REQUIRED);
-        $this->setDescription("将配置好的模块构建一个phar包");
-        $this->setHelp("此功能将会把炸毛框架的模块打包为\".phar\"，供发布和执行。");
-        $this->addOption("target", "D", InputOption::VALUE_REQUIRED, "Output Directory | 指定输出目录");
+    protected function configure()
+    {
+        $this->addArgument('module-name', InputArgument::REQUIRED);
+        $this->setDescription('将配置好的模块构建一个phar包');
+        $this->setHelp('此功能将会把炸毛框架的模块打包为".phar"，供发布和执行。');
+        $this->addOption('target', 'D', InputOption::VALUE_REQUIRED, 'Output Directory | 指定输出目录');
         // ...
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         ZMConfig::setDirectory(DataProvider::getSourceRootDir() . '/config');
-        ZMConfig::setEnv($args["env"] ?? "");
-        if (ZMConfig::get("global") === false) {
-            die (zm_internal_errcode("E00007") . "Global config load failed: " . ZMConfig::$last_error . "\nPlease init first!\nSee: https://github.com/zhamao-robot/zhamao-framework/issues/37\n");
+        ZMConfig::setEnv($args['env'] ?? '');
+        if (ZMConfig::get('global') === false) {
+            exit(zm_internal_errcode('E00007') . 'Global config load failed: ' . ZMConfig::$last_error . "\nPlease init first!\nSee: https://github.com/zhamao-robot/zhamao-framework/issues/37\n");
         }
 
         //定义常量
-        include_once DataProvider::getFrameworkRootDir()."/src/ZM/global_defines.php";
+        include_once DataProvider::getFrameworkRootDir() . '/src/ZM/global_defines.php';
 
         Console::init(
-            ZMConfig::get("global", "info_level") ?? 2,
+            ZMConfig::get('global', 'info_level') ?? 2,
             null,
-            $args["log-theme"] ?? "default",
-            ($o = ZMConfig::get("console_color")) === false ? [] : $o
+            $args['log-theme'] ?? 'default',
+            ($o = ZMConfig::get('console_color')) === false ? [] : $o
         );
 
-        $timezone = ZMConfig::get("global", "timezone") ?? "Asia/Shanghai";
+        $timezone = ZMConfig::get('global', 'timezone') ?? 'Asia/Shanghai';
         date_default_timezone_set($timezone);
 
         $list = ModuleManager::getConfiguredModules();
-        if (!isset($list[$input->getArgument("module-name")])) {
-            $output->writeln("<error>不存在模块 ".$input->getArgument("module-name")." !</error>");
+        if (!isset($list[$input->getArgument('module-name')])) {
+            $output->writeln('<error>不存在模块 ' . $input->getArgument('module-name') . ' !</error>');
             return 1;
         }
-        $result = ModuleManager::packModule($list[$input->getArgument("module-name")], $input->getOption("target"));
-        if ($result) Console::success("打包完成！");
-        else Console::error("打包失败！");
+        $result = ModuleManager::packModule($list[$input->getArgument('module-name')], $input->getOption('target'));
+        if ($result) {
+            Console::success('打包完成！');
+        } else {
+            Console::error('打包失败！');
+        }
         return 0;
     }
-}
+}

src/ZM/Command/Module/ModuleUnpackCommand.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command\Module;
 
-
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -16,51 +16,56 @@ use ZM\Utils\Manager\ModuleManager;
 
 class ModuleUnpackCommand extends Command
 {
-// the name of the command (the part after "bin/console")
+    // the name of the command (the part after "bin/console")
     protected static $defaultName = 'module:unpack';
 
-    protected function configure() {
+    protected function configure()
+    {
         $this->setDefinition([
-            new InputArgument("module-name", InputArgument::REQUIRED),
-            new InputOption("overwrite-light-cache", null, null, "覆盖现有的LightCache项目"),
-            new InputOption("overwrite-zm-data", null, null, "覆盖现有的zm_data文件"),
-            new InputOption("overwrite-source", null, null, "覆盖现有的源码文件"),
-            new InputOption("ignore-depends", null, null, "解包时忽略检查依赖")
+            new InputArgument('module-name', InputArgument::REQUIRED),
+            new InputOption('overwrite-light-cache', null, null, '覆盖现有的LightCache项目'),
+            new InputOption('overwrite-zm-data', null, null, '覆盖现有的zm_data文件'),
+            new InputOption('overwrite-source', null, null, '覆盖现有的源码文件'),
+            new InputOption('ignore-depends', null, null, '解包时忽略检查依赖'),
         ]);
-        $this->setDescription("解包一个phar模块到src目录");
-        $this->setHelp("此功能将phar格式的模块包解包到src目录下。");
+        $this->setDescription('解包一个phar模块到src目录');
+        $this->setHelp('此功能将phar格式的模块包解包到src目录下。');
         // ...
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         ZMConfig::setDirectory(DataProvider::getSourceRootDir() . '/config');
-        ZMConfig::setEnv($args["env"] ?? "");
-        if (ZMConfig::get("global") === false) {
-            die (zm_internal_errcode("E00007") . "Global config load failed: " . ZMConfig::$last_error . "\nPlease init first!\nSee: https://github.com/zhamao-robot/zhamao-framework/issues/37\n");
+        ZMConfig::setEnv($args['env'] ?? '');
+        if (ZMConfig::get('global') === false) {
+            exit(zm_internal_errcode('E00007') . 'Global config load failed: ' . ZMConfig::$last_error . "\nPlease init first!\nSee: https://github.com/zhamao-robot/zhamao-framework/issues/37\n");
         }
 
         //定义常量
         /** @noinspection PhpIncludeInspection */
-        include_once DataProvider::getFrameworkRootDir()."/src/ZM/global_defines.php";
+        include_once DataProvider::getFrameworkRootDir() . '/src/ZM/global_defines.php';
 
         Console::init(
-            ZMConfig::get("global", "info_level") ?? 4,
+            ZMConfig::get('global', 'info_level') ?? 4,
             null,
-            $args["log-theme"] ?? "default",
-            ($o = ZMConfig::get("console_color")) === false ? [] : $o
+            $args['log-theme'] ?? 'default',
+            ($o = ZMConfig::get('console_color')) === false ? [] : $o
         );
 
-        $timezone = ZMConfig::get("global", "timezone") ?? "Asia/Shanghai";
+        $timezone = ZMConfig::get('global', 'timezone') ?? 'Asia/Shanghai';
         date_default_timezone_set($timezone);
 
         $list = ModuleManager::getPackedModules();
-        if (!isset($list[$input->getArgument("module-name")])) {
-            $output->writeln("<error>不存在打包的模块 ".$input->getArgument("module-name")." !</error>");
+        if (!isset($list[$input->getArgument('module-name')])) {
+            $output->writeln('<error>不存在打包的模块 ' . $input->getArgument('module-name') . ' !</error>');
             return 1;
         }
-        $result = ModuleManager::unpackModule($list[$input->getArgument("module-name")], $input->getOptions());
-        if ($result) Console::success("解压完成！");
-        else Console::error("解压失败！");
+        $result = ModuleManager::unpackModule($list[$input->getArgument('module-name')], $input->getOptions());
+        if ($result) {
+            Console::success('解压完成！');
+        } else {
+            Console::error('解压失败！');
+        }
         return 0;
     }
-}
+}

src/ZM/Command/PureHttpCommand.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command;
 
-
 use Swoole\Atomic;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
@@ -26,71 +26,74 @@ class PureHttpCommand extends Command
     // the name of the command (the part after "bin/console")
     protected static $defaultName = 'simple-http-server';
 
-    protected function configure() {
-        $this->setDescription("Run a simple http server | 启动一个简单的文件 HTTP 服务器");
-        $this->setHelp("直接运行可以启动");
+    protected function configure()
+    {
+        $this->setDescription('Run a simple http server | 启动一个简单的文件 HTTP 服务器');
+        $this->setHelp('直接运行可以启动');
         $this->addArgument('dir', InputArgument::REQUIRED, 'Your directory');
-        $this->addOption("host", 'H', InputOption::VALUE_REQUIRED, "启动监听地址");
-        $this->addOption("port", 'P', InputOption::VALUE_REQUIRED, "启动监听地址的端口");
+        $this->addOption('host', 'H', InputOption::VALUE_REQUIRED, '启动监听地址');
+        $this->addOption('port', 'P', InputOption::VALUE_REQUIRED, '启动监听地址的端口');
         // ...
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
-        $tty_width = explode(" ", trim(exec("stty size")))[1];
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $tty_width = explode(' ', trim(exec('stty size')))[1];
         if (realpath($input->getArgument('dir') ?? '.') === false) {
-            $output->writeln("<error>Directory error(" . ($input->getArgument('dir') ?? '.') . "): no such file or directory.</error>");
+            $output->writeln('<error>Directory error(' . ($input->getArgument('dir') ?? '.') . '): no such file or directory.</error>');
             return self::FAILURE;
         }
         ZMConfig::setDirectory(DataProvider::getSourceRootDir() . '/config');
-        $global = ZMConfig::get("global");
-        $host = $input->getOption("host") ?? $global["host"];
-        $port = $input->getOption("port") ?? $global["port"];
+        $global = ZMConfig::get('global');
+        $host = $input->getOption('host') ?? $global['host'];
+        $port = $input->getOption('port') ?? $global['port'];
 
-        $index = ["index.html", "index.htm"];
+        $index = ['index.html', 'index.htm'];
         $out = [
-            "listen" => $host.":".$port,
-            "version" => ZM_VERSION,
-            "web_root" => realpath($input->getArgument('dir') ?? '.'),
-            "index" => implode(",", $index)
+            'listen' => $host . ':' . $port,
+            'version' => ZM_VERSION,
+            'web_root' => realpath($input->getArgument('dir') ?? '.'),
+            'index' => implode(',', $index),
         ];
         Framework::printProps($out, $tty_width);
         $server = new Server($host, $port);
-        $server->set(ZMConfig::get("global", "swoole"));
+        $server->set(ZMConfig::get('global', 'swoole'));
         Console::init(2, $server);
-        ZMAtomic::$atomics["request"] = [];
+        ZMAtomic::$atomics['request'] = [];
         for ($i = 0; $i < 32; ++$i) {
-            ZMAtomic::$atomics["request"][$i] = new Atomic(0);
+            ZMAtomic::$atomics['request'][$i] = new Atomic(0);
         }
-        $server->on("request", function (Request $request, Response $response) use ($input, $index, $server) {
-            ZMAtomic::$atomics["request"][$server->worker_id]->add(1);
+        $server->on('request', function (Request $request, Response $response) use ($input, $index, $server) {
+            ZMAtomic::$atomics['request'][$server->worker_id]->add(1);
             HttpUtil::handleStaticPage(
-                $request->server["request_uri"],
+                $request->server['request_uri'],
                 $response,
                 [
-                    "document_root" => realpath($input->getArgument('dir') ?? '.'),
-                    "document_index" => $index
-                ]);
+                    'document_root' => realpath($input->getArgument('dir') ?? '.'),
+                    'document_index' => $index,
+                ]
+            );
             //echo "\r" . Coroutine::stats()["coroutine_peak_num"];
         });
-        $server->on("start", function ($server) {
+        $server->on('start', function ($server) {
             Process::signal(SIGINT, function () use ($server) {
                 echo "\r";
-                Console::warning("Server interrupted by keyboard.");
+                Console::warning('Server interrupted by keyboard.');
                 for ($i = 0; $i < 32; ++$i) {
-                    $num = ZMAtomic::$atomics["request"][$i]->get();
-                    if ($num != 0)
-                        echo "[$i]: " . $num . "\n";
+                    $num = ZMAtomic::$atomics['request'][$i]->get();
+                    if ($num != 0) {
+                        echo "[{$i}]: " . $num . "\n";
+                    }
                 }
                 $server->shutdown();
                 $server->stop();
             });
-            Console::success("Server started. Use Ctrl+C to stop.");
+            Console::success('Server started. Use Ctrl+C to stop.');
         });
         $server->start();
         // return this if there was no problem running the command
         // (it's equivalent to returning int(0))
         return 0;
-
         // or return this if some error happened during the execution
         // (it's equivalent to returning int(1))
         // return 1;

src/ZM/Command/RunServerCommand.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command;
 
@@ -8,65 +9,63 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use ZM\Framework;
-use ZM\Utils\DataProvider;
 
 class RunServerCommand extends Command
 {
     protected static $defaultName = 'server';
 
-    protected function configure() {
-        $this->setAliases(['server:start']);
-        $this->setDefinition([
-            new InputOption("debug-mode", "D", null, "开启调试模式 (这将关闭协程化)"),
-            new InputOption("log-debug", null, null, "调整消息等级到debug (log-level=4)"),
-            new InputOption("log-verbose", null, null, "调整消息等级到verbose (log-level=3)"),
-            new InputOption("log-info", null, null, "调整消息等级到info (log-level=2)"),
-            new InputOption("log-warning", null, null, "调整消息等级到warning (log-level=1)"),
-            new InputOption("log-error", null, null, "调整消息等级到error (log-level=0)"),
-            new InputOption("log-theme", null, InputOption::VALUE_REQUIRED, "改变终端的主题配色"),
-            new InputOption("disable-console-input", null, null, "禁止终端输入内容 (废弃)"),
-            new InputOption("interact", null, null, "打开终端输入"),
-            new InputOption("remote-terminal", null, null, "启用远程终端，配置使用global.php中的"),
-            new InputOption("disable-coroutine", null, null, "关闭协程Hook"),
-            new InputOption("daemon", null, null, "以守护进程的方式运行框架"),
-            new InputOption("worker-num", null, InputOption::VALUE_REQUIRED, "启动框架时运行的 Worker 进程数量"),
-            new InputOption("task-worker-num", null, InputOption::VALUE_REQUIRED, "启动框架时运行的 TaskWorker 进程数量"),
-            new InputOption("watch", null, null, "监听 src/ 目录的文件变化并热更新"),
-            new InputOption("show-php-ver", null, null, "启动时显示PHP和Swoole版本"),
-            new InputOption("env", null, InputOption::VALUE_REQUIRED, "设置环境类型 (production, development, staging)"),
-            new InputOption("disable-safe-exit", null, null, "关闭安全退出（关闭后按CtrlC时直接杀死进程）"),
-            new InputOption("preview", null, null, "只显示参数，不启动服务器"),
-            new InputOption("force-load-module", null, InputOption::VALUE_OPTIONAL, "强制打包状态下加载模块（使用英文逗号分割多个）")
-        ]);
-        $this->setDescription("Run zhamao-framework | 启动框架");
-        $this->setHelp("直接运行可以启动");
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int {
-        if (($opt = $input->getOption("env")) !== null) {
-            if (!in_array($opt, ["production", "staging", "development", ""])) {
-                $output->writeln("<error> \"--env\" option only accept production, development, staging and [empty] ! </error>");
-                return 1;
-            }
-        }
-        $pid_path = DataProvider::getWorkingDir() . "/.daemon_pid";
-        if (file_exists($pid_path)) {
-            $pid = json_decode(file_get_contents($pid_path), true)["pid"] ?? null;
-            if ($pid !== null && posix_getsid($pid) !== false) {
-                $output->writeln("<error>检测到已经在 pid: $pid 进程启动了框架！</error>");
-                $output->writeln("<error>不可以同时启动两个框架！</error>");
-                return 1;
-            } else {
-                unlink($pid_path);
-            }
-        }
-        (new Framework($input->getOptions()))->start();
-        return 0;
-    }
-
-    public static function exportDefinition() {
+    public static function exportDefinition()
+    {
         $cmd = new self();
         $cmd->configure();
         return $cmd->getDefinition();
     }
+
+    protected function configure()
+    {
+        $this->setAliases(['server:start']);
+        $this->setDefinition([
+            new InputOption('debug-mode', 'D', null, '开启调试模式 (这将关闭协程化)'),
+            new InputOption('log-debug', null, null, '调整消息等级到debug (log-level=4)'),
+            new InputOption('log-verbose', null, null, '调整消息等级到verbose (log-level=3)'),
+            new InputOption('log-info', null, null, '调整消息等级到info (log-level=2)'),
+            new InputOption('log-warning', null, null, '调整消息等级到warning (log-level=1)'),
+            new InputOption('log-error', null, null, '调整消息等级到error (log-level=0)'),
+            new InputOption('log-theme', null, InputOption::VALUE_REQUIRED, '改变终端的主题配色'),
+            new InputOption('disable-console-input', null, null, '禁止终端输入内容 (废弃)'),
+            new InputOption('interact', null, null, '打开终端输入'),
+            new InputOption('remote-terminal', null, null, '启用远程终端，配置使用global.php中的'),
+            new InputOption('disable-coroutine', null, null, '关闭协程Hook'),
+            new InputOption('daemon', null, null, '以守护进程的方式运行框架'),
+            new InputOption('worker-num', null, InputOption::VALUE_REQUIRED, '启动框架时运行的 Worker 进程数量'),
+            new InputOption('task-worker-num', null, InputOption::VALUE_REQUIRED, '启动框架时运行的 TaskWorker 进程数量'),
+            new InputOption('watch', null, null, '监听 src/ 目录的文件变化并热更新'),
+            new InputOption('show-php-ver', null, null, '启动时显示PHP和Swoole版本'),
+            new InputOption('env', null, InputOption::VALUE_REQUIRED, '设置环境类型 (production, development, staging)'),
+            new InputOption('disable-safe-exit', null, null, '关闭安全退出（关闭后按CtrlC时直接杀死进程）'),
+            new InputOption('preview', null, null, '只显示参数，不启动服务器'),
+            new InputOption('force-load-module', null, InputOption::VALUE_OPTIONAL, '强制打包状态下加载模块（使用英文逗号分割多个）'),
+            new InputOption('polling-watch', null, null, '强制启用轮询模式监听'),
+        ]);
+        $this->setDescription('Run zhamao-framework | 启动框架');
+        $this->setHelp('直接运行可以启动');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        if (($opt = $input->getOption('env')) !== null) {
+            if (!in_array($opt, ['production', 'staging', 'development', ''])) {
+                $output->writeln('<error> "--env" option only accept production, development, staging and [empty] ! </error>');
+                return 1;
+            }
+        }
+        $state = Framework::getProcessState(ZM_PROCESS_MASTER);
+        if (is_array($state) && posix_getsid($state['pid'] ?? -1) !== false) {
+            $output->writeln("<error>检测到已经在 pid: {$state['pid']} 进程启动了框架！</error>");
+            $output->writeln('<error>不可以同时启动两个框架！</error>');
+            return 1;
+        }
+        (new Framework($input->getOptions()))->start();
+        return 0;
+    }
 }

src/ZM/Command/Server/ServerReloadCommand.php

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command\Server;
 
@@ -12,14 +13,16 @@ class ServerReloadCommand extends DaemonCommand
 {
     protected static $defaultName = 'server:reload';
 
-    protected function configure() {
-        $this->setDescription("重载框架");
+    protected function configure()
+    {
+        $this->setDescription('重载框架');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         parent::execute($input, $output);
-        Process::kill(intval($this->daemon_file["pid"]), SIGUSR1);
-        $output->writeln("<info>成功重载！</info>");
+        Process::kill(intval($this->daemon_file['pid']), SIGUSR1);
+        $output->writeln('<info>成功重载！</info>');
         return 0;
     }
 }

src/ZM/Command/Server/ServerStatusCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace ZM\Command\Server;
 
 use Symfony\Component\Console\Input\InputInterface;
@@ -10,25 +12,25 @@ class ServerStatusCommand extends DaemonCommand
 {
     protected static $defaultName = 'server:status';
 
-    protected function configure() {
-        $this->setDescription("查看框架的运行状态");
+    protected function configure()
+    {
+        $this->setDescription('查看框架的运行状态');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
         parent::execute($input, $output);
-        $output->writeln("<info>框架" . ($this->daemon_file["daemon"] ? "以守护进程模式" : "") . "运行中，pid：" . $this->daemon_file["pid"] . "</info>");
-        if ($this->daemon_file["daemon"]) {
-            $output->writeln("<comment>----- 以下是stdout内容 -----</comment>");
-            $stdout = file_get_contents($this->daemon_file["stdout"]);
+        $output->writeln('<info>框架' . ($this->daemon_file['daemon'] ? '以守护进程模式' : '') . '运行中，pid：' . $this->daemon_file['pid'] . '</info>');
+        if ($this->daemon_file['daemon']) {
+            $output->writeln('<comment>----- 以下是stdout内容 -----</comment>');
+            $stdout = file_get_contents($this->daemon_file['stdout']);
             $stdout = explode("\n", $stdout);
             for ($i = 15; $i > 0; --$i) {
-                if (isset($stdout[count($stdout) - $i]))
+                if (isset($stdout[count($stdout) - $i])) {
                     echo $stdout[count($stdout) - $i] . PHP_EOL;
+                }
             }
         }
         return 0;
     }
 }
-{
-
-}

src/ZM/Command/Server/ServerStopCommand.php

@@ -1,34 +1,59 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Command\Server;
 
 use Swoole\Process;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use ZM\Command\Daemon\DaemonCommand;
+use ZM\Framework;
 use ZM\Utils\DataProvider;
 
 class ServerStopCommand extends DaemonCommand
 {
     protected static $defaultName = 'server:stop';
 
-    protected function configure() {
-        $this->setDescription("停止运行的框架");
+    protected function configure()
+    {
+        $this->setDescription('停止运行的框架');
+        $this->setDefinition([
+            new InputOption('force', 'f', InputOption::VALUE_NONE, '强制停止'),
+        ]);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int {
-        parent::execute($input, $output);
-        Process::kill(intval($this->daemon_file["pid"]), SIGTERM);
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        if ($input->getOption('force') !== false) {
+            $file_path = _zm_pid_dir();
+            $list = DataProvider::scanDirFiles($file_path, false, true);
+            foreach ($list as $file) {
+                $name = explode('.', $file);
+                if (end($name) == 'pid') {
+                    $pid = file_get_contents($file_path . '/' . $file);
+                    Process::kill($pid, SIGKILL);
+                } elseif ($file === 'master.json') {
+                    $json = json_decode(file_get_contents($file_path . '/' . $file), true);
+                    Process::kill($json['pid'], SIGKILL);
+                }
+                unlink($file_path . '/' . $file);
+            }
+        } else {
+            parent::execute($input, $output);
+        }
+        Process::kill(intval($this->daemon_file['pid']), SIGTERM);
         $i = 10;
-        while (file_exists(DataProvider::getWorkingDir() . "/.daemon_pid") && $i > 0) {
+        while (Framework::getProcessState(ZM_PROCESS_MASTER) !== false && $i > 0) {
             sleep(1);
             --$i;
         }
         if ($i === 0) {
-            $output->writeln("<error>停止失败，请检查进程pid #" . $this->daemon_file["pid"] . " 是否响应！</error>");
+            $output->writeln('<error>停止失败，请检查进程pid #' . $this->daemon_file['pid'] . ' 是否响应！</error>');
+            $output->writeln('<error>或者可以尝试使用参数 --force 来强行杀死所有进程</error>');
         } else {
-            $output->writeln("<info>成功停止！</info>");
+            $output->writeln('<info>成功停止！</info>');
         }
         return 0;
     }

src/ZM/ConsoleApplication.php

@@ -1,11 +1,14 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM;
 
-
 use Exception;
 use Phar;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use ZM\Command\BuildCommand;
 use ZM\Command\CheckConfigCommand;
 use ZM\Command\Daemon\DaemonReloadCommand;
@@ -18,9 +21,6 @@ use ZM\Command\Module\ModulePackCommand;
 use ZM\Command\Module\ModuleUnpackCommand;
 use ZM\Command\PureHttpCommand;
 use ZM\Command\RunServerCommand;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use ZM\Command\Server\ServerReloadCommand;
 use ZM\Command\Server\ServerStatusCommand;
 use ZM\Command\Server\ServerStopCommand;
@@ -28,64 +28,59 @@ use ZM\Exception\InitException;
 
 class ConsoleApplication extends Application
 {
-    private static $obj = null;
+    public const VERSION_ID = 436;
 
-    const VERSION_ID = 432;
-    const VERSION = "2.6.4";
+    public const VERSION = '2.7.0-beta2';
+
+    private static $obj;
 
     /**
      * @throws InitException
      */
-    public function __construct(string $name = 'UNKNOWN') {
-        if (self::$obj !== null) throw new InitException(zm_internal_errcode("E00069") . "Initializing another Application is not allowed!");
-        define("ZM_VERSION_ID", self::VERSION_ID);
-        define("ZM_VERSION", self::VERSION);
+    public function __construct(string $name = 'UNKNOWN')
+    {
+        if (self::$obj !== null) {
+            throw new InitException(zm_internal_errcode('E00069') . 'Initializing another Application is not allowed!');
+        }
+        define('ZM_VERSION_ID', self::VERSION_ID);
+        define('ZM_VERSION', self::VERSION);
         self::$obj = $this;
         parent::__construct($name, ZM_VERSION);
     }
 
     /**
-     * @param string $with_default_cmd
-     * @return ConsoleApplication
      * @throws InitException
      */
-    public function initEnv(string $with_default_cmd = ""): ConsoleApplication {
-        if (defined("WORKING_DIR")) throw new InitException();
+    public function initEnv(string $with_default_cmd = ''): ConsoleApplication
+    {
+        if (defined('WORKING_DIR')) {
+            throw new InitException();
+        }
 
         _zm_env_check();
 
-        define("WORKING_DIR", getcwd());
-        if (Phar::running() !== "") {
-            echo "* Running in phar mode.\n";
-            define("SOURCE_ROOT_DIR", Phar::running());
-            define("LOAD_MODE", is_dir(SOURCE_ROOT_DIR . "/src/ZM") ? 0 : 1);
-            define("FRAMEWORK_ROOT_DIR", LOAD_MODE == 1 ? (SOURCE_ROOT_DIR . "/vendor/zhamao/framework") : SOURCE_ROOT_DIR);
-        } else {
-            define("SOURCE_ROOT_DIR", WORKING_DIR);
-            define("LOAD_MODE", is_dir(SOURCE_ROOT_DIR . "/src/ZM") ? 0 : 1);
-            define("FRAMEWORK_ROOT_DIR", realpath(__DIR__ . "/../../"));
+        // 定义多进程的全局变量
+        define('ZM_PROCESS_MASTER', 1);
+        define('ZM_PROCESS_MANAGER', 2);
+        define('ZM_PROCESS_WORKER', 4);
+        define('ZM_PROCESS_USER', 8);
+        define('ZM_PROCESS_TASKWORKER', 16);
+
+        define('WORKING_DIR', getcwd());
+
+        if (!is_dir(_zm_pid_dir())) {
+            @mkdir(_zm_pid_dir());
         }
-        if (LOAD_MODE == 0) {
-            $composer = json_decode(file_get_contents(SOURCE_ROOT_DIR . "/composer.json"), true);
-            if (!isset($composer["autoload"]["psr-4"]["Module\\"])) {
-                echo "框架源码模式需要在autoload文件中添加Module目录为自动加载，是否添加？[Y/n] ";
-                $r = strtolower(trim(fgets(STDIN)));
-                if ($r === "" || $r === "y") {
-                    $composer["autoload"]["psr-4"]["Module\\"] = "src/Module";
-                    $composer["autoload"]["psr-4"]["Custom\\"] = "src/Custom";
-                    $r = file_put_contents(WORKING_DIR . "/composer.json", json_encode($composer, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
-                    if ($r !== false) {
-                        echo "成功添加！请运行 'composer dump-autoload'\n";
-                        exit(0);
-                    } else {
-                        echo zm_internal_errcode("E00006") . "添加失败！请按任意键继续！";
-                        fgets(STDIN);
-                        exit(1);
-                    }
-                } else {
-                    exit(1);
-                }
-            }
+
+        if (Phar::running() !== '') {
+            echo "* Running in phar mode.\n";
+            define('SOURCE_ROOT_DIR', Phar::running());
+            define('LOAD_MODE', is_dir(SOURCE_ROOT_DIR . '/src/ZM') ? 0 : 1);
+            define('FRAMEWORK_ROOT_DIR', LOAD_MODE == 1 ? (SOURCE_ROOT_DIR . '/vendor/zhamao/framework') : SOURCE_ROOT_DIR);
+        } else {
+            define('SOURCE_ROOT_DIR', WORKING_DIR);
+            define('LOAD_MODE', is_dir(SOURCE_ROOT_DIR . '/src/ZM') ? 0 : 1);
+            define('FRAMEWORK_ROOT_DIR', realpath(__DIR__ . '/../../'));
         }
 
         $this->addCommands([
@@ -97,12 +92,12 @@ class ConsoleApplication extends Application
             new ServerStopCommand(),
             new ServerReloadCommand(),
             new PureHttpCommand(), //纯HTTP服务器指令
-            new SystemdGenerateCommand()
+            new SystemdGenerateCommand(),
         ]);
         if (LOAD_MODE === 1) {
             $this->add(new CheckConfigCommand());
         }
-        if (Phar::running() === "") {
+        if (Phar::running() === '') {
             $this->add(new BuildCommand());
             $this->add(new InitCommand());
             $this->add(new ModulePackCommand());
@@ -115,16 +110,13 @@ class ConsoleApplication extends Application
         return $this;
     }
 
-    /**
-     * @param InputInterface|null $input
-     * @param OutputInterface|null $output
-     * @return int
-     */
-    public function run(InputInterface $input = null, OutputInterface $output = null): int {
+    public function run(InputInterface $input = null, OutputInterface $output = null): int
+    {
         try {
             return parent::run($input, $output);
         } catch (Exception $e) {
-            die(zm_internal_errcode("E00005") . "{$e->getMessage()} at {$e->getFile()}({$e->getLine()})");
+            echo zm_internal_errcode('E00005') . "{$e->getMessage()} at {$e->getFile()}({$e->getLine()})" . PHP_EOL;
+            exit(1);
         }
     }
 }

src/ZM/Context/Context.php

@@ -1,14 +1,15 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Context;
 
-
 use Exception;
 use Swoole\Coroutine;
 use Swoole\Http\Request;
 use Swoole\WebSocket\Frame;
 use Swoole\WebSocket\Server;
+use ZM\API\ZMRobot;
 use ZM\Config\ZMConfig;
 use ZM\ConnectionManager\ConnectionObject;
 use ZM\ConnectionManager\ManagerGM;
@@ -18,194 +19,252 @@ use ZM\Exception\InterruptException;
 use ZM\Exception\InvalidArgumentException;
 use ZM\Exception\WaitTimeoutException;
 use ZM\Http\Response;
-use ZM\API\ZMRobot;
 use ZM\Utils\CoMessage;
 use ZM\Utils\MessageUtil;
 
 class Context implements ContextInterface
 {
     public static $context = [];
+
     private $cid;
 
-    public function __construct($cid) { $this->cid = $cid; }
+    public function __construct($cid)
+    {
+        $this->cid = $cid;
+    }
 
     /**
      * @return Server
      */
-    public function getServer(): ?Server { return self::$context[$this->cid]["server"] ?? server(); }
+    public function getServer(): ?Server
+    {
+        return self::$context[$this->cid]['server'] ?? server();
+    }
 
-    /**
-     * @return Frame|null
-     */
-    public function getFrame(): ?Frame { return self::$context[$this->cid]["frame"] ?? null; }
+    public function getFrame(): ?Frame
+    {
+        return self::$context[$this->cid]['frame'] ?? null;
+    }
 
-    public function getFd(): ?int { return self::$context[$this->cid]["fd"] ?? $this->getFrame()->fd ?? null; }
+    public function getFd(): ?int
+    {
+        return self::$context[$this->cid]['fd'] ?? $this->getFrame()->fd ?? null;
+    }
 
     /**
      * @return mixed
      */
-    public function getData() { return self::$context[$this->cid]["data"] ?? null; }
+    public function getData()
+    {
+        return self::$context[$this->cid]['data'] ?? null;
+    }
 
-    public function setData($data) { self::$context[$this->cid]["data"] = $data; }
+    public function setData($data)
+    {
+        self::$context[$this->cid]['data'] = $data;
+    }
 
-    /**
-     * @return Request|null
-     */
-    public function getRequest(): ?Request { return self::$context[$this->cid]["request"] ?? null; }
+    public function getRequest(): ?Request
+    {
+        return self::$context[$this->cid]['request'] ?? null;
+    }
 
-    /**
-     * @return Response|null
-     */
-    public function getResponse(): ?Response { return self::$context[$this->cid]["response"] ?? null; }
+    public function getResponse(): ?Response
+    {
+        return self::$context[$this->cid]['response'] ?? null;
+    }
 
-    /** @return ConnectionObject|null */
-    public function getConnection(): ?ConnectionObject { return ManagerGM::get($this->getFd()); }
+    public function getConnection(): ?ConnectionObject
+    {
+        return ManagerGM::get($this->getFd());
+    }
 
-    /**
-     * @return int|null
-     */
-    public function getCid(): ?int { return $this->cid; }
+    public function getCid(): ?int
+    {
+        return $this->cid;
+    }
 
-    /**
-     * @return ZMRobot|null
-     */
-    public function getRobot(): ?ZMRobot {
+    public function getRobot(): ?ZMRobot
+    {
         $conn = ManagerGM::get($this->getFrame()->fd);
         return $conn instanceof ConnectionObject ? new ZMRobot($conn) : null;
     }
 
-    public function getMessage() {
-        if ((ZMConfig::get("global", "onebot")["message_convert_string"] ?? true) === true && is_array($msg = $this->getOriginMessage())) {
+    public function getMessage()
+    {
+        if ((ZMConfig::get('global', 'onebot')['message_convert_string'] ?? true) === true && is_array($msg = $this->getOriginMessage())) {
             return MessageUtil::arrayToStr($msg);
-        } else {
-            return self::$context[$this->cid]["data"]["message"] ?? null;
         }
+        return self::$context[$this->cid]['data']['message'] ?? null;
     }
 
-    public function setMessage($msg) {
+    public function setMessage($msg)
+    {
         if (is_string($msg) && is_array($this->getOriginMessage())) {
             $msg = MessageUtil::strToArray($msg);
         }
-        self::$context[$this->cid]["data"]["message"] = $msg;
+        self::$context[$this->cid]['data']['message'] = $msg;
     }
 
-    public function getUserId() { return $this->getData()["user_id"] ?? null; }
+    public function getUserId()
+    {
+        return $this->getData()['user_id'] ?? null;
+    }
 
-    public function setUserId($id) { self::$context[$this->cid]["data"]["user_id"] = $id; }
+    public function setUserId($id)
+    {
+        self::$context[$this->cid]['data']['user_id'] = $id;
+    }
 
-    public function getGroupId() { return $this->getData()["group_id"] ?? null; }
+    public function getGroupId()
+    {
+        return $this->getData()['group_id'] ?? null;
+    }
 
-    public function setGroupId($id) { self::$context[$this->cid]["data"]["group_id"] = $id; }
+    public function setGroupId($id)
+    {
+        self::$context[$this->cid]['data']['group_id'] = $id;
+    }
 
-    public function getDiscussId() { return $this->getData()["discuss_id"] ?? null; }
+    public function getDiscussId()
+    {
+        return $this->getData()['discuss_id'] ?? null;
+    }
 
-    public function setDiscussId($id) { self::$context[$this->cid]["data"]["discuss_id"] = $id; }
+    public function setDiscussId($id)
+    {
+        self::$context[$this->cid]['data']['discuss_id'] = $id;
+    }
 
-    public function getMessageType(): ?string { return $this->getData()["message_type"] ?? null; }
+    public function getMessageType(): ?string
+    {
+        return $this->getData()['message_type'] ?? null;
+    }
 
-    public function setMessageType($type) { self::$context[$this->cid]["data"]["message_type"] = $type; }
+    public function setMessageType($type)
+    {
+        self::$context[$this->cid]['data']['message_type'] = $type;
+    }
 
-    public function getRobotId() { return $this->getData()["self_id"] ?? null; }
+    public function getRobotId()
+    {
+        return $this->getData()['self_id'] ?? null;
+    }
 
-    public function getCache($key) { return self::$context[$this->cid]["cache"][$key] ?? null; }
+    public function getCache($key)
+    {
+        return self::$context[$this->cid]['cache'][$key] ?? null;
+    }
 
-    public function setCache($key, $value) { self::$context[$this->cid]["cache"][$key] = $value; }
+    public function setCache($key, $value)
+    {
+        self::$context[$this->cid]['cache'][$key] = $value;
+    }
 
-    public function getCQResponse() { return self::$context[$this->cid]["cq_response"] ?? null; }
+    public function getCQResponse()
+    {
+        return self::$context[$this->cid]['cq_response'] ?? null;
+    }
 
     /**
      * only can used by cq->message event function
      * @param $msg
-     * @param bool $yield
+     * @param  bool       $yield
      * @return array|bool
      */
-    public function reply($msg, $yield = false) {
+    public function reply($msg, $yield = false)
+    {
         $data = $this->getData();
         $conn = $this->getConnection();
         if (!is_array($msg)) {
-            switch ($this->getData()["message_type"]) {
-                case "group":
-                case "private":
-                case "discuss":
-                    $this->setCache("has_reply", true);
-                    $operation["reply"] = $msg;
-                    $operation["at_sender"] = false;
-                    return (new ZMRobot($conn))->setCallback($yield)->callExtendedAPI(".handle_quick_operation", [
-                        "context" => $data,
-                        "operation" => $operation
+            switch ($this->getData()['message_type']) {
+                case 'group':
+                case 'private':
+                case 'discuss':
+                    $this->setCache('has_reply', true);
+                    $operation['reply'] = $msg;
+                    $operation['at_sender'] = false;
+                    return (new ZMRobot($conn))->setCallback($yield)->callExtendedAPI('.handle_quick_operation', [
+                        'context' => $data,
+                        'operation' => $operation,
                     ]);
             }
             return false;
-        } else {
-            $operation = $msg;
-            return (new ZMRobot($conn))->setCallback(false)->callExtendedAPI(".handle_quick_operation", [
-                "context" => $data,
-                "operation" => $operation
-            ]);
         }
+        $operation = $msg;
+        return (new ZMRobot($conn))->setCallback(false)->callExtendedAPI('.handle_quick_operation', [
+            'context' => $data,
+            'operation' => $operation,
+        ]);
     }
 
     /**
      * @param $msg
-     * @param false $yield
-     * @return void
+     * @param  bool               $yield
      * @throws InterruptException
      */
-    public function finalReply($msg, $yield = false) {
-        self::$context[$this->cid]["cache"]["block_continue"] = true;
-        if ($msg != "") $this->reply($msg, $yield);
+    public function finalReply($msg, $yield = false)
+    {
+        self::$context[$this->cid]['cache']['block_continue'] = true;
+        if ($msg != '') {
+            $this->reply($msg, $yield);
+        }
         EventDispatcher::interrupt();
     }
 
     /**
-     * @param string $prompt
-     * @param int $timeout
-     * @param string $timeout_prompt
-     * @return string
+     * @param  string                   $prompt
+     * @param  int                      $timeout
+     * @param  string                   $timeout_prompt
      * @throws InvalidArgumentException
      * @throws WaitTimeoutException
+     * @return string
      * @noinspection PhpMissingReturnTypeInspection
      */
-    public function waitMessage($prompt = "", $timeout = 600, $timeout_prompt = "") {
-        if (!isset($this->getData()["user_id"], $this->getData()["message"], $this->getData()["self_id"]))
-            throw new InvalidArgumentException("协程等待参数缺失");
+    public function waitMessage($prompt = '', $timeout = 600, $timeout_prompt = '')
+    {
+        if (!isset($this->getData()['user_id'], $this->getData()['message'], $this->getData()['self_id'])) {
+            throw new InvalidArgumentException('协程等待参数缺失');
+        }
 
-        Console::debug("==== 开始等待输入 ====");
-        if ($prompt != "") $this->reply($prompt);
+        Console::debug('==== 开始等待输入 ====');
+        if ($prompt != '') {
+            $this->reply($prompt);
+        }
 
         try {
-            $r = CoMessage::yieldByWS($this->getData(), ["user_id", "self_id", "message_type", onebot_target_id_name($this->getMessageType())], $timeout);
+            $r = CoMessage::yieldByWS($this->getData(), ['user_id', 'self_id', 'message_type', onebot_target_id_name($this->getMessageType())], $timeout);
         } catch (Exception $e) {
             $r = false;
         }
         if ($r === false) {
             throw new WaitTimeoutException($this, $timeout_prompt);
         }
-        if (is_array($r["message"]) && (ZMConfig::get("global", "onebot")["message_convert_string"] ?? true) === true) {
-            return MessageUtil::arrayToStr($r["message"]);
-        } else {
-            return $r["message"];
+        if (is_array($r['message']) && (ZMConfig::get('global', 'onebot')['message_convert_string'] ?? true) === true) {
+            return MessageUtil::arrayToStr($r['message']);
         }
+        return $r['message'];
     }
 
     /**
      * @param $mode
      * @param $prompt_msg
-     * @return mixed|string
      * @throws InvalidArgumentException
      * @throws WaitTimeoutException
+     * @return mixed|string
      */
-    public function getArgs($mode, $prompt_msg) {
-        $arg = ctx()->getCache("match") ?? [];
+    public function getArgs($mode, $prompt_msg)
+    {
+        $arg = ctx()->getCache('match') ?? [];
         switch ($mode) {
             case ZM_MATCH_ALL:
                 $p = $arg;
-                return trim(implode(" ", $p)) == "" ? $this->waitMessage($prompt_msg) : trim(implode(" ", $p));
+                return trim(implode(' ', $p)) == '' ? $this->waitMessage($prompt_msg) : trim(implode(' ', $p));
             case ZM_MATCH_NUMBER:
                 foreach ($arg as $k => $v) {
                     if (is_numeric($v)) {
                         array_splice($arg, $k, 1);
-                        ctx()->setCache("match", $arg);
+                        ctx()->setCache('match', $arg);
                         return $v;
                     }
                 }
@@ -214,60 +273,84 @@ class Context implements ContextInterface
                 if (isset($arg[0])) {
                     $a = $arg[0];
                     array_splice($arg, 0, 1);
-                    ctx()->setCache("match", $arg);
+                    ctx()->setCache('match', $arg);
                     return $a;
-                } else {
-                    return $this->waitMessage($prompt_msg);
                 }
+                    return $this->waitMessage($prompt_msg);
         }
         throw new InvalidArgumentException();
     }
 
     /**
-     * @param string $prompt_msg
-     * @return int|mixed|string
+     * @param  string                   $prompt_msg
      * @throws InvalidArgumentException
      * @throws WaitTimeoutException
+     * @return int|mixed|string
      */
-    public function getNextArg($prompt_msg = "") { return $this->getArgs(ZM_MATCH_FIRST, $prompt_msg); }
+    public function getNextArg($prompt_msg = '')
+    {
+        return $this->getArgs(ZM_MATCH_FIRST, $prompt_msg);
+    }
 
     /**
-     * @param string $prompt_msg
-     * @return int|mixed|string
+     * @param  string                   $prompt_msg
      * @throws InvalidArgumentException
      * @throws WaitTimeoutException
+     * @return int|mixed|string
      */
-    public function getFullArg($prompt_msg = "") { return $this->getArgs(ZM_MATCH_ALL, $prompt_msg); }
+    public function getFullArg($prompt_msg = '')
+    {
+        return $this->getArgs(ZM_MATCH_ALL, $prompt_msg);
+    }
 
     /**
-     * @param string $prompt_msg
-     * @return int|mixed|string
+     * @param  string                   $prompt_msg
      * @throws InvalidArgumentException
      * @throws WaitTimeoutException
+     * @return int|mixed|string
      */
-    public function getNumArg($prompt_msg = "") { return $this->getArgs(ZM_MATCH_NUMBER, $prompt_msg); }
+    public function getNumArg($prompt_msg = '')
+    {
+        return $this->getArgs(ZM_MATCH_NUMBER, $prompt_msg);
+    }
 
     /** @noinspection PhpMissingReturnTypeInspection */
-    public function cloneFromParent() {
+    public function cloneFromParent()
+    {
         set_coroutine_params(self::$context[Coroutine::getPcid()] ?? self::$context[$this->cid]);
         return context();
     }
 
-    public function copy() { return self::$context[$this->cid]; }
-
-    public function getOption() { return self::getCache("match"); }
-
-    public function getOriginMessage() { return self::$context[$this->cid]["data"]["message"] ?? null; }
-
-    public function getArrayMessage(): array {
-        $msg = $this->getOriginMessage();
-        if (is_array($msg)) return $msg;
-        else return MessageUtil::strToArray($msg);
+    public function copy()
+    {
+        return self::$context[$this->cid];
     }
 
-    public function getStringMessage(): string {
+    public function getOption()
+    {
+        return self::getCache('match');
+    }
+
+    public function getOriginMessage()
+    {
+        return self::$context[$this->cid]['data']['message'] ?? null;
+    }
+
+    public function getArrayMessage(): array
+    {
         $msg = $this->getOriginMessage();
-        if (is_string($msg)) return $msg;
-        else return MessageUtil::arrayToStr($msg);
+        if (is_array($msg)) {
+            return $msg;
+        }
+        return MessageUtil::strToArray($msg);
+    }
+
+    public function getStringMessage(): string
+    {
+        $msg = $this->getOriginMessage();
+        if (is_string($msg)) {
+            return $msg;
+        }
+        return MessageUtil::arrayToStr($msg);
     }
 }

src/ZM/Context/ContextInterface.php

@@ -1,15 +1,15 @@
-<?php /** @noinspection PhpMissingReturnTypeInspection */
+<?php
 
+declare(strict_types=1);
 
 namespace ZM\Context;
 
-
 use Swoole\Http\Request;
 use Swoole\WebSocket\Frame;
 use Swoole\WebSocket\Server;
+use ZM\API\ZMRobot;
 use ZM\ConnectionManager\ConnectionObject;
 use ZM\Http\Response;
-use ZM\API\ZMRobot;
 
 interface ContextInterface
 {
@@ -29,7 +29,7 @@ interface ContextInterface
     /** @return ConnectionObject */
     public function getConnection();
 
-    /** @return int|null */
+    /** @return null|int */
     public function getFd();
 
     /** @return int */
@@ -74,50 +74,25 @@ interface ContextInterface
 
     public function getCQResponse();
 
-    /**
-     * @param $msg
-     * @param bool $yield
-     * @return mixed
-     */
     public function reply($msg, $yield = false);
 
-    /**
-     * @param $msg
-     * @param bool $yield
-     * @return mixed
-     */
     public function finalReply($msg, $yield = false);
 
-    /**
-     * @param string $prompt
-     * @param int $timeout
-     * @param string $timeout_prompt
-     * @return mixed
-     */
-    public function waitMessage($prompt = "", $timeout = 600, $timeout_prompt = "");
+    public function waitMessage($prompt = '', $timeout = 600, $timeout_prompt = '');
 
-    /**
-     * @param $mode
-     * @param $prompt_msg
-     * @return mixed
-     */
     public function getArgs($mode, $prompt_msg);
 
-    public function getNextArg($prompt_msg = "");
+    public function getNextArg($prompt_msg = '');
 
-    public function getFullArg($prompt_msg = "");
+    public function getFullArg($prompt_msg = '');
 
     public function setCache($key, $value);
 
-    /**
-     * @param $key
-     * @return mixed
-     */
     public function getCache($key);
 
     public function cloneFromParent();
 
-    public function getNumArg($prompt_msg = "");
+    public function getNumArg($prompt_msg = '');
 
     public function copy();
 

src/ZM/DB/DB.php

@@ -1,22 +1,23 @@
-<?php /** @noinspection PhpUnused */
+<?php
 
 /** @noinspection PhpComposerExtensionStubsInspection */
 
+declare(strict_types=1);
+
+/** @noinspection PhpUnused */
 
 namespace ZM\DB;
 
-
-use ZM\Console\Console;
-use ZM\MySQL\MySQLManager;
-use ZM\Store\MySQL\SqlPoolStorage;
 use PDOException;
 use PDOStatement;
 use Swoole\Database\PDOStatementProxy;
+use ZM\Console\Console;
 use ZM\Exception\DbException;
+use ZM\MySQL\MySQLManager;
+use ZM\Store\MySQL\SqlPoolStorage;
 
 /**
  * Class DB
- * @package ZM\DB
  * @deprecated This will delete in 2.6 or future version, use \ZM\MySQL\MySQLManager::getConnection() instead
  */
 class DB
@@ -27,9 +28,12 @@ class DB
      * @param $db_name
      * @throws DbException
      */
-    public static function initTableList($db_name) {
-        if (!extension_loaded("mysqlnd")) throw new DbException("Can not find mysqlnd PHP extension.");
-        $result = MySQLManager::getWrapper()->fetchAllAssociative("select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_SCHEMA=?;", [$db_name]);
+    public static function initTableList($db_name)
+    {
+        if (!extension_loaded('mysqlnd')) {
+            throw new DbException('Can not find mysqlnd PHP extension.');
+        }
+        $result = MySQLManager::getWrapper()->fetchAllAssociative('select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_SCHEMA=?;', [$db_name]);
         foreach ($result as $v) {
             self::$table_list[] = $v['TABLE_NAME'];
         }
@@ -37,18 +41,18 @@ class DB
 
     /**
      * @param $table_name
-     * @return Table
      * @throws DbException
      */
-    public static function table($table_name): Table {
+    public static function table($table_name): Table
+    {
         if (Table::getTableInstance($table_name) === null) {
-            if (in_array($table_name, self::$table_list))
+            if (in_array($table_name, self::$table_list)) {
                 return new Table($table_name);
-            elseif (SqlPoolStorage::$sql_pool !== null) {
-                throw new DbException("Table " . $table_name . " not exist in database.");
-            } else {
-                throw new DbException("Database connection not exist or connect failed. Please check sql configuration");
             }
+            if (SqlPoolStorage::$sql_pool !== null) {
+                throw new DbException('Table ' . $table_name . ' not exist in database.');
+            }
+            throw new DbException('Database connection not exist or connect failed. Please check sql configuration');
         }
         return Table::getTableInstance($table_name);
     }
@@ -57,23 +61,24 @@ class DB
      * @param $line
      * @throws DbException
      */
-    public static function statement($line) {
+    public static function statement($line)
+    {
         self::rawQuery($line, []);
     }
 
     /**
      * @param $line
-     * @return bool
      * @throws DbException
      */
-    public static function unprepared($line): bool {
+    public static function unprepared($line): bool
+    {
         try {
             $conn = SqlPoolStorage::$sql_pool->getConnection();
             if ($conn === false) {
                 SqlPoolStorage::$sql_pool->putConnection(null);
-                throw new DbException("无法连接SQL！" . $line);
+                throw new DbException('无法连接SQL！' . $line);
             }
-            $result = $conn->query($line) === false ? false : true;
+            $result = !($conn->query($line) === false);
             SqlPoolStorage::$sql_pool->putConnection($conn);
             return $result;
         } catch (DBException $e) {
@@ -82,58 +87,58 @@ class DB
         }
     }
 
-    /**
-     * @param string $line
-     * @param array $params
-     * @param int $fetch_mode
-     * @return mixed
-     * @throws DbException
-     */
-    public static function rawQuery(string $line, $params = [], $fetch_mode = ZM_DEFAULT_FETCH_MODE) {
-        if (!is_array($params)) $params = [$params];
-        Console::debug("MySQL: " . $line . " | " . implode(", ", $params));
+    public static function rawQuery(string $line, $params = [], $fetch_mode = ZM_DEFAULT_FETCH_MODE)
+    {
+        if (!is_array($params)) {
+            $params = [$params];
+        }
+        Console::debug('MySQL: ' . $line . ' | ' . implode(', ', $params));
         try {
-            if (SqlPoolStorage::$sql_pool === null) throw new DbException("未连接到任何数据库！");
+            if (SqlPoolStorage::$sql_pool === null) {
+                throw new DbException('未连接到任何数据库！');
+            }
             $conn = SqlPoolStorage::$sql_pool->getConnection();
             if ($conn === false) {
                 SqlPoolStorage::$sql_pool->putConnection(null);
-                throw new DbException("无法连接SQL！" . $line);
+                throw new DbException('无法连接SQL！' . $line);
             }
             $ps = $conn->prepare($line);
             if ($ps === false) {
                 SqlPoolStorage::$sql_pool->putConnection(null);
-                /** @noinspection PhpUndefinedFieldInspection */
-                throw new DbException("SQL语句查询错误，" . $line . "，错误信息：" . $conn->error);
-            } else {
-                if (!($ps instanceof PDOStatement) && !($ps instanceof PDOStatementProxy)) {
-                    var_dump($ps);
-                    SqlPoolStorage::$sql_pool->putConnection(null);
-                    throw new DbException("语句查询错误！返回的不是 PDOStatement" . $line);
-                }
-                if ($params == []) $result = $ps->execute();
-                elseif (!is_array($params)) {
-                    $result = $ps->execute([$params]);
-                } else $result = $ps->execute($params);
-                if ($result !== true) {
-                    SqlPoolStorage::$sql_pool->putConnection(null);
-                    throw new DBException("语句[$line]错误！" . $ps->errorInfo()[2]);
-                    //echo json_encode(debug_backtrace(), 128 | 256);
-                }
-                SqlPoolStorage::$sql_pool->putConnection($conn);
-                return $ps->fetchAll($fetch_mode);
+                /* @noinspection PhpUndefinedFieldInspection */
+                throw new DbException('SQL语句查询错误，' . $line . '，错误信息：' . $conn->error);
             }
+            if (!($ps instanceof PDOStatement) && !($ps instanceof PDOStatementProxy)) {
+                var_dump($ps);
+                SqlPoolStorage::$sql_pool->putConnection(null);
+                throw new DbException('语句查询错误！返回的不是 PDOStatement' . $line);
+            }
+            if ($params == []) {
+                $result = $ps->execute();
+            } elseif (!is_array($params)) {
+                $result = $ps->execute([$params]);
+            } else {
+                $result = $ps->execute($params);
+            }
+            if ($result !== true) {
+                SqlPoolStorage::$sql_pool->putConnection(null);
+                throw new DBException("语句[{$line}]错误！" . $ps->errorInfo()[2]);
+                //echo json_encode(debug_backtrace(), 128 | 256);
+            }
+            SqlPoolStorage::$sql_pool->putConnection($conn);
+            return $ps->fetchAll($fetch_mode);
         } catch (DbException $e) {
-            if (mb_strpos($e->getMessage(), "has gone away") !== false) {
+            if (mb_strpos($e->getMessage(), 'has gone away') !== false) {
                 zm_sleep(0.2);
-                Console::warning("Gone away of MySQL! retrying!");
+                Console::warning('Gone away of MySQL! retrying!');
                 return self::rawQuery($line, $params);
             }
             Console::warning($e->getMessage());
             throw $e;
         } catch (PDOException $e) {
-            if (mb_strpos($e->getMessage(), "has gone away") !== false) {
+            if (mb_strpos($e->getMessage(), 'has gone away') !== false) {
                 zm_sleep(0.2);
-                Console::warning("Gone away of MySQL! retrying!");
+                Console::warning('Gone away of MySQL! retrying!');
                 return self::rawQuery($line, $params);
             }
             Console::warning($e->getMessage());
@@ -141,7 +146,8 @@ class DB
         }
     }
 
-    public static function isTableExists($table): bool {
+    public static function isTableExists($table): bool
+    {
         return in_array($table, self::$table_list);
     }
 }

src/ZM/DB/DeleteBody.php

@@ -1,14 +1,13 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\DB;
 
-
 use ZM\Exception\DbException;
 
 /**
  * Class DeleteBody
- * @package ZM\DB
  * @deprecated This will delete in 2.6 or future version, use \ZM\MySQL\MySQLManager::getConnection() instead
  */
 class DeleteBody
@@ -22,18 +21,19 @@ class DeleteBody
 
     /**
      * DeleteBody constructor.
-     * @param Table $table
      */
-    public function __construct(Table $table) {
+    public function __construct(Table $table)
+    {
         $this->table = $table;
     }
 
     /**
-     * @return mixed
      * @throws DbException
+     * @return mixed
      */
-    public function save() {
-        list($sql, $param) = $this->getWhereSQL();
-        return DB::rawQuery("DELETE FROM " . $this->table->getTableName() . " WHERE " . $sql, $param);
+    public function save()
+    {
+        [$sql, $param] = $this->getWhereSQL();
+        return DB::rawQuery('DELETE FROM ' . $this->table->getTableName() . ' WHERE ' . $sql, $param);
     }
 }

src/ZM/DB/InsertBody.php

@@ -1,14 +1,13 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\DB;
 
-
 use ZM\Exception\DbException;
 
 /**
  * Class InsertBody
- * @package ZM\DB
  * @deprecated This will delete in 2.6 or future version, use \ZM\MySQL\MySQLManager::getConnection() instead
  */
 class InsertBody
@@ -17,14 +16,15 @@ class InsertBody
      * @var Table
      */
     private $table;
+
     private $row;
 
     /**
      * InsertBody constructor.
-     * @param Table $table
      * @param $row
      */
-    public function __construct(Table $table, $row) {
+    public function __construct(Table $table, $row)
+    {
         $this->table = $table;
         $this->row = $row;
     }
@@ -32,7 +32,8 @@ class InsertBody
     /**
      * @throws DbException
      */
-    public function save() {
+    public function save()
+    {
         DB::rawQuery('INSERT INTO ' . $this->table->getTableName() . ' VALUES (' . implode(',', array_fill(0, count($this->row), '?')) . ')', $this->row);
     }
 }

src/ZM/DB/SelectBody.php

@@ -1,14 +1,13 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\DB;
 
-
 use ZM\Exception\DbException;
 
 /**
  * Class SelectBody
- * @package ZM\DB
  * @deprecated This will delete in 2.6 or future version, use \ZM\MySQL\MySQLManager::getConnection() instead
  */
 class SelectBody
@@ -20,96 +19,119 @@ class SelectBody
 
     private $select_thing;
 
+    private $result;
 
-    private $result = null;
-
-    public function __construct($table, $select_thing) {
+    public function __construct($table, $select_thing)
+    {
         $this->table = $table;
         $this->select_thing = $select_thing;
     }
 
     /**
-     * @return null
      * @throws DbException
      */
-    public function get() { return $this->fetchAll(); }
-
-    /**
-     * @throws DbException
-     */
-    public function count(): int {
-        $this->select_thing = ["count(*)"];
-        $str = $this->queryPrepare();
-        $this->result = DB::rawQuery($str[0], $str[1]);
-        return intval($this->result[0]["count(*)"]);
+    public function get()
+    {
+        return $this->fetchAll();
     }
 
     /**
-     * @param int $fetch_mode
-     * @return null
      * @throws DbException
      */
-    public function fetchAll($fetch_mode = ZM_DEFAULT_FETCH_MODE) {
+    public function count(): int
+    {
+        $this->select_thing = ['count(*)'];
+        $str = $this->queryPrepare();
+        $this->result = DB::rawQuery($str[0], $str[1]);
+        return intval($this->result[0]['count(*)']);
+    }
+
+    /**
+     * @param  int         $fetch_mode
+     * @throws DbException
+     */
+    public function fetchAll($fetch_mode = ZM_DEFAULT_FETCH_MODE)
+    {
         $this->execute($fetch_mode);
         return $this->getResult();
     }
 
     /**
-     * @return mixed|null
      * @throws DbException
+     * @return null|mixed
      */
-    public function fetchFirst() {
+    public function fetchFirst()
+    {
         return $this->fetchAll()[0] ?? null;
     }
 
     /**
-     * @param null $key
-     * @return mixed|null
+     * @param  null        $key
      * @throws DbException
+     * @return null|mixed
      */
-    public function value($key = null) {
+    public function value($key = null)
+    {
         $r = $this->fetchFirst();
-        if ($r === null) return null;
-        if ($key === null)
+        if ($r === null) {
+            return null;
+        }
+        if ($key === null) {
             return current($r);
-        else return $r[$key] ?? null;
+        }
+        return $r[$key] ?? null;
     }
 
     /**
-     * @param int $fetch_mode
+     * @param  int         $fetch_mode
      * @throws DbException
      */
-    public function execute($fetch_mode = ZM_DEFAULT_FETCH_MODE) {
+    public function execute($fetch_mode = ZM_DEFAULT_FETCH_MODE)
+    {
         $str = $this->queryPrepare();
         $this->result = DB::rawQuery($str[0], $str[1], $fetch_mode);
     }
 
-    public function getResult() { return $this->result; }
+    public function getResult()
+    {
+        return $this->result;
+    }
 
-    public function equals(SelectBody $body): bool {
-        if ($this->select_thing != $body->getSelectThing()) return false;
-        elseif ($this->where_thing == $body->getWhereThing()) return false;
-        else return true;
+    public function equals(SelectBody $body): bool
+    {
+        if ($this->select_thing != $body->getSelectThing()) {
+            return false;
+        }
+        if ($this->where_thing == $body->getWhereThing()) {
+            return false;
+        }
+        return true;
     }
 
     /**
      * @return mixed
      */
-    public function getSelectThing() { return $this->select_thing; }
+    public function getSelectThing()
+    {
+        return $this->select_thing;
+    }
 
-    /**
-     * @return array
-     */
-    public function getWhereThing(): array { return $this->where_thing; }
+    public function getWhereThing(): array
+    {
+        return $this->where_thing;
+    }
 
-    private function queryPrepare(): array {
-        $msg = "SELECT " . implode(", ", $this->select_thing) . " FROM " . $this->table->getTableName();
+    private function queryPrepare(): array
+    {
+        $msg = 'SELECT ' . implode(', ', $this->select_thing) . ' FROM ' . $this->table->getTableName();
         $sql = $this->table->paintWhereSQL($this->where_thing['='] ?? [], '=');
         if ($sql[0] != '') {
-            $msg .= " WHERE " . $sql[0];
+            $msg .= ' WHERE ' . $sql[0];
             $array = $sql[1];
             $sql = $this->table->paintWhereSQL($this->where_thing['!='] ?? [], '!=');
-            if ($sql[0] != '') $msg .= " AND " . $sql[0];
+            if ($sql[0] != '') {
+                $msg .= ' AND ' . $sql[0];
+            }
             $array = array_merge($array, $sql[1]);
         }
         return [$msg, $array ?? []];

src/ZM/DB/Table.php

@@ -1,71 +1,87 @@
-<?php /** @noinspection PhpUnused */
+<?php
 
-/** @noinspection PhpMissingReturnTypeInspection */
+/**
+ * @noinspection PhpMissingReturnTypeInspection
+ * @noinspection PhpUnused
+ */
 
+declare(strict_types=1);
 
 namespace ZM\DB;
 
 /**
  * Class Table
- * @package ZM\DB
  * @deprecated This will delete in 2.6 or future version, use \ZM\MySQL\MySQLManager::getConnection() instead
  */
 class Table
 {
-    private $table_name;
-
     /** @var SelectBody[] */
     public $cache = [];
 
+    private $table_name;
+
     private static $table_instance = [];
 
-    public function __construct($table_name) {
+    public function __construct($table_name)
+    {
         $this->table_name = $table_name;
         self::$table_instance[$table_name] = $this;
     }
 
-    public static function getTableInstance($table_name) {
-        if (isset(self::$table_instance[$table_name])) return self::$table_instance[$table_name];
-        else return null;
+    public static function getTableInstance($table_name)
+    {
+        if (isset(self::$table_instance[$table_name])) {
+            return self::$table_instance[$table_name];
+        }
+        return null;
     }
 
-    public function select($what = []) {
-        return new SelectBody($this, $what == [] ? ["*"] : $what);
+    public function select($what = [])
+    {
+        return new SelectBody($this, $what == [] ? ['*'] : $what);
     }
 
-    public function where($column, $operation_or_value, $value = null) {
-        return (new SelectBody($this, ["*"]))->where($column, $operation_or_value, $value);
+    public function where($column, $operation_or_value, $value = null)
+    {
+        return (new SelectBody($this, ['*']))->where($column, $operation_or_value, $value);
     }
 
-    public function insert($row) {
+    public function insert($row)
+    {
         $this->cache = [];
         return new InsertBody($this, $row);
     }
 
-    public function update(array $set_value) {
+    public function update(array $set_value)
+    {
         $this->cache = [];
         return new UpdateBody($this, $set_value);
     }
 
-    public function delete() {
+    public function delete()
+    {
         $this->cache = [];
         return new DeleteBody($this);
     }
 
-    public function statement() {
+    public function statement()
+    {
         $this->cache = [];
         //TODO: 无返回的statement语句
     }
 
-    public function paintWhereSQL($rule, $operator) {
-        if ($rule == []) return ["", []];
-        $msg = "";
+    public function paintWhereSQL($rule, $operator)
+    {
+        if ($rule == []) {
+            return ['', []];
+        }
+        $msg = '';
         $param = [];
         foreach ($rule as $k => $v) {
-            if ($msg == "") {
-                $msg .= $k . " $operator ? ";
+            if ($msg == '') {
+                $msg .= $k . " {$operator} ? ";
             } else {
-                $msg .= " AND " . $k . " $operator ?";
+                $msg .= ' AND ' . $k . " {$operator} ?";
             }
             $param[] = $v;
         }
@@ -75,6 +91,8 @@ class Table
     /**
      * @return mixed
      */
-    public function getTableName() { return $this->table_name; }
-
+    public function getTableName()
+    {
+        return $this->table_name;
+    }
 }

src/ZM/DB/UpdateBody.php

@@ -1,14 +1,13 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\DB;
 
-
 use ZM\Exception\DbException;
 
 /**
  * Class UpdateBody
- * @package ZM\DB
  * @deprecated This will delete in 2.6 or future version, use \ZM\MySQL\MySQLManager::getConnection() instead
  */
 class UpdateBody
@@ -19,6 +18,7 @@ class UpdateBody
      * @var Table
      */
     private $table;
+
     /**
      * @var array
      */
@@ -26,10 +26,9 @@ class UpdateBody
 
     /**
      * UpdateBody constructor.
-     * @param Table $table
-     * @param array $set_value
      */
-    public function __construct(Table $table, array $set_value) {
+    public function __construct(Table $table, array $set_value)
+    {
         $this->table = $table;
         $this->set_value = $set_value;
     }
@@ -37,20 +36,23 @@ class UpdateBody
     /**
      * @throws DbException
      */
-    public function save() {
+    public function save()
+    {
         $arr = [];
         $msg = [];
         foreach ($this->set_value as $k => $v) {
-            $msg [] = $k . ' = ?';
+            $msg[] = $k . ' = ?';
             $arr[] = $v;
         }
-        if (($msg ?? []) == []) throw new DbException('update value sets can not be empty!');
+        if (($msg ?? []) == []) {
+            throw new DbException('update value sets can not be empty!');
+        }
         $line = 'UPDATE ' . $this->table->getTableName() . ' SET ' . implode(', ', $msg);
         if ($this->where_thing != []) {
-            list($sql, $param) = $this->getWhereSQL();
+            [$sql, $param] = $this->getWhereSQL();
             $arr = array_merge($arr, $param);
             $line .= ' WHERE ' . $sql;
         }
         return DB::rawQuery($line, $arr);
     }
-}
+}

src/ZM/DB/WhereBody.php

@@ -1,38 +1,48 @@
-<?php /** @noinspection PhpMissingReturnTypeInspection */
+<?php
 
+/** @noinspection PhpMissingReturnTypeInspection */
+
+declare(strict_types=1);
 
 namespace ZM\DB;
 
 /**
  * Trait WhereBody
- * @package ZM\DB
  * @deprecated This will delete in 2.6 or future version, use \ZM\MySQL\MySQLManager::getConnection() instead
  */
 trait WhereBody
 {
     protected $where_thing = [];
 
-    public function where($column, $operation_or_value, $value = null) {
-        if ($value !== null) $this->where_thing[$operation_or_value][$column] = $value;
-        elseif (!in_array($operation_or_value, ['=', '!=', '>', '<', '>=', '<=', 'IN', 'in'])) $this->where_thing['='][$column] = $operation_or_value;
-        else $this->where_thing['='][$column] = $operation_or_value;
+    public function where($column, $operation_or_value, $value = null)
+    {
+        if ($value !== null) {
+            $this->where_thing[$operation_or_value][$column] = $value;
+        } elseif (!in_array($operation_or_value, ['=', '!=', '>', '<', '>=', '<=', 'IN', 'in'])) {
+            $this->where_thing['='][$column] = $operation_or_value;
+        } else {
+            $this->where_thing['='][$column] = $operation_or_value;
+        }
         return $this;
     }
 
-    protected function getWhereSQL() {
+    protected function getWhereSQL()
+    {
         $param = [];
         $msg = '';
         foreach ($this->where_thing as $k => $v) {
             foreach ($v as $ks => $vs) {
                 if ($param != []) {
-                    $msg .= ' AND ' . $ks . " $k ?";
+                    $msg .= ' AND ' . $ks . " {$k} ?";
                 } else {
-                    $msg .= "$ks $k ?";
+                    $msg .= "{$ks} {$k} ?";
                 }
-                $param [] = $vs;
+                $param[] = $vs;
             }
         }
-        if ($msg == '') $msg = 1;
+        if ($msg == '') {
+            $msg = 1;
+        }
         return [$msg, $param];
     }
 }

src/ZM/Entity/CQObject.php

@@ -1,18 +1,22 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Entity;
 
-
 class CQObject
 {
     public $type;
+
     public $params;
+
     public $start;
+
     public $end;
 
-    public function __construct($type = "", $params = [], $start = 0, $end = 0) {
-        if ($type !== "") {
+    public function __construct($type = '', $params = [], $start = 0, $end = 0)
+    {
+        if ($type !== '') {
             $this->type = $type;
             $this->params = $params;
             $this->start = $start;
@@ -20,7 +24,8 @@ class CQObject
         }
     }
 
-    public static function fromArray($arr): CQObject {
-        return new CQObject($arr["type"], $arr["params"] ?? [], $arr["start"], $arr["end"]);
+    public static function fromArray($arr): CQObject
+    {
+        return new CQObject($arr['type'], $arr['params'] ?? [], $arr['start'], $arr['end']);
     }
-}
+}

src/ZM/Entity/MatchResult.php

@@ -1,17 +1,19 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Entity;
 
-
 use ZM\Annotation\CQ\CQCommand;
 
 class MatchResult
 {
     /** @var bool */
     public $status = false;
-    /** @var CQCommand|null */
-    public $object = null;
+
+    /** @var null|CQCommand */
+    public $object;
+
     /** @var array */
     public $match = [];
-}
+}

src/ZM/Event/EventDispatcher.php

@@ -1,9 +1,10 @@
-<?php /** @noinspection PhpUnused */
+<?php
 
+declare(strict_types=1);
+/** @noinspection PhpUnused */
 
 namespace ZM\Event;
 
-
 use Closure;
 use Doctrine\Common\Annotations\AnnotationException;
 use Error;
@@ -18,113 +19,151 @@ use ZM\Utils\ZMUtil;
 
 class EventDispatcher
 {
-    const STATUS_NORMAL = 0;            //正常结束
-    const STATUS_INTERRUPTED = 1;       //被interrupt了，不管在什么地方
-    const STATUS_EXCEPTION = 2;         //执行过程中抛出了异常
-    const STATUS_BEFORE_FAILED = 3;     //中间件HandleBefore返回了false，所以不执行此方法
-    const STATUS_RULE_FAILED = 4;       //判断事件执行的规则函数判定为false，所以不执行此方法
+    public const STATUS_NORMAL = 0;            //正常结束
+
+    public const STATUS_INTERRUPTED = 1;       //被interrupt了，不管在什么地方
+
+    public const STATUS_EXCEPTION = 2;         //执行过程中抛出了异常
+
+    public const STATUS_BEFORE_FAILED = 3;     //中间件HandleBefore返回了false，所以不执行此方法
+
+    public const STATUS_RULE_FAILED = 4;       //判断事件执行的规则函数判定为false，所以不执行此方法
+
+    /** @var int */
+    public $status = self::STATUS_NORMAL;
+
+    /** @var mixed */
+    public $store;
 
     /** @var string */
     private $class;
+
     /** @var null|callable */
-    private $rule = null;
+    private $rule;
+
     /** @var null|callable */
-    private $return_func = null;
+    private $return_func;
+
     /** @var bool */
     private $log = false;
+
     /** @var int */
     private $eid;
-    /** @var int */
-    public $status = self::STATUS_NORMAL;
-    /** @var mixed */
-    public $store = null;
+
+    public function __construct(string $class = '')
+    {
+        $this->class = $class;
+        $this->eid = ZMAtomic::get('_event_id')->add(1);
+        $list = LightCacheInside::get('wait_api', 'event_trace');
+        if (isset($list[$class])) {
+            $this->log = true;
+        }
+        if ($this->log) {
+            Console::verbose("[事件分发{$this->eid}] 开始分发事件: " . $class);
+        }
+    }
 
     /**
-     * @param null $return_var
+     * @param  mixed              $return_var
      * @throws InterruptException
      */
-    public static function interrupt($return_var = null) {
+    public static function interrupt($return_var = null)
+    {
         throw new InterruptException($return_var);
     }
 
-    public static function enableEventTrace($event_class) {
-        SpinLock::lock("_event_trace");
-        $list = LightCacheInside::get("wait_api", "event_trace");
+    public static function enableEventTrace($event_class)
+    {
+        SpinLock::lock('_event_trace');
+        $list = LightCacheInside::get('wait_api', 'event_trace');
         $list[$event_class] = true;
-        LightCacheInside::set("wait_api", "event_trace", $list);
-        SpinLock::unlock("_event_trace");
+        LightCacheInside::set('wait_api', 'event_trace', $list);
+        SpinLock::unlock('_event_trace');
     }
 
-    public static function disableEventTrace($event_class) {
-        SpinLock::lock("_event_trace");
-        $list = LightCacheInside::get("wait_api", "event_trace");
+    public static function disableEventTrace($event_class)
+    {
+        SpinLock::lock('_event_trace');
+        $list = LightCacheInside::get('wait_api', 'event_trace');
         unset($list[$event_class]);
-        LightCacheInside::set("wait_api", "event_trace", $list);
-        SpinLock::unlock("_event_trace");
+        LightCacheInside::set('wait_api', 'event_trace', $list);
+        SpinLock::unlock('_event_trace');
     }
 
-    public function __construct(string $class = '') {
-        $this->class = $class;
-        $this->eid = ZMAtomic::get("_event_id")->add(1);
-        $list = LightCacheInside::get("wait_api", "event_trace");
-        if (isset($list[$class])) $this->log = true;
-        if ($this->log) Console::verbose("[事件分发{$this->eid}] 开始分发事件: " . $class);
-    }
-
-    public function setRuleFunction(callable $rule = null): EventDispatcher {
-        if ($this->log) Console::verbose("[事件分发{$this->eid}] 设置事件rule: " . $this->class);
+    public function setRuleFunction(callable $rule = null): EventDispatcher
+    {
+        if ($this->log) {
+            Console::verbose("[事件分发{$this->eid}] 设置事件rule: " . $this->class);
+        }
         $this->rule = $rule;
         return $this;
     }
 
-    public function setReturnFunction(callable $return_func): EventDispatcher {
-        if ($this->log) Console::verbose("[事件分发{$this->eid}] 设置事件returnFunc: " . $this->class);
+    public function setReturnFunction(callable $return_func): EventDispatcher
+    {
+        if ($this->log) {
+            Console::verbose("[事件分发{$this->eid}] 设置事件returnFunc: " . $this->class);
+        }
         $this->return_func = $return_func;
         return $this;
     }
 
     /**
-     * @param mixed ...$params
+     * @param  mixed     ...$params
      * @throws Exception
      */
-    public function dispatchEvents(...$params) {
+    public function dispatchEvents(...$params)
+    {
         try {
             foreach ((EventManager::$events[$this->class] ?? []) as $v) {
                 $this->dispatchEvent($v, $this->rule, ...$params);
-                if ($this->log) Console::verbose("[事件分发{$this->eid}] 单一对象 " . $v->class . "::" . (is_string($v->method) ? $v->method : "{closure}") . " 分发结束。");
-                if ($this->status == self::STATUS_BEFORE_FAILED || $this->status == self::STATUS_RULE_FAILED) continue;
+                if ($this->log) {
+                    Console::verbose("[事件分发{$this->eid}] 单一对象 " . $v->class . '::' . (is_string($v->method) ? $v->method : '{closure}') . ' 分发结束。');
+                }
+                if ($this->status == self::STATUS_BEFORE_FAILED || $this->status == self::STATUS_RULE_FAILED) {
+                    continue;
+                }
                 if (is_callable($this->return_func) && $this->status === self::STATUS_NORMAL) {
-                    if ($this->log) Console::verbose("[事件分发{$this->eid}] 单一对象 " . $v->class . "::" . $v->method . " 正在执行返回值处理函数 ...");
+                    if ($this->log) {
+                        Console::verbose("[事件分发{$this->eid}] 单一对象 " . $v->class . '::' . $v->method . ' 正在执行返回值处理函数 ...');
+                    }
                     ($this->return_func)($this->store);
                 }
             }
-            if ($this->status === self::STATUS_RULE_FAILED) $this->status = self::STATUS_NORMAL;
+            if ($this->status === self::STATUS_RULE_FAILED) {
+                $this->status = self::STATUS_NORMAL;
+            }
             //TODO:没有过滤before的false，可能会导致一些问题，先观望一下
         } catch (InterruptException $e) {
             $this->store = $e->return_var;
             $this->status = self::STATUS_INTERRUPTED;
-        } catch (Exception | Error $e) {
+        } catch (Exception|Error $e) {
             $this->status = self::STATUS_EXCEPTION;
             throw $e;
         }
     }
 
     /**
-     * @param mixed $v
-     * @param null $rule_func
-     * @param mixed ...$params
-     * @return bool
+     * @param  mixed               $v
+     * @param  null                $rule_func
+     * @param  mixed               ...$params
      * @throws InterruptException
      * @throws AnnotationException
+     * @return bool
      * @noinspection PhpMissingReturnTypeInspection
      */
-    public function dispatchEvent($v, $rule_func = null, ...$params) {
+    public function dispatchEvent($v, $rule_func = null, ...$params)
+    {
         $q_c = $v->class;
         $q_f = $v->method;
-        if (($q_c ?? "") === "" && ($q_f instanceof Closure)) {
-            if ($this->log) Console::verbose("[事件分发{$this->eid}] 闭包函数的事件触发过程！");
+        if (($q_c ?? '') === '' && ($q_f instanceof Closure)) {
+            if ($this->log) {
+                Console::verbose("[事件分发{$this->eid}] 闭包函数的事件触发过程！");
+            }
             if ($rule_func !== null && !$rule_func($v)) {
-                if ($this->log) Console::verbose("[事件分发{$this->eid}] 闭包函数下的 ruleFunc 判断为 false, 拒绝执行此方法。");
+                if ($this->log) {
+                    Console::verbose("[事件分发{$this->eid}] 闭包函数下的 ruleFunc 判断为 false, 拒绝执行此方法。");
+                }
                 $this->status = self::STATUS_RULE_FAILED;
                 return false;
             }
@@ -132,42 +171,55 @@ class EventDispatcher
             $this->status = self::STATUS_NORMAL;
             return true;
         }
-        if ($this->log) Console::verbose("[事件分发{$this->eid}] 正在判断 " . $q_c . "::" . $q_f . " 方法下的 ruleFunc ...");
+        if ($this->log) {
+            Console::verbose("[事件分发{$this->eid}] 正在判断 " . $q_c . '::' . $q_f . ' 方法下的 ruleFunc ...');
+        }
         if ($rule_func !== null && !$rule_func($v)) {
-            if ($this->log) Console::verbose("[事件分发{$this->eid}] " . $q_c . "::" . $q_f . " 方法下的 ruleFunc 判断为 false, 拒绝执行此方法。");
+            if ($this->log) {
+                Console::verbose("[事件分发{$this->eid}] " . $q_c . '::' . $q_f . ' 方法下的 ruleFunc 判断为 false, 拒绝执行此方法。');
+            }
             $this->status = self::STATUS_RULE_FAILED;
             return false;
         }
-        if ($this->log) Console::verbose("[事件分发{$this->eid}] " . $q_c . "::" . $q_f . " 方法下的 ruleFunc 为真，继续执行方法本身 ...");
+        if ($this->log) {
+            Console::verbose("[事件分发{$this->eid}] " . $q_c . '::' . $q_f . ' 方法下的 ruleFunc 为真，继续执行方法本身 ...');
+        }
         if (isset(EventManager::$middleware_map[$q_c][$q_f])) {
             $middlewares = EventManager::$middleware_map[$q_c][$q_f];
-            if ($this->log) Console::verbose("[事件分发{$this->eid}] " . $q_c . "::" . $q_f . " 方法还绑定了 Middleware：" . implode(", ", array_map(function ($x) { return $x->middleware; }, $middlewares)));
+            if ($this->log) {
+                Console::verbose("[事件分发{$this->eid}] " . $q_c . '::' . $q_f . ' 方法还绑定了 Middleware：' . implode(', ', array_map(function ($x) { return $x->middleware; }, $middlewares)));
+            }
             $before_result = true;
             $r = [];
             foreach ($middlewares as $k => $middleware) {
                 if (!isset(EventManager::$middlewares[$middleware->middleware])) {
-                    if ((ZMConfig::get("global", "runtime")["middleware_error_policy"] ?? 1) == 1)
+                    if ((ZMConfig::get('global', 'runtime')['middleware_error_policy'] ?? 1) == 1) {
                         throw new AnnotationException("Annotation parse error: Unknown MiddlewareClass named \"{$middleware->middleware}\"!");
-                    else
-                        continue;
+                    }
+                    continue;
                 }
                 $middleware_obj = EventManager::$middlewares[$middleware->middleware];
-                $before = $middleware_obj["class"];
+                $before = $middleware_obj['class'];
                 //var_dump($middleware_obj);
                 $r[$k] = new $before();
                 $r[$k]->class = $q_c;
                 $r[$k]->method = $q_f;
                 $r[$k]->middleware = $middleware;
                 $r[$k]->current_event = $v;
-                if (isset($middleware_obj["before"])) {
-                    if ($this->log) Console::verbose("[事件分发{$this->eid}] Middleware 存在前置事件，执行中 ...");
-                    $rs = $middleware_obj["before"];
-                    $before_result = $r[$k]->$rs(...$params);
+                if (isset($middleware_obj['before'])) {
+                    if ($this->log) {
+                        Console::verbose("[事件分发{$this->eid}] Middleware 存在前置事件，执行中 ...");
+                    }
+                    $rs = $middleware_obj['before'];
+                    $before_result = $r[$k]->{$rs}(...$params);
                     if ($before_result === false) {
-                        if ($this->log) Console::verbose("[事件分发{$this->eid}] Middleware 前置事件为 false，停止执行原事件，开始执行下一事件。");
+                        if ($this->log) {
+                            Console::verbose("[事件分发{$this->eid}] Middleware 前置事件为 false，停止执行原事件，开始执行下一事件。");
+                        }
                         break;
-                    } else {
-                        if ($this->log) Console::verbose("[事件分发{$this->eid}] Middleware 前置事件为 true，继续执行原事件。");
+                    }
+                    if ($this->log) {
+                        Console::verbose("[事件分发{$this->eid}] Middleware 前置事件为 true，继续执行原事件。");
                     }
                 }
             }
@@ -175,21 +227,31 @@ class EventDispatcher
                 try {
                     $q_o = ZMUtil::getModInstance($q_c);
                     $q_o->_running_annotation = $v;
-                    if ($this->log) Console::verbose("[事件分发{$this->eid}] 正在执行方法 " . $q_c . "::" . $q_f . " ...");
-                    $this->store = $q_o->$q_f(...$params);
+                    if ($this->log) {
+                        Console::verbose("[事件分发{$this->eid}] 正在执行方法 " . $q_c . '::' . $q_f . ' ...');
+                    }
+                    $this->store = $q_o->{$q_f}(...$params);
                 } catch (Exception $e) {
                     if ($e instanceof InterruptException) {
-                        if ($this->log) Console::verbose("[事件分发{$this->eid}] 检测到事件阻断调用，正在跳出事件分发器 ...");
+                        if ($this->log) {
+                            Console::verbose("[事件分发{$this->eid}] 检测到事件阻断调用，正在跳出事件分发器 ...");
+                        }
                         throw $e;
                     }
-                    if ($this->log) Console::verbose("[事件分发{$this->eid}] 方法 " . $q_c . "::" . $q_f . " 执行过程中抛出了异常，正在倒序查找 Middleware 中的捕获方法 ...");
+                    if ($this->log) {
+                        Console::verbose("[事件分发{$this->eid}] 方法 " . $q_c . '::' . $q_f . ' 执行过程中抛出了异常，正在倒序查找 Middleware 中的捕获方法 ...');
+                    }
                     for ($i = count($middlewares) - 1; $i >= 0; --$i) {
                         $middleware_obj = EventManager::$middlewares[$middlewares[$i]->middleware];
-                        if (!isset($middleware_obj["exceptions"])) continue;
-                        foreach ($middleware_obj["exceptions"] as $name => $method) {
+                        if (!isset($middleware_obj['exceptions'])) {
+                            continue;
+                        }
+                        foreach ($middleware_obj['exceptions'] as $name => $method) {
                             if ($e instanceof $name) {
-                                if ($this->log) Console::verbose("[事件分发{$this->eid}] 方法 " . $q_c . "::" . $q_f . " 的异常 " . get_class($e) . " 被 Middleware:" . $middlewares[$i] . " 下的 " . get_class($r[$i]) . "::" . $method . " 捕获。");
-                                $r[$i]->$method($e);
+                                if ($this->log) {
+                                    Console::verbose("[事件分发{$this->eid}] 方法 " . $q_c . '::' . $q_f . ' 的异常 ' . get_class($e) . ' 被 Middleware:' . $middlewares[$i] . ' 下的 ' . get_class($r[$i]) . '::' . $method . ' 捕获。');
+                                }
+                                $r[$i]->{$method}($e);
                                 self::interrupt();
                             }
                         }
@@ -199,10 +261,14 @@ class EventDispatcher
                 $cnts = count($middlewares) - 1;
                 for ($i = $cnts; $i >= 0; --$i) {
                     $middleware_obj = EventManager::$middlewares[$middlewares[$i]->middleware];
-                    if (isset($middleware_obj["after"], $r[$i])) {
-                        if ($this->log) Console::verbose("[事件分发{$this->eid}] Middleware 存在后置事件，执行中 ...");
-                        $r[$i]->{$middleware_obj["after"]}(...$params);
-                        if ($this->log) Console::verbose("[事件分发{$this->eid}] Middleware 后置事件执行完毕！");
+                    if (isset($middleware_obj['after'], $r[$i])) {
+                        if ($this->log) {
+                            Console::verbose("[事件分发{$this->eid}] Middleware 存在后置事件，执行中 ...");
+                        }
+                        $r[$i]->{$middleware_obj['after']}(...$params);
+                        if ($this->log) {
+                            Console::verbose("[事件分发{$this->eid}] Middleware 后置事件执行完毕！");
+                        }
                     }
                 }
                 $this->status = self::STATUS_NORMAL;
@@ -210,27 +276,24 @@ class EventDispatcher
             }
             $this->status = self::STATUS_BEFORE_FAILED;
             return false;
-        } else {
-            $q_o = ZMUtil::getModInstance($q_c);
-            $q_o->_running_annotation = $v;
-            if ($this->log) Console::verbose("[事件分发{$this->eid}] 正在执行方法 " . $q_c . "::" . $q_f . " ...");
-            $this->store = $q_o->$q_f(...$params);
-            $this->status = self::STATUS_NORMAL;
-            return true;
         }
+        $q_o = ZMUtil::getModInstance($q_c);
+        $q_o->_running_annotation = $v;
+        if ($this->log) {
+            Console::verbose("[事件分发{$this->eid}] 正在执行方法 " . $q_c . '::' . $q_f . ' ...');
+        }
+        $this->store = $q_o->{$q_f}(...$params);
+        $this->status = self::STATUS_NORMAL;
+        return true;
     }
 
-    /**
-     * @return int
-     */
-    public function getEid(): int {
+    public function getEid(): int
+    {
         return $this->eid;
     }
 
-    /**
-     * @return string
-     */
-    public function getClass(): string {
+    public function getClass(): string
+    {
         return $this->class;
     }
 }

src/ZM/Event/EventManager.php

@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Event;
 
-
+use Closure;
 use Error;
 use Exception;
 use Swoole\Timer;
@@ -19,15 +20,19 @@ use ZM\Store\ZMAtomic;
 class EventManager
 {
     public static $events = [];
+
     public static $middleware_map = [];
+
     public static $middlewares = [];
+
     public static $req_mapping = [];
 
-    public static function addEvent($event_name, ?AnnotationBase $event_obj) {
-        if ($event_obj->method instanceof \Closure) {
-            Console::debug("Adding event $event_name at @Anonymous");
+    public static function addEvent($event_name, ?AnnotationBase $event_obj)
+    {
+        if ($event_obj->method instanceof Closure) {
+            Console::debug("Adding event {$event_name} at @Anonymous");
         } else {
-            Console::debug("Adding event $event_name at " . ($event_obj->class) . ":" . ($event_obj->method));
+            Console::debug("Adding event {$event_name} at " . ($event_obj->class) . ':' . ($event_obj->method));
         }
         self::$events[$event_name][] = $event_obj;
         (new AnnotationParser())->sortByLevel(self::$events, $event_name);
@@ -36,7 +41,8 @@ class EventManager
     /**
      * @throws AnnotationException
      */
-    public static function loadEventByParser(AnnotationParser $parser) {
+    public static function loadEventByParser(AnnotationParser $parser)
+    {
         self::$events = $parser->generateAnnotationEvents();
         self::$middlewares = $parser->getMiddlewares();
         self::$middleware_map = $parser->getMiddlewareMap();
@@ -48,33 +54,36 @@ class EventManager
      * 注册所有计时器给每个进程
      * @throws Exception
      */
-    public static function registerTimerTick() {
+    public static function registerTimerTick()
+    {
         $dispatcher = new EventDispatcher(OnTick::class);
         foreach (self::$events[OnTick::class] ?? [] as $vss) {
-            if (server()->worker_id !== $vss->worker_id && $vss->worker_id != -1) return;
+            if (server()->worker_id !== $vss->worker_id && $vss->worker_id != -1) {
+                return;
+            }
             //echo server()->worker_id.PHP_EOL;
             $plain_class = $vss->class;
-            Console::debug("Added Middleware-based timer: " . $plain_class . " -> " . $vss->method);
+            Console::debug('Added Middleware-based timer: ' . $plain_class . ' -> ' . $vss->method);
             Timer::tick($vss->tick_ms, function () use ($vss, $dispatcher) {
                 set_coroutine_params([]);
-                if (ZMAtomic::get("stop_signal")->get() != 0) {
+                if (ZMAtomic::get('stop_signal')->get() != 0) {
                     Timer::clearAll();
                     return;
                 }
                 try {
                     $dispatcher->dispatchEvent($vss, null);
                 } catch (Exception $e) {
-                    Console::error(zm_internal_errcode("E00034") . "Uncaught error from TimerTick: " . $e->getMessage() . " at " . $e->getFile() . "({$e->getLine()})");
+                    Console::error(zm_internal_errcode('E00034') . 'Uncaught error from TimerTick: ' . $e->getMessage() . ' at ' . $e->getFile() . "({$e->getLine()})");
                 } catch (Error $e) {
-                    Console::error(zm_internal_errcode("E00034") . "Uncaught fatal error from TimerTick: " . $e->getMessage());
-                    echo Console::setColor($e->getTraceAsString(), "gray");
-                    Console::error("Please check your code!");
+                    Console::error(zm_internal_errcode('E00034') . 'Uncaught fatal error from TimerTick: ' . $e->getMessage());
+                    echo Console::setColor($e->getTraceAsString(), 'gray');
+                    Console::error('Please check your code!');
                 }
             });
         }
-        $conf = ZMConfig::get("global", "worker_cache") ?? ["worker" => 0];
-        if (server()->worker_id == $conf["worker"]) {
-            zm_timer_tick(ZMConfig::get("global", "light_cache")["auto_save_interval"] * 1000, function () {
+        $conf = ZMConfig::get('global', 'worker_cache') ?? ['worker' => 0];
+        if (server()->worker_id == $conf['worker']) {
+            zm_timer_tick(ZMConfig::get('global', 'light_cache')['auto_save_interval'] * 1000, function () {
                 LightCache::savePersistence();
             });
         }

src/ZM/Event/EventTracer.php

@@ -1,22 +1,23 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Event;
 
-
 use ZM\Annotation\AnnotationBase;
 
 class EventTracer
 {
     /**
      * 获取当前注解事件的注解类，如CQCommand对象
-     * @return AnnotationBase|null
+     * @return null|AnnotationBase
      */
-    public static function getCurrentEvent() {
+    public static function getCurrentEvent()
+    {
         $list = debug_backtrace();
         foreach ($list as $v) {
-            if ((($v["object"] ?? null) instanceof EventDispatcher) && $v["function"] == "dispatchEvent") {
-                return $v["args"][0];
+            if ((($v['object'] ?? null) instanceof EventDispatcher) && $v['function'] == 'dispatchEvent') {
+                return $v['args'][0];
             }
         }
         return null;
@@ -24,22 +25,26 @@ class EventTracer
 
     /**
      * 获取当前注解事件的中间件列表
-     * @return array|mixed|null
+     * @return null|array|mixed
      */
-    public static function getCurrentEventMiddlewares() {
+    public static function getCurrentEventMiddlewares()
+    {
         $current_event = self::getCurrentEvent();
-        if (!isset($current_event->class, $current_event->method)) return null;
+        if (!isset($current_event->class, $current_event->method)) {
+            return null;
+        }
         return EventManager::$middleware_map[$current_event->class][$current_event->method] ?? [];
     }
 
-    public static function getEventTraceList() {
+    public static function getEventTraceList()
+    {
         $result = [];
         $list = debug_backtrace();
         foreach ($list as $v) {
-            if ((($v["object"] ?? null) instanceof EventDispatcher) && $v["function"] == "dispatchEvent") {
-                $result[] = $v["args"][0];
+            if ((($v['object'] ?? null) instanceof EventDispatcher) && $v['function'] == 'dispatchEvent') {
+                $result[] = $v['args'][0];
             }
         }
         return $result;
     }
-}
+}

src/ZM/Event/SwooleEvent.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Event;
 
-
 interface SwooleEvent
 {
-}
+}

src/ZM/Event/SwooleEvent/OnBeforeReload.php

@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace ZM\Event\SwooleEvent;
 
-
 use Swoole\Process;
 use Swoole\WebSocket\Server;
 use ZM\Annotation\Swoole\SwooleHandler;
@@ -13,17 +13,19 @@ use ZM\Event\SwooleEvent;
 
 /**
  * Class OnBeforeReload
- * @package ZM\Event\SwooleEvent
  * @SwooleHandler("BeforeReload")
  */
 class OnBeforeReload implements SwooleEvent
 {
-    public function onCall(Server $server) {
-        Console::info(Console::setColor("Reloading server...", "gold"));
+    public function onCall(Server $server)
+    {
+        Console::info(Console::setColor('Reloading server...', 'gold'));
         for ($i = 0; $i < ZM_WORKER_NUM; ++$i) {
-            Process::kill(zm_atomic("_#worker_" . $i)->get(), SIGUSR1);
+            Process::kill(zm_atomic('_#worker_' . $i)->get(), SIGUSR1);
+        }
+        $conf = ZMConfig::get('global', 'runtime')['reload_delay_time'] ?? 800;
+        if ($conf !== 0) {
+            usleep($conf * 1000);
         }
-        $conf = ZMConfig::get("global", "runtime")["reload_delay_time"] ?? 800;
-        if ($conf !== 0) usleep($conf * 1000);
     }
-}
+}