DateInterval converts null value into empty interval

Author: roxblnfk

src/Internal/Marshaller/Type/DurationJsonType.php

@@ -81,7 +81,7 @@ public function parse($value, $current): CarbonInterval
         }
 
         if ($value === null) {
-            return CarbonInterval::create();
+            return CarbonInterval::create(0);
         }
 
         return DateInterval::parse($value, $this->fallbackFormat);

src/Internal/Support/DateInterval.php

@@ -16,7 +16,7 @@
 
 /**
  * @psalm-type DateIntervalFormat = DateInterval::FORMAT_*
- * @psalm-type DateIntervalValue = string | int | float | \DateInterval | Duration
+ * @psalm-type DateIntervalValue = string | int | float | \DateInterval | Duration | null
  */
 final class DateInterval
 {
@@ -115,6 +115,10 @@ public static function parse($interval, string $format = self::FORMAT_MILLISECON
                     $interval->getSeconds() * 1e6 + $interval->getNanos() / 1e3,
                     self::FORMAT_MICROSECONDS,
                 );
+
+            case $interval === null:
+                return CarbonInterval::create(0);
+
             default:
                 throw new \InvalidArgumentException(self::ERROR_INVALID_DATETIME);
         }

tests/Acceptance/Harness/ContinueAsNew/ContinueAsSameTest.php

@@ -27,7 +27,7 @@ public static function check(
             args: [INPUT_DATA],
             memo: [MEMO_KEY => MEMO_VALUE],
         )]
-        WorkflowStubInterface $stub
+        WorkflowStubInterface $stub,
     ): void {
         self::assertSame(INPUT_DATA, $stub->getResult());
         # Workflow ID does not change after continue as new

tests/Unit/Internal/Support/DateIntervalTestCase.php

@@ -12,12 +12,31 @@
 #[CoversClass(DateInterval::class)]
 final class DateIntervalTestCase extends TestCase
 {
+    public static function provideValuesToParse(): iterable
+    {
+        yield [1, DateInterval::FORMAT_MICROSECONDS, 1, '0/0/0/0'];
+        yield [1, DateInterval::FORMAT_MILLISECONDS, 1_000, '0/0/0/0'];
+        yield [0.25, DateInterval::FORMAT_SECONDS, 250_000, '0/0/0/0'];
+        yield [1, DateInterval::FORMAT_SECONDS, 1_000_000, '0/0/0/1'];
+        yield [1.25, DateInterval::FORMAT_SECONDS, 1_250_000, '0/0/0/1'];
+        yield [1.8, DateInterval::FORMAT_SECONDS, 1_800_000, '0/0/0/1'];
+        yield [1, DateInterval::FORMAT_MINUTES, 60_000_000, '0/0/1/0'];
+        yield [1.5, DateInterval::FORMAT_MINUTES, 90_000_000, '0/0/1/30'];
+        yield [1, DateInterval::FORMAT_HOURS, 3_600_000_000, '0/1/0/0'];
+        yield [1, DateInterval::FORMAT_DAYS, 86_400_000_000, '1/0/0/0'];
+        yield [1, DateInterval::FORMAT_WEEKS, 604_800_000_000, '7/0/0/0'];
+        yield [(0.1 + 0.7) * 10.0, DateInterval::FORMAT_SECONDS, 8_000_000, '0/0/0/8'];
+        yield [(0.1 + 0.7) * 10.0, DateInterval::FORMAT_DAYS, 691200000000, '8/0/0/0'];
+        yield [(0.1 + 0.7) * 10.0, DateInterval::FORMAT_WEEKS, 4838400000000, '56/0/0/0'];
+        yield [null, DateInterval::FORMAT_MILLISECONDS, 0, '0/0/0/0'];
+    }
+
     #[DataProvider('provideValuesToParse')]
     public function testParse(mixed $value, string $format, int $microseconds, string $formatted): void
     {
         $i = DateInterval::parse($value, $format);
 
-        self::assertSame($microseconds, (int)$i->totalMicroseconds);
+        self::assertSame($microseconds, (int) $i->totalMicroseconds);
         self::assertSame($formatted, $i->format('%d/%h/%i/%s'));
         if ($i->totalMicroseconds > 1_000_000) {
             self::assertGreaterThan(0, $i->totalSeconds);
@@ -28,7 +47,7 @@ public function testParseAndFormat(): void
     {
         $i = DateInterval::parse(6_200, DateInterval::FORMAT_MILLISECONDS);
 
-        $this->assertSame(6_200_000, (int)$i->totalMicroseconds);
+        $this->assertSame(6_200_000, (int) $i->totalMicroseconds);
         self::assertSame('0/0/0/6', $i->format('%y/%h/%i/%s'));
     }
 
@@ -40,25 +59,7 @@ public function testParseFromDuration(): void
 
         $i = DateInterval::parse($duration);
 
-        self::assertSame(5124, (int)$i->totalSeconds);
+        self::assertSame(5124, (int) $i->totalSeconds);
         self::assertSame(123_456, $i->microseconds);
     }
-
-    public static function provideValuesToParse(): iterable
-    {
-        yield [1, DateInterval::FORMAT_MICROSECONDS, 1, '0/0/0/0'];
-        yield [1, DateInterval::FORMAT_MILLISECONDS, 1_000, '0/0/0/0'];
-        yield [0.25, DateInterval::FORMAT_SECONDS, 250_000, '0/0/0/0'];
-        yield [1, DateInterval::FORMAT_SECONDS, 1_000_000, '0/0/0/1'];
-        yield [1.25, DateInterval::FORMAT_SECONDS, 1_250_000, '0/0/0/1'];
-        yield [1.8, DateInterval::FORMAT_SECONDS, 1_800_000, '0/0/0/1'];
-        yield [1, DateInterval::FORMAT_MINUTES, 60_000_000, '0/0/1/0'];
-        yield [1.5, DateInterval::FORMAT_MINUTES, 90_000_000, '0/0/1/30'];
-        yield [1, DateInterval::FORMAT_HOURS, 3_600_000_000, '0/1/0/0'];
-        yield [1, DateInterval::FORMAT_DAYS, 86_400_000_000, '1/0/0/0'];
-        yield [1, DateInterval::FORMAT_WEEKS, 604_800_000_000, '7/0/0/0'];
-        yield [(0.1 + 0.7) * 10.0, DateInterval::FORMAT_SECONDS, 8_000_000, '0/0/0/8'];
-        yield [(0.1 + 0.7) * 10.0, DateInterval::FORMAT_DAYS, 691200000000, '8/0/0/0'];
-        yield [(0.1 + 0.7) * 10.0, DateInterval::FORMAT_WEEKS, 4838400000000, '56/0/0/0'];
-    }
 }