[Form] Limit allowed types for 'empty_value' TimeType option

kix · kix · commit 25ff59be093e · 2015-06-17T23:16:46.000+05:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -21,7 +21,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class TimeType extends AbstractType
 {
@@ -157,7 +157,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $compound = function (Options $options) {
             return $options['widget'] !== 'single_text';
@@ -214,24 +214,31 @@ public function configureOptions(OptionsResolver $resolver)
             'compound' => $compound,
         ));
 
-        $resolver->setNormalizer('empty_value', $placeholderNormalizer);
-        $resolver->setNormalizer('placeholder', $placeholderNormalizer);
-
-        $resolver->setAllowedValues('input', array(
-            'datetime',
-            'string',
-            'timestamp',
-            'array',
+        $resolver->setNormalizers(array(
+            'empty_value' => $placeholderNormalizer,
+            'placeholder' => $placeholderNormalizer,
         ));
-        $resolver->setAllowedValues('widget', array(
-            'single_text',
-            'text',
-            'choice',
+
+        $resolver->setAllowedValues(array(
+            'input' => array(
+                'datetime',
+                'string',
+                'timestamp',
+                'array',
+            ),
+            'widget' => array(
+                'single_text',
+                'text',
+                'choice',
+            ),
         ));
 
-        $resolver->setAllowedTypes('hours', 'array');
-        $resolver->setAllowedTypes('minutes', 'array');
-        $resolver->setAllowedTypes('seconds', 'array');
+        $resolver->setAllowedTypes(array(
+            'hours' => 'array',
+            'minutes' => 'array',
+            'seconds' => 'array',
+            'empty_value' => array('string', 'boolean', 'null'),
+        ));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -731,4 +731,14 @@ public function testThrowExceptionIfSecondsIsInvalid()
             'seconds' => 'bad value',
         ));
     }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testThrowExceptionIfEmptyValueIsInvalid()
+    {
+        $this->factory->create('time', null, array(
+            'empty_value' => array(),
+        ));
+    }
 }
