refactor: streamline context handling in Process and DynamicUpdateTest

Author: roxblnfk

src/Internal/Workflow/Process/Process.php

@@ -188,6 +188,7 @@ public function initAndStart(
         $handler = $instance->getHandler();
         $instance = $context->getWorkflowInstance();
         $arguments = null;
+        $values = [];
 
         try {
             // Initialize workflow instance
@@ -205,14 +206,13 @@ public function initAndStart(
                         $context->getHeader(),
                     ),
                 );
-                Workflow::setCurrentContext($context);
-
-                $instance->init($values);
-            } else {
-                Workflow::setCurrentContext($context);
-                $instance->init();
             }
 
+            // Workflow::setCurrentContext($context);
+            $this->setContext($context);
+            $this->makeCurrent();
+            $instance->init($values);
+
             $context->setReadonly(false);
 
             // Execute
@@ -240,8 +240,8 @@ function (WorkflowInput $input) use ($context, $arguments, $handler, $deferred):
                     $context->isReplaying(),
                 ));
         } catch (\Throwable $e) {
-            /** @psalm-suppress RedundantPropertyInitializationCheck */
-            isset($this->context) or $this->setContext($context->setReadonly(false));
+            isset($this->context) or $this->setContext($context);
+            $context->setReadonly(false);
             $this->complete($e);
         } finally {
             Workflow::setCurrentContext(null);

tests/Acceptance/Extra/Update/DynamicUpdateTest.php

@@ -66,22 +66,24 @@ class TestWorkflow
     private array $result = [];
     private bool $exit = false;
 
-    #[WorkflowMethod(name: "Extra_Update_DynamicUpdate")]
-    public function handle()
-    {
-        // Register update methods
+    public function __construct() {
+        // Register update methods in constructor
         Workflow::registerUpdate(self::UPDATE_METHOD, function () {
             // Also Update context is tested
             $id = Workflow::getUpdateContext()->getUpdateId();
             return $this->result[self::UPDATE_METHOD] = $id;
         });
+    }
+
+    #[WorkflowMethod(name: "Extra_Update_DynamicUpdate")]
+    public function handle()
+    {
         // Update method with validation
         Workflow::registerUpdate(
             self::UPDATE_METHOD_WV,
             fn(int $value): int => $value,
             fn(int $value) => $value > 0 or throw new \InvalidArgumentException('Value must be positive'),
         );
-
         yield Workflow::await(fn() => $this->exit);
         return $this->result;
     }