fix!

VennDev · Aug 30, 2024 · 13cc0ba · 13cc0ba
1 parent bfd0993
commit 13cc0ba
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/vennv/vapm/Async.php b/src/vennv/vapm/Async.php
@@ -64,26 +64,25 @@ public function getId(): int
      */
     public static function await(mixed $await): mixed
     {
-        $isPromiseOrAsync = $await instanceof Promise || $await instanceof Async;
-        if (!$isPromiseOrAsync && !Utils::isClass(Async::class)) {
-            throw new RuntimeException(Error::ASYNC_AWAIT_MUST_CALL_IN_ASYNC_FUNCTION);
+        if (!$await instanceof Promise && !$await instanceof Async) {
+            if (!Utils::isClass(Async::class)) {
+                throw new RuntimeException(Error::ASYNC_AWAIT_MUST_CALL_IN_ASYNC_FUNCTION);
+            }
+            if (is_callable($await)) {
+                $await = new Async($await);
+            } else {
+                return $await;
+            }
         }
 
-        $result = $await;
-
-        if (is_callable($await)) $await = new Async($await);
-        if ($isPromiseOrAsync) {
+        do {
             $return = EventLoop::getReturn($await->getId());
-            while ($return === null) {
-                $return = EventLoop::getReturn($await->getId());
+            if ($return === null) {
                 FiberManager::wait();
             }
-            if ($return instanceof Promise) {
-                $result = $return->getResult();
-            }
-        }
+        } while ($return === null);
 
-        return $result;
+        return $return instanceof Promise ? $return->getResult() : $return;
     }
 
 }