Fix unmarshalling of ScheduleSpec with null jitter

Search attributes command: force objects in JSON
temporalio · Feb 10, 2025 · 262f4a9 · 262f4a9
1 parent e70ae3b
commit 262f4a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/Internal/Marshaller/Type/DurationJsonType.php b/src/Internal/Marshaller/Type/DurationJsonType.php
@@ -76,8 +76,12 @@ public function parse($value, $current): CarbonInterval
     {
         if (\is_array($value) && isset($value['seconds']) && isset($value['nanos'])) {
             // The highest precision is milliseconds either way.
-            $value = $value['seconds'] * 1_000_000_000 + $value['nanos'];
-            return DateInterval::parse($value, DateInterval::FORMAT_NANOSECONDS);
+            $value = $value['seconds'] * 1_000_000 + (int) \round($value['nanos'] / 1000);
+            return DateInterval::parse($value, DateInterval::FORMAT_MICROSECONDS);
+        }
+
+        if ($value === null) {
+            return CarbonInterval::create();
         }
 
         return DateInterval::parse($value, $this->fallbackFormat);

diff --git a/src/Internal/Transport/Request/UpsertSearchAttributes.php b/src/Internal/Transport/Request/UpsertSearchAttributes.php
@@ -16,7 +16,7 @@ final class UpsertSearchAttributes extends Request
     public function __construct(
         private readonly array $searchAttributes,
     ) {
-        parent::__construct(self::NAME, ['searchAttributes' => $searchAttributes]);
+        parent::__construct(self::NAME, ['searchAttributes' => (object) $searchAttributes]);
     }
 
     /**

diff --git a/src/Internal/Transport/Request/UpsertTypedSearchAttributes.php b/src/Internal/Transport/Request/UpsertTypedSearchAttributes.php
@@ -18,7 +18,7 @@ final class UpsertTypedSearchAttributes extends Request
     public function __construct(
         private readonly array $searchAttributes,
     ) {
-        parent::__construct(self::NAME, ['search_attributes' => $this->prepareSearchAttributes()]);
+        parent::__construct(self::NAME, ['search_attributes' => (object) $this->prepareSearchAttributes()]);
     }
 
     /**