3.4.0适配swoole4.0.3

Author: [email protected]

src/Server/CoreBase/Actor.php

@@ -331,13 +331,11 @@ public function tick($ms, $callback, $user_param = null)
     public function after($ms, $callback, $user_param = null)
     {
         $id = \swoole_timer_after($ms, function ($user_param_one) use ($callback) {
-            go(function () use ($callback, $user_param_one) {
-                try {
-                    $callback($user_param_one);
-                } catch (\Throwable $e) {
-                    displayExceptionHandler($e);
-                }
-            });
+            try {
+                $callback($user_param_one);
+            } catch (\Throwable $e) {
+                displayExceptionHandler($e);
+            }
         }, $user_param);
         $this->timerIdArr[$id] = $id;
         return $id;
@@ -356,6 +354,7 @@ public function clearTimer($id)
     /**
      * @param $actorName
      * @return ActorRpc
+     * @throws SwooleException
      */
     public static function getRpc($actorName)
     {

src/Server/Coroutine/CoroutineBase.php

@@ -126,13 +126,10 @@ public function recv(callable $fuc = null)
         } else {
             $this->chan = new \chan();
         }
-        $readArr = [$this->chan];
-        $writeArr = null;
-        $type = \chan::select($readArr, $writeArr, $this->MAX_TIMERS / 1000);
-        if ($type) {
-            $result = $this->chan->pop();
+        $result = $this->chan->pop($this->MAX_TIMERS);
+        if($result!==false){
             $result = $this->getResult($result);
-        } else {//超时
+        }else{//超时
             //有降级函数则访问降级函数
             if (empty($this->downgrade)) {
                 $result = new SwooleException("[CoroutineTask]: Time Out!, [Request]: $this->request");

src/Server/SwooleServer.php

@@ -38,7 +38,7 @@ abstract class SwooleServer extends ProcessRPC
     /**
      * 版本
      */
-    const version = "3.3.2";
+    const version = "3.4.0";
 
     /**
      * server name

src/Server/helpers/Common.php

@@ -136,8 +136,8 @@ function checkExtension()
         secho("STA", "[版本错误]PHP版本必须大于7.0.0\n");
         $check = false;
     }
-    if (version_compare(SWOOLE_VERSION, '4.0.1', '<')) {
-        secho("STA", "[版本错误]Swoole版本必须大于4.0.1\n");
+    if (version_compare(SWOOLE_VERSION, '4.0.3', '<')) {
+        secho("STA", "[版本错误]Swoole版本必须大于4.0.3\n");
         $check = false;
     }