[Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP …

…bug #66323
symfony · Jun 1, 2017 · f42c73f · f42c73f
1 parent aa04f35
commit f42c73f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...ny/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/...ny/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -163,6 +163,10 @@ protected function getIntlDateFormatter($ignoreTimezone = false)
         $dateFormat = $this->dateFormat;
         $timeFormat = $this->timeFormat;
         $timezone = $ignoreTimezone ? 'UTC' : $this->outputTimezone;
+        if (class_exists('IntlTimeZone', false)) {
+            // see https://bugs.php.net/bug.php?id=66323
+            $timezone = \IntlTimeZone::createTimeZone($timezone);
+        }
         $calendar = $this->calendar;
         $pattern = $this->pattern;
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -77,7 +77,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 \Locale::getDefault(),
                 $dateFormat,
                 $timeFormat,
-                null,
+                // see https://bugs.php.net/bug.php?id=66323
+                class_exists('IntlTimeZone', false) ? \IntlTimeZone::createDefault() : null,
                 $calendar,
                 $pattern
             );