feat: Coroutine增加回调函数coroutineId入参，结构优化及测试完善

workbunny · Oct 9, 2024 · 08048fb · 08048fb
1 parent bb659fd
commit 08048fb
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 59 deletions.
diff --git a/src/Utils/Coroutine/Coroutine.php b/src/Utils/Coroutine/Coroutine.php
@@ -84,6 +84,7 @@ public function __call(string $name, array $arguments): mixed
         if (!method_exists($this->_interface, $name)) {
             throw new \BadMethodCallException("Method $name not exists. ");
         }
+
         return $this->_interface->$name(...$arguments);
     }
-}
+}
diff --git a/src/Utils/Coroutine/Handlers/CoroutineInterface.php b/src/Utils/Coroutine/Handlers/CoroutineInterface.php
@@ -34,4 +34,4 @@ public function origin(): mixed;
      * @return string|int|null
      */
     public function id(): string|int|null;
-}
+}
diff --git a/src/Utils/Coroutine/Handlers/DefaultCoroutine.php b/src/Utils/Coroutine/Handlers/DefaultCoroutine.php
@@ -9,7 +9,6 @@
 
 class DefaultCoroutine implements CoroutineInterface
 {
-
     /**
      * @var string|null
      */

diff --git a/src/Utils/Coroutine/Handlers/RippleCoroutine.php b/src/Utils/Coroutine/Handlers/RippleCoroutine.php
@@ -7,21 +7,17 @@
 
 namespace Workbunny\WebmanCoroutine\Utils\Coroutine\Handlers;
 
-use Psc\Core\Coroutine\Promise;
 use function Co\async;
 
+use Psc\Core\Coroutine\Promise;
+
 class RippleCoroutine implements CoroutineInterface
 {
     /**
      * @var null|Promise
      */
     protected ?Promise $_promise = null;
 
-    /**
-     * @var null|string
-     */
-    protected ?string $_id = null;
-
     /** @inheritdoc
      * @param \Closure $func
      */
@@ -31,12 +27,10 @@ public function __construct(\Closure $func)
             try {
                 call_user_func($func, spl_object_hash($this->_promise));
             } finally {
-                // 移除协程id及promise
+                // 移除协程promise
                 $this->_promise = null;
-                $this->_id = null;
             }
         });
-        $this->_id = spl_object_hash($this->_promise);
     }
 
     /** @inheritdoc  */
@@ -48,14 +42,13 @@ public function __destruct()
     /** @inheritdoc  */
     public function origin(): ?Promise
     {
-
         return $this->_promise;
     }
 
     /** @inheritdoc  */
     public function id(): ?string
     {
-        return $this->_id;
+        return $this->_promise ? spl_object_hash($this->_promise) : null;
     }
 
     /**

diff --git a/src/Utils/Coroutine/Handlers/SwooleCoroutine.php b/src/Utils/Coroutine/Handlers/SwooleCoroutine.php
@@ -48,7 +48,7 @@ public function origin(): ?int
     }
 
     /** @inheritdoc  */
-    public function id(): int
+    public function id(): ?int
     {
         return $this->_id;
     }

diff --git a/src/Utils/Coroutine/Handlers/SwowCoroutine.php b/src/Utils/Coroutine/Handlers/SwowCoroutine.php
@@ -16,11 +16,6 @@ class SwowCoroutine implements CoroutineInterface
      */
     protected ?Coroutine $_coroutine = null;
 
-    /**
-     * @var int|null
-     */
-    protected ?int $_id = null;
-
     /** @inheritDoc */
     public function __construct(\Closure $func)
     {
@@ -29,10 +24,8 @@ public function __construct(\Closure $func)
                 call_user_func($func, $this->_coroutine->getId());
             } finally {
                 $this->_coroutine = null;
-                $this->_id = null;
             }
         });
-        $this->_id = $this->_coroutine->getId();
     }
 
     /** @inheritdoc  */
@@ -50,6 +43,6 @@ public function origin(): ?Coroutine
     /** @inheritdoc  */
     public function id(): ?int
     {
-        return $this->_id;
+        return $this->_coroutine?->getId();
     }
 }
diff --git a/tests/UtilsCase/Coroutine/CoroutineTest.php b/tests/UtilsCase/Coroutine/CoroutineTest.php
@@ -4,8 +4,8 @@
 
 namespace Workbunny\Tests\UtilsCase\Coroutine;
 
-use PHPUnit\Framework\TestCase;
 use Mockery;
+use PHPUnit\Framework\TestCase;
 use Workbunny\WebmanCoroutine\Utils\Coroutine\Coroutine;
 use Workbunny\WebmanCoroutine\Utils\Coroutine\Handlers\CoroutineInterface;
 
