[Form] Fixed empty data for compound date interval

HeahDude · HeahDude · commit 0a0eb62aa734 · 2018-11-18T12:59:44.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
@@ -104,6 +104,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         // Append generic carry-along options
                         'required' => $options['required'],
                         'translation_domain' => $options['translation_domain'],
+                        // when compound the array entries are ignored, we need to cascade the configuration here
+                        'empty_data' => isset($options['empty_data'][$part]) ? $options['empty_data'][$part] : null,
                     );
                     if ('choice' === $options['widget']) {
                         $childOptions['choice_translation_domain'] = false;
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
@@ -446,10 +446,9 @@ public function provideEmptyData()
 
         return array(
             'Simple field' => array('single_text', 'P6Y4M0D', $expectedData),
-            // Compound tests are broken for now
-            //'Compound text field' => array('text', array('years' => '06', 'months' => '04', 'days' => '00'), $expectedData),
-            //'Compound integer field' => array('integer', array('years' => '6', 'months' => '4', 'days' => '0'), $expectedData),
-            //'Compound choice field' => array('choice', array('years' => '6', 'months' => '4', 'days' => '0'), $expectedData),
+            'Compound text field' => array('text', array('years' => '06', 'months' => '04', 'days' => '00'), $expectedData),
+            'Compound integer field' => array('integer', array('years' => '6', 'months' => '4', 'days' => '0'), $expectedData),
+            'Compound choice field' => array('choice', array('years' => '6', 'months' => '4', 'days' => '0'), $expectedData),
         );
     }
 }
