Merge pull request #379: Prepare to release 2.7.0

temporalio · Dec 23, 2023 · 403baf4 · 403baf4
2 parents 4538cdb + 88b3b96
commit 403baf4
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -91,7 +91,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7.x-dev"
+            "dev-master": "2.8.x-dev"
         }
     },
     "config": {

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.17.0@c620f6e80d0abfca532b00bda366062aaedf6e5d">
+<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
   <file src="src/Activity.php">
     <ImplicitToStringCast>
       <code>$type</code>
@@ -928,12 +928,12 @@
     </MissingTemplateParam>
   </file>
   <file src="src/Internal/Repository/ArrayRepository.php">
-    <InvalidArgument>
-      <code>$filter</code>
-    </InvalidArgument>
-    <InvalidReturnStatement>
-      <code><![CDATA[$this->entries[$id] ?? null]]></code>
-    </InvalidReturnStatement>
+    <InvalidDocblock>
+      <code>private array $entries = [];</code>
+    </InvalidDocblock>
+    <PossiblyInvalidArgument>
+      <code><![CDATA[\array_filter($this->entries, $filter)]]></code>
+    </PossiblyInvalidArgument>
     <UnsafeInstantiation>
       <code><![CDATA[new static(\array_filter($this->entries, $filter))]]></code>
     </UnsafeInstantiation>

diff --git a/src/Workflow/WorkflowExecution.php b/src/Workflow/WorkflowExecution.php
@@ -14,6 +14,9 @@
 use Temporal\Common\Uuid;
 use Temporal\Internal\Marshaller\Meta\Marshal;
 
+/**
+ * @see \Temporal\Api\Common\V1\WorkflowExecution
+ */
 class WorkflowExecution
 {
     /**
@@ -22,7 +25,7 @@ class WorkflowExecution
      * @var string
      */
     #[Marshal(name: 'ID')]
-    #[Marshal(name: 'id')]
+    #[Marshal(name: 'workflow_id')]
     private string $id;
 
     /**

diff --git a/tests/Unit/DTO/WorkflowExecutionTestCase.php b/tests/Unit/DTO/WorkflowExecutionTestCase.php
@@ -11,6 +11,8 @@
 
 namespace Temporal\Tests\Unit\DTO;
 
+use Temporal\DataConverter\DataConverter;
+use Temporal\Internal\Marshaller\ProtoToArrayConverter;
 use Temporal\Workflow\WorkflowExecution;
 
 class WorkflowExecutionTestCase extends DTOMarshallingTestCase
@@ -29,4 +31,20 @@ public function testMarshalling(): void
 
         $this->assertSame($expected, $this->marshal($dto));
     }
+
+    public function testUnmarshalFromProto(): void
+    {
+        $converter = DataConverter::createDefault();
+        $protoConverter = new ProtoToArrayConverter($converter);
+        $message = (new \Temporal\Api\Common\V1\WorkflowExecution())
+            ->setWorkflowId('489-wf-id-test')
+            ->setRunId('wf-run-id-test');
+        $values = $protoConverter->convert($message);
+        $dto = new WorkflowExecution();
+
+        $result = $this->marshaller->unmarshal($values, $dto);
+
+        $this->assertSame('489-wf-id-test', $result->getID());
+        $this->assertSame('wf-run-id-test', $result->getRunID());
+    }
 }