update to 2.3.1 version (build 388)

cleanup code and fix a bug

src/ZM/Utils/CoMessage.php

@@ -5,7 +5,6 @@ namespace ZM\Utils;
 
 
 use Co;
-use Exception;
 use ZM\Store\LightCacheInside;
 use ZM\Store\Lock\SpinLock;
 use ZM\Store\ZMAtomic;
@@ -17,7 +16,7 @@ class CoMessage
      * @param array $compare
      * @param int $timeout
      * @return mixed
-     * @throws Exception
+     * @noinspection PhpMissingReturnTypeInspection
      */
     public static function yieldByWS(array $hang, array $compare, $timeout = 600) {
         $cid = Co::getuid();
@@ -40,7 +39,7 @@ class CoMessage
         Co::suspend();
         SpinLock::lock("wait_api");
         $sess = LightCacheInside::get("wait_api", "wait_api");
-        $result = $sess[$api_id]["result"];
+        $result = $sess[$api_id]["result"] ?? null;
         unset($sess[$api_id]);
         LightCacheInside::set("wait_api", "wait_api", $sess);
         SpinLock::unlock("wait_api");
@@ -49,7 +48,7 @@ class CoMessage
         return $result;
     }
 
-    public static function resumeByWS() {
+    public static function resumeByWS(): bool {
         $dat = ctx()->getData();
         $last = null;
         SpinLock::lock("wait_api");

src/ZM/Utils/DataProvider.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */
 
 
 namespace ZM\Utils;
@@ -11,7 +11,7 @@ class DataProvider
 {
     public static $buffer_list = [];
 
-    public static function getResourceFolder() {
+    public static function getResourceFolder(): string {
         return self::getWorkingDir() . '/resources/';
     }
 

src/ZM/Utils/HttpUtil.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpMissingReturnTypeInspection */
 
 
 namespace ZM\Utils;
@@ -17,6 +17,7 @@ use ZM\Http\RouteManager;
 
 class HttpUtil
 {
+    /** @noinspection PhpMissingReturnTypeInspection */
     public static function parseUri($request, $response, $uri, &$node, &$params) {
         $context = new RequestContext();
         $context->setMethod($request->server['request_method']);

src/ZM/Utils/MessageUtil.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */
 
 
 namespace ZM\Utils;
@@ -7,7 +7,6 @@ namespace ZM\Utils;
 use ZM\API\CQ;
 use ZM\Config\ZMConfig;
 use ZM\Console\Console;
-use ZM\Framework;
 use ZM\Requests\ZMRequest;
 
 class MessageUtil
@@ -46,7 +45,7 @@ class MessageUtil
      * @param $msg
      * @return bool
      */
-    public static function containsImage($msg) {
+    public static function containsImage($msg): bool {
         $cq = CQ::getAllCQ($msg, true);
         foreach ($cq as $v) {
             if ($v->type == "image") {
@@ -65,7 +64,7 @@ class MessageUtil
      * @param int $type
      * @return string
      */
-    public static function getImageCQFromLocal($file, $type = 0) {
+    public static function getImageCQFromLocal($file, $type = 0): string {
         switch ($type) {
             case 0:
                 return CQ::image("base64://" . base64_encode(file_get_contents($file)));

src/ZM/Utils/ProcessManager.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */
 
 
 namespace ZM\Utils;

src/ZM/Utils/SingletonTrait.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */
 
 
 namespace ZM\Utils;
@@ -15,6 +15,7 @@ trait SingletonTrait
 
     /**
      * @return self
+     * @noinspection PhpMissingReturnTypeInspection
      */
     public static function getInstance() {
         if (null === self::$instance) {

src/ZM/Utils/TaskManager.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */
 
 
 namespace ZM\Utils;
@@ -8,6 +8,13 @@ use ZM\Console\Console;
 
 class TaskManager
 {
+    /**
+     * @noinspection PhpMissingReturnTypeInspection
+     * @param $task_name
+     * @param int $timeout
+     * @param mixed ...$params
+     * @return false|mixed
+     */
     public static function runTask($task_name, $timeout = -1, ...$params) {
         if (!isset(server()->setting["task_worker_num"])) {
             Console::warning("未开启 TaskWorker 进程，请先修改 global 配置文件启用！");

src/ZM/Utils/Terminal.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */
 
 
 namespace ZM\Utils;
@@ -16,6 +16,8 @@ class Terminal
      * @param string $cmd
      * @param $resource
      * @return bool
+     * @noinspection PhpMissingReturnTypeInspection
+     * @noinspection PhpUnused
      */
     public static function executeCommand(string $cmd, $resource) {
         $it = explodeMsg($cmd);

src/ZM/Utils/ZMUtil.php

@@ -17,6 +17,9 @@ use ZM\Store\ZMBuf;
 
 class ZMUtil
 {
+    /**
+     * @throws Exception
+     */
     public static function stop() {
         if (SpinLock::tryLock("_stop_signal") === false) return;
         Console::warning(Console::setColor("Stopping server...", "red"));
@@ -33,6 +36,10 @@ class ZMUtil
         server()->stop();
     }
 
+    /**
+     * @param int $delay
+     * @throws Exception
+     */
     public static function reload($delay = 800) {
         if (server()->worker_id !== -1) {
             Console::info(server()->worker_id);