More tests

Author: roxblnfk

src/Internal/Workflow/Process/DeferredGenerator.php

@@ -89,6 +89,7 @@ public function send(mixed $value): mixed
      */
     public function getReturn(): mixed
     {
+        // $this->start();
         try {
             return $this->generator->getReturn();
         } catch (\Throwable $e) {
@@ -170,6 +171,20 @@ public function catch(callable $handler): self
         return $this;
     }
 
+    private static function getDummyGenerator(): \Generator
+    {
+        static $generator;
+
+        if ($generator === null) {
+            $generator = (static function (): \Generator {
+                yield;
+            })();
+            $generator->current();
+        }
+
+        return $generator;
+    }
+
     private function start(): void
     {
         if ($this->started) {
@@ -185,12 +200,14 @@ private function start(): void
                 return;
             }
 
-            $this->generator = (static function (mixed $result) {
+            /** @psalm-suppress all */
+            $this->generator = (static function (mixed $result): \Generator {
                 return $result;
                 yield;
             })($result);
             $this->finished = true;
         } catch (\Throwable $e) {
+            $this->generator = self::getDummyGenerator();
             $this->handleException($e);
         } finally {
             unset($this->handler, $this->values);

src/Internal/Workflow/Process/Scope.php

@@ -131,7 +131,8 @@ public function getContext(): WorkflowContext
     public function start(\Closure $handler, ?ValuesInterface $values, bool $deferred): void
     {
         // Create a coroutine generator
-        $this->coroutine = $this->call($handler, $values ?? EncodedValues::empty());
+        $this->coroutine = DeferredGenerator::fromHandler($handler, $values ?? EncodedValues::empty())
+            ->catch($this->onException(...));
 
         $deferred
             ? $this->services->loop->once($this->layer, $this->next(...))
@@ -330,19 +331,6 @@ function () use ($cancelID): void {
         return $scope;
     }
 
-    /**
-     * @param \Closure(ValuesInterface): mixed $handler
-     */
-    protected function call(\Closure $handler, ValuesInterface $values): DeferredGenerator
-    {
-        $generator = DeferredGenerator::fromHandler($handler, $values)
-            ->catch(tr(...))
-            ->catch($this->onException(...));
-        // Run lazy generator
-        $generator->current();
-        return $generator;
-    }
-
     /**
      * Call a Signal or Update method. In this case deserialization errors are skipped.
      *
@@ -441,7 +429,11 @@ protected function next(): void
                 break;
 
             default:
-                $this->coroutine->send($current);
+                try {
+                    $this->coroutine->send($current);
+                } catch (\Throwable) {
+                    // Ignore
+                }
                 goto begin;
         }
     }

tests/Unit/Workflow/DeferredGeneratorTestCase.php

@@ -32,7 +32,7 @@ public function testSimple(): void
         );
     }
 
-    public function testSendingValues(): void
+    public function testCompareSendingValues(): void
     {
         $this->compare(
             fn() => (function () {
@@ -50,7 +50,7 @@ public function testSendingValues(): void
         );
     }
 
-    public function testThrowingExceptions(): void
+    public function testCompareThrowingExceptions(): void
     {
         $this->compare(
             fn() => (function () {
@@ -71,7 +71,7 @@ public function testThrowingExceptions(): void
         );
     }
 
-    public function testReturn(): void
+    public function testCompareReturn(): void
     {
         $this->compare(
             fn() => (function () {
@@ -86,7 +86,7 @@ public function testReturn(): void
         );
     }
 
-    public function testEmpty(): void
+    public function testCompareEmpty(): void
     {
         $this->compare(
             fn() => (function () {
@@ -100,7 +100,7 @@ public function testEmpty(): void
         );
     }
 
-    public function testEmptyReturn(): void
+    public function testCompareEmptyReturn(): void
     {
         $this->compare(
             fn() => (function () {
@@ -115,7 +115,7 @@ public function testEmptyReturn(): void
         );
     }
 
-    public function testEmptyThrow(): void
+    public function testCompareEmptyThrow(): void
     {
         $this->compare(
             fn() => (function () {
@@ -126,7 +126,7 @@ public function testEmptyThrow(): void
         );
     }
 
-    public function testEmptyThrowValid(): void
+    public function testCompareEmptyThrowValid(): void
     {
         $this->compare(
             fn() => (function () {
@@ -137,7 +137,7 @@ public function testEmptyThrowValid(): void
         );
     }
 
-    public function testEmptyThrowGetReturn(): void
+    public function testCompareEmptyThrowGetReturn(): void
     {
         $this->compare(
             fn() => (function () {
@@ -148,7 +148,7 @@ public function testEmptyThrowGetReturn(): void
         );
     }
 
-    public function testEmptyThrowGetKey(): void
+    public function testCompareEmptyThrowGetKey(): void
     {
         $this->compare(
             fn() => (function () {
@@ -159,6 +159,45 @@ public function testEmptyThrowGetKey(): void
         );
     }
 
+    public function testLazyNotGeneratorValidGetReturn(): void
+    {
+        $lazy = DeferredGenerator::fromHandler(fn() => 42, EncodedValues::empty());
+
+        $this->assertFalse($lazy->valid());
+        $this->assertSame(42, $lazy->getReturn());
+    }
+
+    public function testLazyNotGeneratorCurrent(): void
+    {
+        $lazy = DeferredGenerator::fromHandler(fn() => 42, EncodedValues::empty());
+
+        $this->assertNull($lazy->current());
+    }
+
+    public function testLazyNotGeneratorWithException(): void
+    {
+        $lazy = DeferredGenerator::fromHandler(fn() => throw new \Exception('foo'), EncodedValues::empty());
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('foo');
+
+        $lazy->current();
+    }
+
+
+    public function testLazyNotGeneratorWithException2(): void
+    {
+        $lazy = DeferredGenerator::fromHandler(fn() => throw new \Exception('foo'), EncodedValues::empty());
+
+        try {
+            $lazy->current();
+        } catch (\Exception) {
+            // ignore
+        }
+
+        $this->assertNull($lazy->current());
+    }
+
     /**
      * @param callable(): \Generator $generatorFactory
      * @param iterable<Action|int, array{Action, mixed}> $actions