[Form] Changed to a CreateException when the 'format' option is invalid

* Updated DateTypeTest also
symfony · Jun 3, 2011 · 436cb95 · 436cb95
1 parent 0045ffe
commit 436cb95
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -14,6 +14,8 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\Exception\CreationException;
+use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Extension\Core\ChoiceList\PaddedChoiceList;
 use Symfony\Component\Form\Extension\Core\ChoiceList\MonthChoiceList;
 use Symfony\Component\Form\FormView;
@@ -29,26 +31,26 @@ public function buildForm(FormBuilder $builder, array $options)
     {
         $format = $options['format'];
         $pattern = null;
-        
+
         $allowedFormatOptionValues = array(
             \IntlDateFormatter::FULL,
             \IntlDateFormatter::LONG,
             \IntlDateFormatter::MEDIUM,
             \IntlDateFormatter::SHORT,
         );
-        
+
         // If $format is not in the allowed options, it's considered as the pattern of the formatter if it is a string
         if (!in_array($format, $allowedFormatOptionValues, true)) {
             if (is_string($format)) {
                 $defaultOptions = $this->getDefaultOptions($options);
-                
+
                 $format = $defaultOptions['format'];
                 $pattern = $options['format'];
             } else {
-                throw new FormException('The "format" option must be one of the IntlDateFormatter constants (FULL, LONG, MEDIUM, SHORT) or a string representing a custom pattern');
+                throw new CreationException('The "format" option must be one of the IntlDateFormatter constants (FULL, LONG, MEDIUM, SHORT) or a string representing a custom pattern');
             }
         }
-        
+
         $formatter = new \IntlDateFormatter(
             \Locale::getDefault(),
             $format,

diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTypeTest.php
@@ -269,7 +269,7 @@ public function testFormatOptionCustomPatternCollapsingIntlDateFormatterConstant
     }
 
     /**
-     * @expectedException Symfony\Component\Form\Exception\FormException
+     * @expectedException Symfony\Component\Form\Exception\CreationException
      */
     public function testValidateFormatOptionGivenWrongConstants()
     {
@@ -279,7 +279,7 @@ public function testValidateFormatOptionGivenWrongConstants()
     }
 
     /**
-     * @expectedException Symfony\Component\Form\Exception\FormException
+     * @expectedException Symfony\Component\Form\Exception\CreationException
      */
     public function testValidateFormatOptionGivenArrayValue()
     {