From 0d6af5cd9004e2926b0fc2f7059f2cfbd589c015 Mon Sep 17 00:00:00 2001 From: dropfen Date: Thu, 12 Sep 2013 23:36:40 +0200 Subject: [PATCH] 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. --- src/Symfony/Component/Form/Extension/Core/Type/DateType.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php index 05b2aaedc13e..158f9a91f3f0 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php @@ -267,8 +267,10 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $ { $pattern = $formatter->getPattern(); $timezone = $formatter->getTimezoneId(); + // Use it, if exists. + $setTimeZone = method_exists($formatter, 'setTimeZone'); - if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) { + if ($setTimeZone) { $formatter->setTimeZone('UTC'); } else { $formatter->setTimeZoneId('UTC'); @@ -286,7 +288,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $ $formatter->setPattern($pattern); } - if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) { + if ($setTimeZone) { $formatter->setTimeZone($timezone); } else { $formatter->setTimeZoneId($timezone);