diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Yaml] Fix tests

Browse Source
This commit is contained in:
Nicolas Grekas 2016-03-10 15:06:18 +01:00
parent fe012e8abb
commit 25677febe1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Yaml/Inline.php
View File

@ -588,7 +588,7 @@ class Inline
return (float) str_replace(',', '', $scalar); return (float) str_replace(',', '', $scalar);
case preg_match(self::getTimestampRegex(), $scalar): case preg_match(self::getTimestampRegex(), $scalar):
if (Yaml::PARSE_DATETIME & $flags) { if (Yaml::PARSE_DATETIME & $flags) {
return new \DateTime($scalar,new \DateTimeZone('UTC')); return new \DateTime($scalar, new \DateTimeZone('UTC'));
} }
$timeZone = date_default_timezone_get(); $timeZone = date_default_timezone_get();

3
src/Symfony/Component/Yaml/Tests/InlineTest.php
View File

@ -495,7 +495,8 @@ class InlineTest extends \PHPUnit_Framework_TestCase
*/ */
public function testParseTimestampAsDateTimeObject($yaml, $year, $month, $day, $hour, $minute, $second) 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->setDate($year, $month, $day);
$expected->setTime($hour, $minute, $second); $expected->setTime($hour, $minute, $second);