Remove redundant context resets

durable-workflow-ops · durable-workflow-ops · commit 7393ea500bd7 · 2026-04-03T13:15:07.000Z
diff --git a/src/ActivityStub.php b/src/ActivityStub.php
@@ -64,7 +64,6 @@ public static function make($activity, ...$arguments): PromiseInterface
             }
 
             ++$context->index;
-            WorkflowStub::setContext($context);
             $result = Serializer::unserialize($log->result);
             if (
                 is_array($result) &&
@@ -88,14 +87,12 @@ 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,7 +58,6 @@ public static function make($workflow, ...$arguments): PromiseInterface
             }
 
             ++$context->index;
-            WorkflowStub::setContext($context);
             $result = Serializer::unserialize($log->result);
             if (
                 is_array($result)
@@ -81,7 +80,6 @@ public static function make($workflow, ...$arguments): PromiseInterface
 
         if (WorkflowStub::isProbing()) {
             ++$context->index;
-            WorkflowStub::setContext($context);
             return (new Deferred())->promise();
         }
 
@@ -111,7 +109,6 @@ 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,7 +64,6 @@ public static function make($activity, ...$arguments): PromiseInterface`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`++$context->index;`
`67`		`- WorkflowStub::setContext($context);`
`68`	`67`	`$result = Serializer::unserialize($log->result);`
`69`	`68`	`if (`
`70`	`69`	`is_array($result) &&`
`@@ -88,14 +87,12 @@ public static function make($activity, ...$arguments): PromiseInterface`
`88`	`87`
`89`	`88`	`if (WorkflowStub::isProbing()) {`
`90`	`89`	`++$context->index;`
`91`		`- WorkflowStub::setContext($context);`
`92`	`90`	`return (new Deferred())->promise();`
`93`	`91`	`}`
`94`	`92`
`95`	`93`	`$activity::dispatch($context->index, $context->now, $context->storedWorkflow, ...$arguments);`
`96`	`94`
`97`	`95`	`++$context->index;`
`98`		`- WorkflowStub::setContext($context);`
`99`	`96`	`return (new Deferred())->promise();`
`100`	`97`	`}`
`101`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ public static function make($workflow, ...$arguments): PromiseInterface`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`++$context->index;`
`61`		`- WorkflowStub::setContext($context);`
`62`	`61`	`$result = Serializer::unserialize($log->result);`
`63`	`62`	`if (`
`64`	`63`	`is_array($result)`
`@@ -81,7 +80,6 @@ public static function make($workflow, ...$arguments): PromiseInterface`
`81`	`80`
`82`	`81`	`if (WorkflowStub::isProbing()) {`
`83`	`82`	`++$context->index;`
`84`		`- WorkflowStub::setContext($context);`
`85`	`83`	`return (new Deferred())->promise();`
`86`	`84`	`}`
`87`	`85`
`@@ -111,7 +109,6 @@ public static function make($workflow, ...$arguments): PromiseInterface`
`111`	`109`	`}`
`112`	`110`
`113`	`111`	`++$context->index;`
`114`		`- WorkflowStub::setContext($context);`
`115`	`112`	`return (new Deferred())->promise();`
`116`	`113`	`}`
`117`	`114`	`}`