Merge pull request #412: Fix DurationJsonType::parse()

src/Internal/Marshaller/Type/DurationJsonType.php

@@ -13,6 +13,7 @@
 
 use Carbon\CarbonInterval;
 use Google\Protobuf\Duration;
+use Temporal\Internal\Marshaller\MarshallerInterface;
 use Temporal\Internal\Marshaller\MarshallingRule;
 use Temporal\Internal\Support\DateInterval;
 use Temporal\Internal\Support\Inheritance;
@@ -23,6 +24,22 @@
  */
 class DurationJsonType extends Type implements DetectableTypeInterface, RuleFactoryInterface
 {
+    /**
+     * @var DateIntervalFormat
+     */
+    private string $fallbackFormat;
+
+    /**
+     * @param MarshallerInterface $marshaller
+     * @param DateIntervalFormat $format Fall back format for parsing when the value is not an array.
+     */
+    public function __construct(MarshallerInterface $marshaller, string $format = DateInterval::FORMAT_NANOSECONDS)
+    {
+        $this->fallbackFormat = $format;
+
+        parent::__construct($marshaller);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -70,6 +87,12 @@ public function serialize($value): ?array
      */
     public function parse($value, $current): CarbonInterval
     {
-        return DateInterval::parse($value);
+        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);
+        }
+
+        return DateInterval::parse($value, $this->fallbackFormat);
     }
 }

tests/Unit/DTO/RetryOptionsTestCase.php

@@ -59,4 +59,22 @@ public function testMarshallingIntervals(): void
 
         $this->assertSame($expected, $this->marshal($dto));
     }
+
+    public function testUnmarshalLegacyIntervals(): void
+    {
+        $expected = [
+            'initial_interval' => 10_000_000_000,
+            'backoff_coefficient' => 3.0,
+            'maximum_interval' => 15_000_000_000,
+            'maximum_attempts' => 5,
+            'non_retryable_error_types' => [],
+        ];
+
+        $this->unmarshal($expected, $unmarshalled = new RetryOptions());
+
+        self::assertSame(10.0, (float)$unmarshalled->initialInterval->totalSeconds);
+        self::assertSame(15.0, (float)$unmarshalled->maximumInterval->totalSeconds);
+        self::assertSame(3.0, $unmarshalled->backoffCoefficient);
+        self::assertSame(5, $unmarshalled->maximumAttempts);
+    }
 }

tests/Unit/DTO/Type/DurationJsonType/DurationJsonTestCase.php

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of Temporal package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Temporal\Tests\Unit\DTO\Type\DurationJsonType;
+
+use Temporal\Internal\Marshaller\Type\DurationJsonType;
+use Temporal\Internal\Support\DateInterval;
+use Temporal\Tests\Unit\DTO\AbstractDTOMarshalling;
+use Temporal\Tests\Unit\DTO\Type\DurationJsonType\Stub\DurationJsonDto;
+
+class DurationJsonTestCase extends AbstractDTOMarshalling
+{
+    public function testMarshalAndUnmarshalDuration(): void
+    {
+        $dto = new DurationJsonDto();
+        $dto->duration = DateInterval::parse(1);
+
+        $result = $this->marshal($dto);
+        $unmarshal = $this->unmarshal($result, new DurationJsonDto());
+
+        self::assertInstanceOf(\DateInterval::class, $unmarshal->duration);
+    }
+
+    protected function getTypeMatchers(): array
+    {
+        return [
+            DurationJsonType::class,
+        ];
+    }
+}

tests/Unit/DTO/Type/DurationJsonType/Stub/DurationJsonDto.php

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * This file is part of Temporal package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Temporal\Tests\Unit\DTO\Type\DurationJsonType\Stub;
+
+class DurationJsonDto
+{
+    public \DateInterval $duration;
+}