Merge branch '3.1'

nicolas-grekas · nicolas-grekas · commit fdb7834f6955 · 2016-10-24T20:44:12.000+02:00
* 3.1:
  [Yaml] Fix 7.1 compat
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -645,7 +645,10 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                         return (float) str_replace(array(',', '_'), '', $scalar);
                     case preg_match(self::getTimestampRegex(), $scalar):
                         if (Yaml::PARSE_DATETIME & $flags) {
-                            return new \DateTime($scalar, new \DateTimeZone('UTC'));
+                            $date = new \DateTime($scalar);
+                            $date->setTimeZone(new \DateTimeZone('UTC'));
+
+                            return $date;
                         }
 
                         $timeZone = date_default_timezone_get();
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -566,17 +566,17 @@ public function testParseTimestampAsDateTimeObject($yaml, $year, $month, $day, $
         $expected = new \DateTime($yaml);
         $expected->setTimeZone(new \DateTimeZone('UTC'));
         $expected->setDate($year, $month, $day);
-        $expected->setTime($hour, $minute, $second);
+        @$expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
 
         $this->assertEquals($expected, Inline::parse($yaml, Yaml::PARSE_DATETIME));
     }
 
     public function getTimestampTests()
     {
         return array(
-            'canonical' => array('2001-12-15T02:59:43.1Z', 2001, 12, 15, 2, 59, 43),
-            'ISO-8601' => array('2001-12-15t21:59:43.10-05:00', 2001, 12, 16, 2, 59, 43),
-            'spaced' => array('2001-12-15 21:59:43.10 -5', 2001, 12, 16, 2, 59, 43),
+            'canonical' => array('2001-12-15T02:59:43.1Z', 2001, 12, 15, 2, 59, 43.1),
+            'ISO-8601' => array('2001-12-15t21:59:43.10-05:00', 2001, 12, 16, 2, 59, 43.1),
+            'spaced' => array('2001-12-15 21:59:43.10 -5', 2001, 12, 16, 2, 59, 43.1),
             'date' => array('2001-12-15', 2001, 12, 15, 0, 0, 0),
         );
     }
@@ -589,7 +589,7 @@ public function testParseNestedTimestampListAsDateTimeObject($yaml, $year, $mont
         $expected = new \DateTime($yaml);
         $expected->setTimeZone(new \DateTimeZone('UTC'));
         $expected->setDate($year, $month, $day);
-        $expected->setTime($hour, $minute, $second);
+        @$expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
 
         $expectedNested = array('nested' => array($expected));
         $yamlNested = "{nested: [$yaml]}";
