Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1083ffe

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: Fix merge
2 parents af2d419 + b58b3a8 commit 1083ffe
Copy full SHA for 1083ffe

File tree

Expand file treeCollapse file tree

1 file changed

+1
-1
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+1
-1
lines changed

‎src/Symfony/Component/Yaml/Tests/InlineTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Tests/InlineTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public function getTestsForParseWithMapObjects()
320320
array("'#cfcfcf'", '#cfcfcf'),
321321
array('::form_base.html.twig', '::form_base.html.twig'),
322322

323-
array('2007-10-30', mktime(0, 0, 0, 10, 30, 2007)),
323+
array('2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)),
324324
array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)),
325325
array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)),
326326
array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.