bug #28464 [Form] forward the invalid_message option in date types (xabbuh)

nicolas-grekas · nicolas-grekas · commit b349b644881a · 2018-09-20T13:52:05.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Form] forward the invalid_message option in date types | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #5880 | License | MIT | Doc PR | Commits ------- 5318e2e forward the invalid_message option in date types
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -77,6 +77,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'error_bubbling' => true,
             );
 
+            if (isset($options['invalid_message'])) {
+                $dayOptions['invalid_message'] = $options['invalid_message'];
+                $monthOptions['invalid_message'] = $options['invalid_message'];
+                $yearOptions['invalid_message'] = $options['invalid_message'];
+            }
+
+            if (isset($options['invalid_message_parameters'])) {
+                $dayOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
+                $monthOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
+                $yearOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
+            }
+
             $formatter = new \IntlDateFormatter(
                 \Locale::getDefault(),
                 $dateFormat,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -72,6 +72,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'error_bubbling' => true,
             );
 
+            if (isset($options['invalid_message'])) {
+                $hourOptions['invalid_message'] = $options['invalid_message'];
+                $minuteOptions['invalid_message'] = $options['invalid_message'];
+                $secondOptions['invalid_message'] = $options['invalid_message'];
+            }
+
+            if (isset($options['invalid_message_parameters'])) {
+                $hourOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
+                $minuteOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
+                $secondOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
+            }
+
             if ('choice' === $options['widget']) {
                 $hours = $minutes = array();
 
