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

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

Browse Source 
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
This commit is contained in:
Nicolas Grekas 2016-03-10 15:14:05 +01:00
commit 15bb452dbe
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);
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();

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)
{
$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);