Skip to content

Commit 0889c33

Browse files
dropfenfabpot
authored andcommitted
Use setTimeZone if this method exists.
The php version is not a critical factor to choose the method, but we have to use setTimeZone, if it exists.
1 parent d525cf5 commit 0889c33

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Extension/Core/Type/DateType.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,10 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $
267267
{
268268
$pattern = $formatter->getPattern();
269269
$timezone = $formatter->getTimezoneId();
270+
// Use it, if exists.
271+
$setTimeZone = method_exists($formatter, 'setTimeZone');
270272

271-
if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) {
273+
if ($setTimeZone) {
272274
$formatter->setTimeZone('UTC');
273275
} else {
274276
$formatter->setTimeZoneId('UTC');
@@ -286,7 +288,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $
286288
$formatter->setPattern($pattern);
287289
}
288290

289-
if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) {
291+
if ($setTimeZone) {
290292
$formatter->setTimeZone($timezone);
291293
} else {
292294
$formatter->setTimeZoneId($timezone);

0 commit comments

Comments
 (0)