[Yaml] Fix parsing sub-second dates on x86

nicolas-grekas · nicolas-grekas · commit b06b81809709 · 2023-02-14T14:19:26.000+01:00
diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 6.3
 ---
 
- * Add support to dump int keys as strings by using the `Yaml::DUMP_NUMERIC_KEY_AS_STRING` flag.
+ * Add support to dump int keys as strings by using the `Yaml::DUMP_NUMERIC_KEY_AS_STRING` flag
 
 6.2
 ---
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -110,16 +110,11 @@ public static function dump(mixed $value, int $flags = 0): string
 
                 return self::dumpNull($flags);
             case $value instanceof \DateTimeInterface:
-                $length = \strlen(rtrim($value->format('u'), '0'));
-                if (0 === $length) {
-                    $format = 'c';
-                } elseif ($length < 4) {
-                    $format = 'Y-m-d\TH:i:s.vP';
-                } else {
-                    $format = 'Y-m-d\TH:i:s.uP';
-                }
-
-                return $value->format($format);
+                return $value->format(match (true) {
+                    !$length = \strlen(rtrim($value->format('u'), '0')) => 'c',
+                    $length < 4 => 'Y-m-d\TH:i:s.vP',
+                    default => 'Y-m-d\TH:i:s.uP',
+                });
             case $value instanceof \UnitEnum:
                 return sprintf('!php/const %s::%s', $value::class, $value->name);
             case \is_object($value):
@@ -721,20 +716,19 @@ private static function evaluateScalar(string $scalar, int $flags, array &$refer
                             return $time;
                         }
 
-                        $length = \strlen(rtrim($time->format('u'), '0'));
-                        if (0 === $length) {
-                            try {
-                                if (false !== $scalar = $time->getTimestamp()) {
-                                    return $scalar;
-                                }
-                            } catch (\ValueError) {
-                                // no-op
-                            }
+                        if ('' !== rtrim($time->format('u'), '0')) {
+                            return (float) $time->format('U.u');
+                        }
 
-                            return (int) $time->format('U');
+                        try {
+                            if (false !== $scalar = $time->getTimestamp()) {
+                                return $scalar;
+                            }
+                        } catch (\ValueError) {
+                            // no-op
                         }
 
-                        return (float) $time->format('U.u');
+                        return $time->format('U');
                 }
         }
 
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -565,7 +565,7 @@ public static function getTestsForDump()
      */
     public function testParseTimestampAsUnixTimestampByDefault(string $yaml, int $year, int $month, int $day, int $hour, int $minute, int $second, int $microsecond)
     {
-        $expectedDate = (new \DateTimeImmutable($yaml))->format('U');
+        $expectedDate = (new \DateTimeImmutable($yaml, new \DateTimeZone('UTC')))->format('U');
         $this->assertSame($microsecond ? (float) "$expectedDate.$microsecond" : (int) $expectedDate, Inline::parse($yaml));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ public static function getTestsForDump()`
`565`	`565`	`*/`
`566`	`566`	`public function testParseTimestampAsUnixTimestampByDefault(string $yaml, int $year, int $month, int $day, int $hour, int $minute, int $second, int $microsecond)`
`567`	`567`	`{`
`568`		`- $expectedDate = (new \DateTimeImmutable($yaml))->format('U');`
	`568`	`+ $expectedDate = (new \DateTimeImmutable($yaml, new \DateTimeZone('UTC')))->format('U');`
`569`	`569`	`$this->assertSame($microsecond ? (float) "$expectedDate.$microsecond" : (int) $expectedDate, Inline::parse($yaml));`
`570`	`570`	`}`
`571`	`571`