@@ -19,15 +19,15 @@ protected function tearDown(): void
     public function testConstruct()
     {
         $executed = false;
-        $func = function() use (&$executed) {
+        $func = function () use (&$executed) {
             $executed = true;
         };
 
         $mockInterface = Mockery::mock(CoroutineInterface::class);
         $mockInterface->shouldReceive('__construct')
             ->with($func);
 
-        $channel = Mockery::mock( Coroutine::class)
+        $channel = Mockery::mock(Coroutine::class)
             ->makePartial()
             ->shouldAllowMockingProtectedMethods();
         $channel->shouldReceive('__destruct')
@@ -46,15 +46,15 @@ public function testConstruct()
 
     public function testDestruct()
     {
-        $func = function() {
+        $func = function () {
             // 模拟闭包函数的执行
         };
 
         $mockInterface = Mockery::mock(CoroutineInterface::class);
         $mockInterface->shouldReceive('__construct')
             ->with($func);
 
-        $channel = Mockery::mock( Coroutine::class)
+        $channel = Mockery::mock(Coroutine::class)
             ->makePartial()
             ->shouldAllowMockingProtectedMethods();
         $channel->shouldReceive('__destruct')

diff --git a/tests/UtilsCase/Coroutine/DefaultCoroutineTest.php b/tests/UtilsCase/Coroutine/DefaultCoroutineTest.php
@@ -25,7 +25,7 @@ public function testConstruct()
 
     public function testOrigin()
     {
-        $func = function() {
+        $func = function () {
             // 模拟闭包函数的执行
         };
         $coroutine = new DefaultCoroutine($func);
@@ -34,7 +34,7 @@ public function testOrigin()
 
     public function testId()
     {
-        $func = function() {
+        $func = function () {
             // 模拟闭包函数的执行
         };
         $coroutine = new DefaultCoroutine($func);

diff --git a/tests/UtilsCase/Coroutine/RippleCoroutineTest.php b/tests/UtilsCase/Coroutine/RippleCoroutineTest.php
@@ -29,8 +29,9 @@ public function testConstruct()
         $promiseMock = Mockery::mock('Psc\Core\Coroutine\Promise');
         $coroutine = Mockery::mock(RippleCoroutine::class)->makePartial();
         $coroutine->shouldAllowMockingProtectedMethods()->shouldReceive('_async')
-            ->andReturnUsing(function($closure) use (&$callback, $promiseMock) {
+            ->andReturnUsing(function ($closure) use (&$callback, $promiseMock) {
                 $callback = $closure;
+
                 return $promiseMock;
             });
         // 模拟构造
@@ -39,9 +40,9 @@ public function testConstruct()
 
         $this->assertFalse($executed);
         $this->assertInstanceOf('Psc\Core\Coroutine\Promise', $coroutine->origin());
-        $this->assertIsString($coroutine->id());
+        $this->assertIsString($getId = $coroutine->id());
         $this->assertEquals(spl_object_hash($promiseMock), $coroutine->id());
-        $this->assertEquals($coroutine->id(), $id);
+        $this->assertNull($id);
 
         // 模拟发生协程执行
         call_user_func($callback);
@@ -50,12 +51,12 @@ public function testConstruct()
         $this->assertNull($coroutine->origin());
         $this->assertNull($coroutine->id());
         $this->assertNotNull($id);
-
+        $this->assertEquals($getId, $id);
     }
 
     public function testDestruct()
     {
-        $func = function() {
+        $func = function () {
             // 模拟闭包函数的执行
         };
 
@@ -64,8 +65,9 @@ public function testDestruct()
         $promiseMock = Mockery::mock('Psc\Core\Coroutine\Promise');
         $coroutine = Mockery::mock(RippleCoroutine::class)->makePartial();
         $coroutine->shouldAllowMockingProtectedMethods()->shouldReceive('_async')
-            ->andReturnUsing(function($closure) use (&$callback, $promiseMock) {
+            ->andReturnUsing(function ($closure) use (&$callback, $promiseMock) {
                 $callback = $closure;
+
                 return $promiseMock;
             });
         // 模拟构造函数执行
@@ -81,39 +83,43 @@ public function testDestruct()
 
     public function testOrigin()
     {
-        $func = function() {
+        $func = function () {
             // 模拟闭包函数的执行
         };
         // mock async
         $callback = null;
         $promiseMock = Mockery::mock('Psc\Core\Coroutine\Promise');
         $coroutine = Mockery::mock(RippleCoroutine::class)->makePartial();
         $coroutine->shouldAllowMockingProtectedMethods()->shouldReceive('_async')
-            ->andReturnUsing(function($closure) use (&$callback, $promiseMock) {
+            ->andReturnUsing(function ($closure) use (&$callback, $promiseMock) {
                 $callback = $closure;
+
                 return $promiseMock;
             });
         // 模拟构造函数执行
         $constructor = new \ReflectionMethod(RippleCoroutine::class, '__construct');
         $constructor->invoke($coroutine, $func);
+
+        $this->assertInstanceOf('Psc\Core\Coroutine\Promise', $coroutine->origin());
         // 模拟构造后协程执行callback
         call_user_func($callback);
 
-        $this->assertInstanceOf('Psc\Core\Coroutine\Promise', $coroutine->origin());
+        $this->assertNull($coroutine->origin());
     }
 
     public function testId()
     {
-        $func = function() {
+        $func = function () {
             // 模拟闭包函数的执行
         };
         // mock async
         $callback = null;
         $promiseMock = Mockery::mock('Psc\Core\Coroutine\Promise');
         $coroutine = Mockery::mock(RippleCoroutine::class)->makePartial();
         $coroutine->shouldAllowMockingProtectedMethods()->shouldReceive('_async')
-            ->andReturnUsing(function($closure) use (&$callback, $promiseMock) {
+            ->andReturnUsing(function ($closure) use (&$callback, $promiseMock) {
                 $callback = $closure;
+
                 return $promiseMock;
             });
         // 模拟构造函数执行

diff --git a/tests/UtilsCase/Coroutine/SwooleCoroutineTest.php b/tests/UtilsCase/Coroutine/SwooleCoroutineTest.php
@@ -10,7 +10,6 @@
 
 class SwooleCoroutineTest extends TestCase
 {
-
     protected function tearDown(): void
     {
         Mockery::close();
@@ -28,8 +27,9 @@ public function testConstruct()
         // mock 协程创建
         $callback = null;
         $coroutineMock = Mockery::mock('alias:Swoole\Coroutine');
-        $coroutineMock->shouldReceive('create')->andReturnUsing(function($closure) use (&$callback, &$executed) {
+        $coroutineMock->shouldReceive('create')->andReturnUsing(function ($closure) use (&$callback, &$executed) {
             $callback = $closure;
+
             return 123;
         });
         // 构造
@@ -38,7 +38,7 @@ public function testConstruct()
         $this->assertFalse($executed);
         $this->assertEquals(123, $coroutine->origin());
         $this->assertEquals(123, $coroutine->id());
-        $this->assertEquals(123, $id);
+        $this->assertNull($id);
 
         // 模拟构造后发生协程执行
         call_user_func($callback);
@@ -51,15 +51,16 @@ public function testConstruct()
 
     public function testDestruct()
     {
-        $func = function() {
+        $func = function () {
             // 模拟闭包函数的执行
         };
 
         // mock 协程创建
         $callback = null;
         $coroutineMock = Mockery::mock('alias:Swoole\Coroutine');
-        $coroutineMock->shouldReceive('create')->andReturnUsing(function($closure) use (&$callback, &$executed) {
+        $coroutineMock->shouldReceive('create')->andReturnUsing(function ($closure) use (&$callback, &$executed) {
             $callback = $closure;
+
             return 123;
         });
         // 构造
@@ -75,15 +76,16 @@ public function testDestruct()
 
     public function testOrigin()
     {
-        $func = function() {
+        $func = function () {
             // 模拟闭包函数的执行
         };
 
         // mock 协程创建
         $callback = null;
         $coroutineMock = Mockery::mock('alias:Swoole\Coroutine');
-        $coroutineMock->shouldReceive('create')->andReturnUsing(function($closure) use (&$callback, &$executed) {
+        $coroutineMock->shouldReceive('create')->andReturnUsing(function ($closure) use (&$callback, &$executed) {
             $callback = $closure;
+
             return 123;
         });
         // 构造
@@ -98,15 +100,16 @@ public function testOrigin()
 
     public function testId()
     {
-        $func = function() {
+        $func = function () {
             // 模拟闭包函数的执行
         };
 
         // mock 协程创建
         $callback = null;
         $coroutineMock = Mockery::mock('alias:Swoole\Coroutine');
-        $coroutineMock->shouldReceive('create')->andReturnUsing(function($closure) use (&$callback, &$executed) {
+        $coroutineMock->shouldReceive('create')->andReturnUsing(function ($closure) use (&$callback, &$executed) {
             $callback = $closure;
+
             return 123;
         });
         // 构造
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,4 +34,4 @@ public function origin(): mixed; @@
          * @return string|int|null
          */
         public function id(): string|int|null;
-    }
+    }