Skip to content

Commit 16485f6

Browse files
Merge branch '2.3' into 2.7
* 2.3: Windows and Intl fixes Add appveyor.yml for C.I. on Windows [travis] merge php: nightly and deps=high test-matrix lines [Security] Add missing docblock in PreAuthenticatedToken Conflicts: .travis.yml src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/HttpFoundation/JsonResponse.php src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
2 parents 95122cf + 88aaa13 commit 16485f6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Extension/Core/Type/DateType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $
262262
$pattern = $formatter->getPattern();
263263
$timezone = $formatter->getTimezoneId();
264264

265-
if ($setTimeZone = method_exists($formatter, 'setTimeZone')) {
265+
if ($setTimeZone = PHP_VERSION_ID >= 50500 || method_exists($formatter, 'setTimeZone')) {
266266
$formatter->setTimeZone('UTC');
267267
} else {
268268
$formatter->setTimeZoneId('UTC');

0 commit comments

Comments
 (0)