Merge branch '4.4' into 5.2

* 4.4:
  [Form] fix support for years outside of the 32b range on x86 arch

Author: nicolas-grekas

Inline.php

@@ -692,17 +692,22 @@ private static function evaluateScalar(string $scalar, int $flags, array &$refer
                     case Parser::preg_match('/^(-|\+)?[0-9][0-9_]*(\.[0-9_]+)?$/', $scalar):
                         return (float) str_replace('_', '', $scalar);
                     case Parser::preg_match(self::getTimestampRegex(), $scalar):
+                        // When no timezone is provided in the parsed date, YAML spec says we must assume UTC.
+                        $time = new \DateTime($scalar, new \DateTimeZone('UTC'));
+
                         if (Yaml::PARSE_DATETIME & $flags) {
-                            // When no timezone is provided in the parsed date, YAML spec says we must assume UTC.
-                            return new \DateTime($scalar, new \DateTimeZone('UTC'));
+                            return $time;
                         }
 
-                        $timeZone = date_default_timezone_get();
-                        date_default_timezone_set('UTC');
-                        $time = strtotime($scalar);
-                        date_default_timezone_set($timeZone);
+                        try {
+                            if (false !== $scalar = $time->getTimestamp()) {
+                                return $scalar;
+                            }
+                        } catch (\ValueError $e) {
+                            // no-op
+                        }
 
-                        return $time;
+                        return $time->format('U');
                 }
         }
 

Tests/InlineTest.php

@@ -326,7 +326,7 @@ public function getTestsForParse()
             ['2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)],
             ['2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)],
             ['1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)],
-            ['1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)],
+            ['1730-10-30T02:59:43Z', \PHP_INT_SIZE === 4 ? '-7547547617' : gmmktime(2, 59, 43, 10, 30, 1730)],
 
             ['"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''],
             ["'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''],
@@ -397,7 +397,7 @@ public function getTestsForParseWithMapObjects()
             ['2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)],
             ['2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)],
             ['1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)],
-            ['1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)],
+            ['1730-10-30T02:59:43Z', \PHP_INT_SIZE === 4 ? '-7547547617' : gmmktime(2, 59, 43, 10, 30, 1730)],
 
             ['"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''],
             ["'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''],