minor #18098 [Yaml] Fix tests (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 15bb452dbe9d · 2016-03-10T15:14:05.000+01:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [Yaml] Fix tests | Q | A | ------------- | --- | Branch | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | #18093 | License | MIT | Doc PR | - `now` contains a TZ info (the current default TZ), so that the following ignores the injected TZ: `new \DateTime('now', new \DateTimeZone('UTC'))` An other fix is that since PHP 5.5.14, timestamps contains sub-seconds numbers that where previously ignore. This fixes both issues. Commits ------- 25677fe [Yaml] Fix tests
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -588,7 +588,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                         return (float) str_replace(',', '', $scalar);
                     case preg_match(self::getTimestampRegex(), $scalar):
                         if (Yaml::PARSE_DATETIME & $flags) {
-                            return new \DateTime($scalar,new \DateTimeZone('UTC'));
+                            return new \DateTime($scalar, new \DateTimeZone('UTC'));
                         }
 
                         $timeZone = date_default_timezone_get();
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -495,7 +495,8 @@ public function testParseTimestampAsUnixTimestampByDefault($yaml, $year, $month,
      */
     public function testParseTimestampAsDateTimeObject($yaml, $year, $month, $day, $hour, $minute, $second)
     {
-        $expected = new \DateTime('now', new \DateTimeZone('UTC'));
+        $expected = new \DateTime($yaml);
+        $expected->setTimeZone(new \DateTimeZone('UTC'));
         $expected->setDate($year, $month, $day);
         $expected->setTime($hour, $minute, $second);
 

Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())`
`588`	`588`	`return (float) str_replace(',', '', $scalar);`
`589`	`589`	`case preg_match(self::getTimestampRegex(), $scalar):`
`590`	`590`	`if (Yaml::PARSE_DATETIME & $flags) {`
`591`		`- return new \DateTime($scalar,new \DateTimeZone('UTC'));`
	`591`	`+ return new \DateTime($scalar, new \DateTimeZone('UTC'));`
`592`	`592`	`}`
`593`	`593`
`594`	`594`	`$timeZone = date_default_timezone_get();`
Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,8 @@ public function testParseTimestampAsUnixTimestampByDefault($yaml, $year, $month,`
`495`	`495`	`*/`
`496`	`496`	`public function testParseTimestampAsDateTimeObject($yaml, $year, $month, $day, $hour, $minute, $second)`
`497`	`497`	`{`
`498`		`- $expected = new \DateTime('now', new \DateTimeZone('UTC'));`
	`498`	`+ $expected = new \DateTime($yaml);`
	`499`	`+ $expected->setTimeZone(new \DateTimeZone('UTC'));`
`499`	`500`	`$expected->setDate($year, $month, $day);`
`500`	`501`	`$expected->setTime($hour, $minute, $second);`
`501`	`502`