Merge pull request #2651 from Nakatox/date-interval-spec-microseconds

fix: add microseconds on getDateIntervalSpec()
briannesbitt · Aug 6, 2022 · bdf4f4f · bdf4f4f
2 parents fab32b8 + e589c2d
commit bdf4f4f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Carbon/CarbonInterval.php b/src/Carbon/CarbonInterval.php
@@ -2150,18 +2150,23 @@ public function divide($divider)
      *
      * @return string
      */
-    public static function getDateIntervalSpec(DateInterval $interval)
+    public static function getDateIntervalSpec(DateInterval $interval, bool $microseconds = false)
     {
         $date = array_filter([
             static::PERIOD_YEARS => abs($interval->y),
             static::PERIOD_MONTHS => abs($interval->m),
             static::PERIOD_DAYS => abs($interval->d),
         ]);
 
+        $seconds = abs($interval->s);
+        if ($microseconds && $interval->f > 0) {
+            $seconds = sprintf('%d.%06d', $seconds, abs($interval->f) * 1000000);
+        }
+
         $time = array_filter([
             static::PERIOD_HOURS => abs($interval->h),
             static::PERIOD_MINUTES => abs($interval->i),
-            static::PERIOD_SECONDS => abs($interval->s),
+            static::PERIOD_SECONDS => $seconds,
         ]);
 
         $specString = static::PERIOD_PREFIX;
@@ -2185,9 +2190,9 @@ public static function getDateIntervalSpec(DateInterval $interval)
      *
      * @return string
      */
-    public function spec()
+    public function spec(bool $microseconds = false)
     {
-        return static::getDateIntervalSpec($this);
+        return static::getDateIntervalSpec($this, $microseconds);
     }
 
     /**

diff --git a/tests/CarbonInterval/SpecTest.php b/tests/CarbonInterval/SpecTest.php
@@ -73,6 +73,12 @@ public function testSecondInterval()
         $this->assertSame('PT1S', $ci->spec());
     }
 
+    public function testMicrosecondsInterval()
+    {
+        $ci = new CarbonInterval(0, 0, 0, 0, 0, 0, 0, 12300);
+        $this->assertSame('PT0.012300S', $ci->spec(true));
+    }
+
     public function testMixedTimeInterval()
     {
         $ci = new CarbonInterval(0, 0, 0, 0, 1, 2, 3);