Skip to content

Commit a254665

Browse files
Merge branch '2.7' into 2.8
* 2.7: Create PULL_REQUEST_TEMPLATE.md Remove duplicate validation in RedirectResponse [Yaml] fix default timezone to be UTC [DependencyInjection] fix dumped YAML string [Config] Add suggest to composer.json for symfony/yaml Conflicts: src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
2 parents 20668c7 + 323c53c commit a254665

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Inline.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,12 @@ private static function evaluateScalar($scalar, $references = array())
522522
case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
523523
return (float) str_replace(',', '', $scalar);
524524
case preg_match(self::getTimestampRegex(), $scalar):
525-
return strtotime($scalar);
525+
$timeZone = date_default_timezone_get();
526+
date_default_timezone_set('UTC');
527+
$time = strtotime($scalar);
528+
date_default_timezone_set($timeZone);
529+
530+
return $time;
526531
}
527532
default:
528533
return (string) $scalar;

Tests/Fixtures/YtsSpecificationExamples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ yaml: |
754754
Billsmer @ 338-4338.
755755
php: |
756756
array(
757-
'invoice' => 34843, 'date' => mktime(0, 0, 0, 1, 23, 2001),
757+
'invoice' => 34843, 'date' => gmmktime(0, 0, 0, 1, 23, 2001),
758758
'bill-to' =>
759759
array( 'given' => 'Chris', 'family' => 'Dumars', 'address' => array( 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ) )
760760
, 'ship-to' =>
@@ -879,7 +879,7 @@ yaml: |
879879
php: |
880880
array(
881881
'invoice' => 34843,
882-
'date' => mktime(0, 0, 0, 1, 23, 2001),
882+
'date' => gmmktime(0, 0, 0, 1, 23, 2001),
883883
'total' => 4443.52
884884
)
885885
---

Tests/InlineTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public function getTestsForParse()
253253
array("'on'", 'on'),
254254
array("'off'", 'off'),
255255

256-
array('2007-10-30', mktime(0, 0, 0, 10, 30, 2007)),
256+
array('2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)),
257257
array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)),
258258
array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)),
259259
array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),

0 commit comments

Comments
 (0)