Fix unit tests

Author: roxblnfk

tests/Functional/WorkflowTestCase.php

@@ -436,6 +436,6 @@ public function setUp(): void
      */
     private static function getPrivate(object $object, string $key): mixed
     {
-        return (fn (object $value) => $value->{$key} ?? null)->call($object, $object);
+        return (static fn(object $value) => $value->{$key} ?? null)->call($object, $object);
     }
 }

tests/Unit/Framework/ClientMock.php

@@ -106,7 +106,7 @@ public function reject(CommandInterface $command, \Throwable $reason): void
 
     public function fork(): self
     {
-        return new self($this->queue);
+        return $this;
     }
 
     public function destroy(): void {}

tests/Unit/Framework/Expectation/WorkflowResult.php

@@ -4,7 +4,6 @@
 
 namespace Temporal\Tests\Unit\Framework\Expectation;
 
-use DateTimeImmutable;
 use Temporal\DataConverter\EncodedValues;
 use Temporal\Internal\Transport\Request\CompleteWorkflow;
 use Temporal\Worker\Transport\Command\CommandInterface;
@@ -38,7 +37,7 @@ public function matches(CommandInterface $command): bool
 
     public function run(CommandInterface $command): CommandInterface
     {
-        return new SuccessResponse(EncodedValues::empty(), $command->getID(), new TickInfo(new DateTimeImmutable()));
+        return new SuccessResponse(EncodedValues::empty(), $command->getID(), new TickInfo(new \DateTimeImmutable()));
     }
 
     public function fail(): void

tests/Unit/Framework/Server/ServerMock.php

@@ -44,7 +44,7 @@ public function getBatch(): CommandBatchMock
 
     public function addCommand(CommandInterface ...$commands): void
     {
-        $this->queue = array_merge($this->queue, $commands);
+        $this->queue = \array_merge($this->queue, $commands);
     }
 
     public function handleCommand(CommandInterface $command): ?CommandInterface

tests/Unit/Framework/WorkerMock.php

@@ -4,15 +4,13 @@
 
 namespace Temporal\Tests\Unit\Framework;
 
-use Closure;
 use PHPUnit\Framework\Exception;
 use React\Promise\PromiseInterface;
 use Temporal\Common\Uuid;
 use Temporal\Interceptor\PipelineProvider;
 use Temporal\Interceptor\SimplePipelineProvider;
 use Temporal\Internal\Declaration\Prototype\ActivityPrototype;
 use Temporal\Internal\Queue\QueueInterface;
-use Temporal\Internal\Repository\Identifiable;
 use Temporal\Internal\ServiceContainer;
 use Temporal\Internal\Transport\Router;
 use Temporal\Internal\Transport\RouterInterface;
@@ -28,7 +26,6 @@
 use Temporal\Worker\Transport\Goridge;
 use Temporal\Worker\WorkerInterface;
 use Temporal\Worker\WorkerOptions;
-use Throwable;
 
 /**
  * @internal
@@ -61,25 +58,14 @@ public function __construct(
         $this->server = new ServerMock(CommandHandlerFactory::create());
     }
 
-    private function createRouter(): RouterInterface
-    {
-        $router = new Router();
-        $router->add(new Router\StartWorkflow($this->services));
-        $router->add(new Router\InvokeActivity($this->services, Goridge::create(), $this->interceptorProvider));
-        $router->add(new Router\DestroyWorkflow($this->services->running, $this->services->loop));
-        $router->add(new Router\InvokeSignal($this->services->running));
-
-        return $router;
-    }
-
     public function runWorkflow(string $workflowCLass, ...$args): void
     {
         $runId = Uuid::v4();
         $this->execution[$workflowCLass] = $runId;
         $this->server->addCommand(new StartWorkflow($runId, $workflowCLass, ...$args));
     }
 
-    public function sendSignal(string $workflow, string $name, ...$args): void
+    public function sendSignal(string $workflow, string $name, mixed ...$args): void
     {
         $workflowRunId = $this->execution[$workflow] ?? null;
         if ($workflowRunId === null) {
@@ -109,9 +95,9 @@ public function send(QueueInterface $commands): void
     }
 
     /**
-     * @throws Throwable
+     * @throws \Throwable
      */
-    public function error(Throwable $error): void
+    public function error(\Throwable $error): void
     {
         if ($error instanceof Exception) {
             throw $error;
@@ -154,14 +140,13 @@ public function getWorkflows(): iterable
     public function registerActivityImplementations(object ...$activity): WorkerInterface
     {
         foreach ($activity as $act) {
-            $this->registerActivity(\get_class($act), fn() => $act);
+            $this->registerActivity(\get_class($act), static fn() => $act);
         }
 
         return $this;
     }
 
-
-    public function registerActivity(string $type, callable $factory = null): WorkerInterface
+    public function registerActivity(string $type, ?callable $factory = null): WorkerInterface
     {
         foreach ($this->services->activitiesReader->fromClass($type) as $proto) {
             /** @var ActivityPrototype $proto */
@@ -205,10 +190,21 @@ public function complete(): void
         $this->execution = [];
     }
 
-    public function registerActivityFinalizer(Closure $finalizer): WorkerInterface
+    public function registerActivityFinalizer(\Closure $finalizer): WorkerInterface
     {
         $this->services->activities->addFinalizer($finalizer);
 
         return $this;
     }
+
+    private function createRouter(): RouterInterface
+    {
+        $router = new Router();
+        $router->add(new Router\StartWorkflow($this->services));
+        $router->add(new Router\InvokeActivity($this->services, Goridge::create(), $this->interceptorProvider));
+        $router->add(new Router\DestroyWorkflow($this->services->running, $this->services->loop));
+        $router->add(new Router\InvokeSignal($this->services->running));
+
+        return $router;
+    }
 }

tests/Unit/WorkflowContext/GetVersionTestCase.php

@@ -15,17 +15,10 @@
 final class GetVersionTestCase extends AbstractUnit
 {
     private WorkerFactoryInterface $factory;
+
     /** @var WorkerMock|WorkerInterface */
     private $worker;
 
-    protected function setUp(): void
-    {
-        $this->factory = WorkerFactoryMock::create();
-        $this->worker = $this->factory->newWorker();
-
-        parent::setUp();
-    }
-
     public function testVersionIsRetrieved(): void
     {
         // We don't have native PHPUnit assertions in this scenario
@@ -50,11 +43,19 @@ public function handler(): iterable
 
                     return 'ERROR';
                 }
-            }
+            },
         );
 
         $this->worker->runWorkflow('VersionWorkflow');
         $this->worker->assertWorkflowReturns('OK');
         $this->factory->run($this->worker);
     }
+
+    protected function setUp(): void
+    {
+        $this->factory = WorkerFactoryMock::create();
+        $this->worker = $this->factory->newWorker();
+
+        parent::setUp();
+    }
 }