Restore parent context in workflow stubs

durable-workflow-ops · durable-workflow-ops · commit f3a51750c597 · 2026-04-03T13:50:06.000Z
diff --git a/src/ActivityStub.php b/src/ActivityStub.php
@@ -64,6 +64,7 @@ public static function make($activity, ...$arguments): PromiseInterface
             }
 
             ++$context->index;
+            WorkflowStub::setContext($context);
             $result = Serializer::unserialize($log->result);
             if (
                 is_array($result) &&
@@ -87,12 +88,14 @@ public static function make($activity, ...$arguments): PromiseInterface
 
         if (WorkflowStub::isProbing()) {
             ++$context->index;
+            WorkflowStub::setContext($context);
             return (new Deferred())->promise();
         }
 
         $activity::dispatch($context->index, $context->now, $context->storedWorkflow, ...$arguments);
 
         ++$context->index;
+        WorkflowStub::setContext($context);
         return (new Deferred())->promise();
     }
 }
diff --git a/src/ChildWorkflowStub.php b/src/ChildWorkflowStub.php
@@ -58,6 +58,7 @@ public static function make($workflow, ...$arguments): PromiseInterface
             }
 
             ++$context->index;
+            WorkflowStub::setContext($context);
             $result = Serializer::unserialize($log->result);
             if (
                 is_array($result)
@@ -80,6 +81,7 @@ public static function make($workflow, ...$arguments): PromiseInterface
 
         if (WorkflowStub::isProbing()) {
             ++$context->index;
+            WorkflowStub::setContext($context);
             return (new Deferred())->promise();
         }
 
@@ -109,6 +111,7 @@ public static function make($workflow, ...$arguments): PromiseInterface
         }
 
         ++$context->index;
+        WorkflowStub::setContext($context);
         return (new Deferred())->promise();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public static function make($activity, ...$arguments): PromiseInterface`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`++$context->index;`
	`67`	`+ WorkflowStub::setContext($context);`
`67`	`68`	`$result = Serializer::unserialize($log->result);`
`68`	`69`	`if (`
`69`	`70`	`is_array($result) &&`
`@@ -87,12 +88,14 @@ public static function make($activity, ...$arguments): PromiseInterface`
`87`	`88`
`88`	`89`	`if (WorkflowStub::isProbing()) {`
`89`	`90`	`++$context->index;`
	`91`	`+ WorkflowStub::setContext($context);`
`90`	`92`	`return (new Deferred())->promise();`
`91`	`93`	`}`
`92`	`94`
`93`	`95`	`$activity::dispatch($context->index, $context->now, $context->storedWorkflow, ...$arguments);`
`94`	`96`
`95`	`97`	`++$context->index;`
	`98`	`+ WorkflowStub::setContext($context);`
`96`	`99`	`return (new Deferred())->promise();`
`97`	`100`	`}`
`98`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ public static function make($workflow, ...$arguments): PromiseInterface`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`++$context->index;`
	`61`	`+ WorkflowStub::setContext($context);`
`61`	`62`	`$result = Serializer::unserialize($log->result);`
`62`	`63`	`if (`
`63`	`64`	`is_array($result)`
`@@ -80,6 +81,7 @@ public static function make($workflow, ...$arguments): PromiseInterface`
`80`	`81`
`81`	`82`	`if (WorkflowStub::isProbing()) {`
`82`	`83`	`++$context->index;`
	`84`	`+ WorkflowStub::setContext($context);`
`83`	`85`	`return (new Deferred())->promise();`
`84`	`86`	`}`
`85`	`87`
`@@ -109,6 +111,7 @@ public static function make($workflow, ...$arguments): PromiseInterface`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`++$context->index;`
	`114`	`+ WorkflowStub::setContext($context);`
`112`	`115`	`return (new Deferred())->promise();`
`113`	`116`	`}`
`114`	`117`	`}`