[DX] derive default timezone from reference_date option when possible

yceruto · yceruto · commit 685e11dcc16b · 2019-07-26T09:39:46.000-04:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -267,6 +267,18 @@ public function configureOptions(OptionsResolver $resolver)
             ];
         };
 
+        $modelTimezone = static function (Options $options, $value): ?string {
+            if (null !== $value) {
+                return $value;
+            }
+
+            if (null !== $options['reference_date']) {
+                return $options['reference_date']->getTimezone()->getName();
+            }
+
+            return null;
+        };
+
         $resolver->setDefaults([
             'hours' => range(0, 23),
             'minutes' => range(0, 59),
@@ -276,7 +288,7 @@ public function configureOptions(OptionsResolver $resolver)
             'input_format' => 'H:i:s',
             'with_minutes' => true,
             'with_seconds' => false,
-            'model_timezone' => null,
+            'model_timezone' => $modelTimezone,
             'view_timezone' => null,
             'reference_date' => null,
             'placeholder' => $placeholderDefault,
@@ -325,6 +337,8 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('minutes', 'array');
         $resolver->setAllowedTypes('seconds', 'array');
         $resolver->setAllowedTypes('input_format', 'string');
+        $resolver->setAllowedTypes('model_timezone', ['null', 'string']);
+        $resolver->setAllowedTypes('view_timezone', ['null', 'string']);
         $resolver->setAllowedTypes('reference_date', ['null', \DateTimeInterface::class]);
     }
 
