[JsonConverter] Fixed hydrate null value (#386)

Co-authored-by: roxblnfk <[email protected]>
temporalio · Jan 15, 2024 · 7fe594b · 7fe594b
1 parent 06639b2
commit 7fe594b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
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.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
+<files psalm-version="5.19.0@06b71be009a6bd6d81b9811855d6629b9fe90e1b">
   <file src="src/Activity.php">
     <ImplicitToStringCast>
       <code>$type</code>
@@ -938,9 +938,6 @@
     <InvalidDocblock>
       <code>interface RepositoryInterface extends \IteratorAggregate, \Countable</code>
     </InvalidDocblock>
-    <InvalidTemplateParam>
-      <code>callable(TEntry): bool</code>
-    </InvalidTemplateParam>
     <MissingTemplateParam>
       <code>\IteratorAggregate</code>
     </MissingTemplateParam>

diff --git a/src/DataConverter/JsonConverter.php b/src/DataConverter/JsonConverter.php
@@ -96,6 +96,10 @@ public function fromPayload(Payload $payload, Type $type)
             throw new DataConverterException($e->getMessage(), $e->getCode(), $e);
         }
 
+        if ($data === null && $type->allowsNull()){
+            return null;
+        }
+
         switch ($type->getName()) {
             case Type::TYPE_ANY:
                 return $data;

diff --git a/src/Internal/Repository/RepositoryInterface.php b/src/Internal/Repository/RepositoryInterface.php
@@ -23,7 +23,7 @@
 interface RepositoryInterface extends \IteratorAggregate, \Countable
 {
     /**
-     * @param callable(TEntry): bool $filter
+     * @param callable(Identifiable): bool $filter
      * @return $this
      */
     public function filter(callable $filter): self;

diff --git a/tests/Unit/DataConverter/JsonConverterTestCase.php b/tests/Unit/DataConverter/JsonConverterTestCase.php
@@ -12,9 +12,9 @@
 namespace Temporal\Tests\Unit\DataConverter;
 
 use Ramsey\Uuid\Uuid;
-use Temporal\DataConverter\EncodingKeys;
 use Temporal\DataConverter\JsonConverter;
 use Temporal\DataConverter\PayloadConverterInterface;
+use Temporal\DataConverter\Type;
 use Temporal\Tests\Unit\UnitTestCase;
 
 /**
@@ -42,4 +42,16 @@ public function testUuidToPayload(): void
             $payload->getData(),
         );
     }
+
+    public function testNullFromPayload(): void
+    {
+        $converter = $this->create();
+        $payload   = $converter->toPayload(null);
+
+        $this->assertNotNull($payload);
+
+        $value = $converter->fromPayload($payload, new Type(Type::TYPE_STRING, allowsNull: true));
+
+        $this->assertNull($value);
+    }
 }