fix #16

workbunny · Oct 11, 2024 · 414ea3e · 414ea3e
1 parent 8f05ca3
commit 414ea3e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/Utils/Coroutine/Handlers/SwooleCoroutine.php b/src/Utils/Coroutine/Handlers/SwooleCoroutine.php
@@ -22,9 +22,10 @@ class SwooleCoroutine implements CoroutineInterface
     public function __construct(\Closure $func)
     {
         while (1) {
-            if ($id = Coroutine::create(function () use ($func) {
+            if ($id = Coroutine::create(function () use (&$id, $func) {
                 try {
-                    call_user_func($func, $this->_id);
+                    $this->_id = $id;
+                    call_user_func($func, $id);
                 } finally {
                     $this->_id = null;
                 }

diff --git a/src/Utils/Coroutine/Handlers/SwowCoroutine.php b/src/Utils/Coroutine/Handlers/SwowCoroutine.php
@@ -21,7 +21,7 @@ public function __construct(\Closure $func)
     {
         $this->_coroutine = Coroutine::run(function () use ($func) {
             try {
-                call_user_func($func, $this->_coroutine->getId());
+                call_user_func($func, Coroutine::getCurrent()->getId());
             } finally {
                 $this->_coroutine = null;
             }

diff --git a/tests/UtilsCase/Coroutine/SwowCoroutineTest.php b/tests/UtilsCase/Coroutine/SwowCoroutineTest.php
@@ -32,6 +32,7 @@ public function testConstruct()
 
             return $coroutineMock;
         });
+        $coroutineMock->shouldReceive('getCurrent')->andReturnSelf();
         $coroutineMock->shouldReceive('getId')->andReturn(123);
         // 构造
         $coroutine = new SwowCoroutine($func);
@@ -64,6 +65,7 @@ public function testDestruct()
 
             return $coroutineMock;
         });
+        $coroutineMock->shouldReceive('getCurrent')->andReturnSelf();
         $coroutineMock->shouldReceive('getId')->andReturn(123);
         // 构造
         $coroutine = new SwowCoroutine($func);
@@ -90,6 +92,7 @@ public function testOrigin()
 
             return $coroutineMock;
         });
+        $coroutineMock->shouldReceive('getCurrent')->andReturnSelf();
         $coroutineMock->shouldReceive('getId')->andReturn(123);
         // 构造
         $coroutine = new SwowCoroutine($func);
@@ -116,6 +119,7 @@ public function testId()
 
             return $coroutineMock;
         });
+        $coroutineMock->shouldReceive('getCurrent')->andReturnSelf();
         $coroutineMock->shouldReceive('getId')->andReturn(123);
         // 构造
         $coroutine = new SwowCoroutine($func);