Fix prototype existence check in ArrayRepository (#631)

Author: roxblnfk

psalm-baseline.xml

@@ -1406,6 +1406,12 @@
     </PossiblyNullArgument>
   </file>
   <file src="src/Worker/Transport/Codec/ProtoCodec.php">
+    <LessSpecificReturnStatement>
+      <code><![CDATA[$frame->serializeToString()]]></code>
+    </LessSpecificReturnStatement>
+    <MoreSpecificReturnType>
+      <code><![CDATA[string]]></code>
+    </MoreSpecificReturnType>
     <PossiblyInvalidArgument>
       <code><![CDATA[$e->getCode()]]></code>
       <code><![CDATA[$e->getCode()]]></code>

src/Internal/Repository/ArrayRepository.php

@@ -58,7 +58,7 @@ public function add(Identifiable $entry, bool $overwrite = false): void
     {
         $name = $entry->getID();
 
-        if ($overwrite === false && isset($this->prototypes[$name])) {
+        if ($overwrite === false && isset($this->entries[$name])) {
             throw new \OutOfBoundsException(\sprintf(self::ERROR_ALREADY_EXISTS, $name));
         }
 

src/Worker/Transport/Codec/CodecInterface.php

@@ -20,12 +20,15 @@ interface CodecInterface
 {
     /**
      * @param iterable<CommandInterface> $commands
+     * @return non-empty-string
+     *
      * @throws ProtocolException
      */
     public function encode(iterable $commands): string;
 
     /**
      * @return iterable<ServerRequestInterface|ServerResponseInterface>
+     *
      * @throws ProtocolException
      */
     public function decode(string $batch, array $headers = []): iterable;

src/Worker/Transport/HostConnectionInterface.php

@@ -24,6 +24,7 @@ interface HostConnectionInterface
     public function waitBatch(): ?CommandBatch;
 
     /**
+     * @param non-empty-string $frame
      * @throws TransportException
      */
     public function send(string $frame): void;

src/WorkerFactory.php

@@ -284,6 +284,9 @@ private function createCodec(): CodecInterface
         }
     }
 
+    /**
+     * @return non-empty-string The encoded responses to be sent back to the parent process.
+     */
     private function dispatch(string $messages, array $headers): string
     {
         $commands = $this->codec->decode($messages, $headers);

tests/Fixtures/WorkerMock.php

@@ -24,19 +24,14 @@ class WorkerMock implements HostConnectionInterface
 {
     private WorkerFactoryInterface $factory;
 
-    /** @var array */
     private array $in;
 
-    /** @var array */
     private array $out;
 
-    /** @var int */
     private int $indexIn;
 
-    /** @var int */
     private int $indexOut;
 
-    /** @var bool */
     private bool $debug;
 
     private TestCase $testCase;
@@ -55,29 +50,27 @@ public static function createMock(): WorkerMock
         return $mock;
     }
 
-    public function registerWorkflowAndActivities()
+    public function registerWorkflowAndActivities(): void
     {
         $taskQueue = $this->factory->newWorker('default');
 
         foreach ($this->getClasses(__DIR__ . '/src/Workflow') as $name) {
-            $taskQueue->registerWorkflowTypes('Temporal\\Tests\\Workflow\\' . $name);
+            $class = 'Temporal\\Tests\\Workflow\\' . $name;
+            if (\class_exists($class)) {
+                $taskQueue->registerWorkflowTypes($class);
+            }
         }
 
         // register all activity
         foreach ($this->getClasses(__DIR__ . '/src/Activity') as $name) {
             $class = '\\Temporal\\Tests\\Activity\\' . $name;
             if (\class_exists($class)) {
-                $taskQueue->registerActivityImplementations(new $class);
+                $taskQueue->registerActivityImplementations(new $class());
             }
         }
     }
 
-    /**
-     * @param TestCase $testCase
-     * @param array $queue
-     * @param bool $debug
-     */
-    public function run(TestCase $testCase, array $queue, bool $debug = false)
+    public function run(TestCase $testCase, array $queue, bool $debug = false): void
     {
         $this->debug = $debug;
 
@@ -92,9 +85,6 @@ public function run(TestCase $testCase, array $queue, bool $debug = false)
         $this->factory->run($this);
     }
 
-    /**
-     * @return CommandBatch|null
-     */
     public function waitBatch(): ?CommandBatch
     {
         if (!isset($this->out[$this->indexOut])) {
@@ -110,13 +100,10 @@ public function waitBatch(): ?CommandBatch
 
         return new CommandBatch(
             $pair[0],
-            json_decode($pair[1], true),
+            \json_decode($pair[1], true),
         );
     }
 
-    /**
-     * @param string $frame
-     */
     public function send(string $frame): void
     {
         $pair = $this->in[$this->indexIn];
@@ -149,7 +136,6 @@ public function send(string $frame): void
     }
 
     /**
-     * @param \Throwable $error
      * @throws \Throwable
      */
     public function error(\Throwable $error): void

tests/Unit/Router/StartWorkflowTestCase.php

@@ -15,7 +15,6 @@
 use Temporal\DataConverter\EncodedValues;
 use Temporal\Exception\ExceptionInterceptorInterface;
 use Temporal\Interceptor\SimplePipelineProvider;
-use Temporal\Interceptor\WorkflowInboundCallsInterceptor;
 use Temporal\Internal\Declaration\Destroyable;
 use Temporal\Internal\Declaration\Prototype\WorkflowPrototype;
 use Temporal\Internal\Declaration\Reader\WorkflowReader;
@@ -76,42 +75,15 @@ public function testStartingAlreadyRunningWorkflow(): void
         $workflowInfo = new WorkflowInfo();
         $workflowInfo->type->name = 'DummyWorkflow';
         $workflowInfo->execution = new WorkflowExecution('123', (string) $request->getID());
+        $this->services->running->add($this->createIdentifiable($request->getID()));
 
         $this->marshaller->expects($this->once())
             ->method('unmarshal')
             ->willReturn(new Input($workflowInfo));
 
-        $identify = $this->createIdentifiable($request->getID());
+        $this->expectException(\OutOfBoundsException::class);
 
-        $this->services->running->add($identify);
-
-        try {
-            $this->router->handle($request, [], new Deferred());
-        } catch (\LogicException $exception) {
-            $this->fail($exception->getMessage());
-        }
-    }
-
-    public function testAlreadyRunningWorkflowIsReturned(): void
-    {
-        $request = new Request(Uuid::v4(), DummyWorkflow::class, EncodedValues::fromValues([]));
-
-        $workflowInfo = new WorkflowInfo();
-        $workflowInfo->type->name = 'DummyWorkflow';
-        $workflowInfo->execution = new WorkflowExecution('123', (string) $request->getID());
-
-        $this->marshaller->expects($this->once())
-            ->method('unmarshal')
-            ->willReturn(new Input($workflowInfo));
-
-        $identify = $this->createIdentifiable($request->getID());
-        $this->services->running->add($identify);
-
-        try {
-            $this->router->handle($request, [], new Deferred());
-        } catch (\LogicException $exception) {
-            $this->fail($exception->getMessage());
-        }
+        $this->router->handle($request, [], new Deferred());
     }
 
     protected function setUp(): void