chore: Fix tests and psalm issues

Author: roxblnfk

src/Internal/Transport/Router/StartWorkflow.php

@@ -25,7 +25,6 @@
 use Temporal\Internal\Workflow\WorkflowContext;
 use Temporal\Worker\FeatureFlags;
 use Temporal\Worker\Transport\Command\ServerRequestInterface;
-use Temporal\Workflow;
 use Temporal\Workflow\WorkflowInfo;
 
 final class StartWorkflow extends Route
@@ -90,7 +89,6 @@ public function handle(ServerRequestInterface $request, array $headers, Deferred
         );
         $runId = $request->getID();
 
-        Workflow::setCurrentContext($context);
         $process = new Process($this->services, $runId, $instance);
         $this->services->running->add($process);
         $resolver->resolve(EncodedValues::fromValues([null]));

src/Internal/Workflow/ActivityStub.php

@@ -70,9 +70,6 @@ public function execute(
 
     protected function request(RequestInterface $request): PromiseInterface
     {
-        /** @var Workflow\WorkflowContextInterface $context */
-        $context = Workflow::getCurrentContext();
-
-        return $context->request($request);
+        return Workflow::getCurrentContext()->request($request);
     }
 }

src/Internal/Workflow/ChildWorkflowStub.php

@@ -125,10 +125,7 @@ function (WorkflowExecution $execution) use ($name, $args) {
 
     protected function request(RequestInterface $request, bool $cancellable = true): PromiseInterface
     {
-        /** @var Workflow\WorkflowContextInterface $context */
-        $context = Workflow::getCurrentContext();
-
-        return $context->request($request, cancellable: $cancellable);
+        return Workflow::getCurrentContext()->request($request, cancellable: $cancellable);
     }
 
     private function getOptionArray(): array

src/Internal/Workflow/ExternalWorkflowStub.php

@@ -77,7 +77,6 @@ public function cancel(): PromiseInterface
     private function request(RequestInterface $request): PromiseInterface
     {
         // todo intercept
-        /** @var Workflow\WorkflowContextInterface $context */
         $context = Workflow::getCurrentContext();
 
         return $context->request($request);

src/Workflow.php

@@ -23,7 +23,6 @@
 use Temporal\Exception\Failure\CanceledFailure;
 use Temporal\Exception\OutOfContextException;
 use Temporal\Internal\Support\Facade;
-use Temporal\Internal\Workflow\ScopeContext;
 use Temporal\Workflow\ActivityStubInterface;
 use Temporal\Workflow\CancellationScopeInterface;
 use Temporal\Workflow\ChildWorkflowOptions;
@@ -57,11 +56,10 @@ final class Workflow extends Facade
      * Get the current Workflow context.
      * @throws OutOfContextException
      */
-    public static function getCurrentContext(): ScopedContextInterface
+    public static function getCurrentContext(): WorkflowContextInterface
     {
         $ctx = parent::getCurrentContext();
-        /** @var ScopeContext $ctx */
-        $ctx::class === ScopeContext::class or throw new OutOfContextException(
+        $ctx instanceof WorkflowContextInterface or throw new OutOfContextException(
             'The Workflow facade can be used only inside workflow code.',
         );
         return $ctx;
@@ -202,7 +200,9 @@ public static function getInput(): ValuesInterface
      */
     public static function async(callable $task): CancellationScopeInterface
     {
-        return self::getCurrentContext()->async($task);
+        $ctx = self::getCurrentContext();
+        \assert($ctx instanceof ScopedContextInterface);
+        return $ctx->async($task);
     }
 
     /**
@@ -254,7 +254,9 @@ public static function async(callable $task): CancellationScopeInterface
      */
     public static function asyncDetached(callable $task): CancellationScopeInterface
     {
-        return self::getCurrentContext()->asyncDetached($task);
+        $ctx = self::getCurrentContext();
+        \assert($ctx instanceof ScopedContextInterface);
+        return $ctx->asyncDetached($task);
     }
 
     /**
@@ -362,7 +364,9 @@ public static function registerQuery(
         callable $handler,
         string $description = '',
     ): ScopedContextInterface {
-        return self::getCurrentContext()->registerQuery($queryType, $handler, $description);
+        $ctx = self::getCurrentContext();
+        \assert($ctx instanceof ScopedContextInterface);
+        return $ctx->registerQuery($queryType, $handler, $description);
     }
 
     /**
@@ -382,7 +386,9 @@ public static function registerQuery(
      */
     public static function registerSignal(string $name, callable $handler, string $description = ''): ScopedContextInterface
     {
-        return self::getCurrentContext()->registerSignal($name, $handler, $description);
+        $ctx = self::getCurrentContext();
+        \assert($ctx instanceof ScopedContextInterface);
+        return $ctx->registerSignal($name, $handler, $description);
     }
 
     /**
@@ -501,7 +507,9 @@ public static function registerUpdate(
         ?callable $validator = null,
         string $description = '',
     ): ScopedContextInterface {
-        return self::getCurrentContext()->registerUpdate($name, $handler, $validator, $description);
+        $ctx = self::getCurrentContext();
+        \assert($ctx instanceof ScopedContextInterface);
+        return $ctx->registerUpdate($name, $handler, $validator, $description);
     }
 
     /**

src/Workflow/WorkflowContextInterface.php

@@ -19,7 +19,6 @@
 use Temporal\Common\SearchAttributes\SearchAttributeUpdate;
 use Temporal\DataConverter\Type;
 use Temporal\DataConverter\ValuesInterface;
-use Temporal\Exception\OutOfContextException;
 use Temporal\Internal\Support\DateInterval;
 use Temporal\Worker\Transport\Command\RequestInterface;
 use Temporal\Worker\Environment\EnvironmentInterface;