Refactor

Author: m3m0r7

src/Coroutine/Context.php

@@ -28,7 +28,7 @@ class Context
      */
     public static function getApp()
     {
-        return static::$apps[static::getCoroutineId()] ?? null;
+        return static::$apps[static::getRequestedCoroutineId()] ?? null;
     }
 
     /**
@@ -38,7 +38,7 @@ public static function getApp()
      */
     public static function setApp(Container $app)
     {
-        static::$apps[static::getCoroutineId()] = $app;
+        static::$apps[static::getRequestedCoroutineId()] = $app;
     }
 
     /**
@@ -50,7 +50,7 @@ public static function setApp(Container $app)
      */
     public static function getData(string $key)
     {
-        return static::$data[static::getCoroutineId()][$key] ?? null;
+        return static::$data[static::getRequestedCoroutineId()][$key] ?? null;
     }
 
     /**
@@ -61,7 +61,7 @@ public static function getData(string $key)
      */
     public static function setData(string $key, $value)
     {
-        static::$data[static::getCoroutineId()][$key] = $value;
+        static::$data[static::getRequestedCoroutineId()][$key] = $value;
     }
 
     /**
@@ -71,38 +71,43 @@ public static function setData(string $key, $value)
      */
     public static function removeData(string $key)
     {
-        unset(static::$data[static::getCoroutineId()][$key]);
+        unset(static::$data[static::getRequestedCoroutineId()][$key]);
     }
 
     /**
      * Get data keys by current coroutine id.
      */
     public static function getDataKeys()
     {
-        return array_keys(static::$data[static::getCoroutineId()] ?? []);
+        return array_keys(static::$data[static::getRequestedCoroutineId()] ?? []);
     }
 
     /**
      * Clear data by current coroutine id.
      */
     public static function clear()
     {
-        unset(static::$apps[static::getCoroutineId()]);
-        unset(static::$data[static::getCoroutineId()]);
+        unset(static::$apps[static::getRequestedCoroutineId()]);
+        unset(static::$data[static::getRequestedCoroutineId()]);
+    }
+
+    public static function getCoroutineId(): int
+    {
+        return Coroutine::getuid();
     }
 
     /**
-     * Get current requesting coroutine id.
+     * Get current coroutine id.
      */
-    public static function getCoroutineId(): int
+    public static function getRequestedCoroutineId(): int
     {
-        $currentId = Coroutine::getuid();
+        $currentId = static::getCoroutineId();
         if ($currentId === -1) {
             return -1;
         }
 
         $counter = 0;
-        while (($topCoroutineId = Coroutine::getPcid($currentId)) !== -1 && $counter <= self::MAX_RECURSE_COROUTINE_ID) {
+        while (($topCoroutineId = Coroutine::getPcid($currentId)) !== -1 && $counter <= static::MAX_RECURSE_COROUTINE_ID) {
             $currentId = $topCoroutineId;
             $counter++;
         }

tests/Coroutine/ContextTest.php

@@ -63,12 +63,12 @@ public function testGetDataKeyInCoroutine()
 
             $data1 = Context::getData('foo');
             $data2 = 'baz';
-            $coroutineId1 = Context::getCoroutineId();
+            $coroutineId1 = Context::getRequestedCoroutineId();
             $coroutineId2 = -1;
 
             go(function () use (&$data2, &$coroutineId2) {
                 $data2 = Context::getData('foo');
-                $coroutineId2 = Context::getCoroutineId();
+                $coroutineId2 = Context::getRequestedCoroutineId();
             });
         });