From b58b3a83e529f8e9fb0dc15ebe092ded11dcd3cf Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 23 Feb 2016 08:38:51 +0100 Subject: [PATCH] Fix merge --- src/Symfony/Component/Yaml/Tests/InlineTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php index 66da12c1dd..d368ab5f59 100644 --- a/src/Symfony/Component/Yaml/Tests/InlineTest.php +++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php @@ -273,7 +273,7 @@ class InlineTest extends \PHPUnit_Framework_TestCase array("'#cfcfcf'", '#cfcfcf'), array('::form_base.html.twig', '::form_base.html.twig'), - array('2007-10-30', mktime(0, 0, 0, 10, 30, 2007)), + array('2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)), array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)), array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)), array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),