symfony · cordoval · Mar 30, 2015 · Mar 30, 2015 · Mar 30, 2015
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php b/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php
@@ -23,6 +23,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'years' => range(date('Y') - 120, date('Y')),
+            'invalid_message' => 'Birthdate provided is invalid.',
         ));
 
         $resolver->setAllowedTypes(array(

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php b/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php
@@ -45,6 +45,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
         $resolver->setDefaults(array(
             'auto_initialize' => false,
+            'invalid_message' => 'Button is invalid.',
         ));
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
@@ -59,6 +59,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'value' => '1',
             'empty_data' => $emptyData,
             'compound' => false,
+            'invalid_message' => 'Checkbox checked has an invalid value.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -222,6 +222,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             // is manually set to an object.
             // See https://github.com/symfony/symfony/pull/5582
             'data_class' => null,
+            'invalid_message' => 'Choice selected is invalid.',
         ));
 
         $resolver->setNormalizers(array(

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -86,6 +86,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'prototype_name' => '__name__',
             'type' => 'text',
             'options' => array(),
+            'invalid_message' => 'Collection provided is invalid.',
         ));
 
         $resolver->setNormalizers(array(

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
@@ -24,6 +24,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'choices' => Intl::getRegionBundle()->getCountryNames(),
+            'invalid_message' => 'Country provided is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
@@ -24,6 +24,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'choices' => Intl::getCurrencyBundle()->getCurrencyNames(),
+            'invalid_message' => 'Currency provided is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -232,6 +232,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             // this option.
             'data_class' => null,
             'compound' => $compound,
+            'invalid_message' => 'DateTime provided is invalid.',
         ));
 
         // Don't add some defaults in order to preserve the defaults

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -215,6 +215,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             // this option.
             'data_class' => null,
             'compound' => $compound,
+            'invalid_message' => 'Date provided is invalid.',
         ));
 
         $resolver->setNormalizers(array(

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php b/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
@@ -12,9 +12,20 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class EmailType extends AbstractType
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults(array(
+            'invalid_message' => 'Email provided is invalid.',
+        ));
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -48,6 +48,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'compound' => false,
             'data_class' => 'Symfony\Component\HttpFoundation\File\File',
             'empty_data' => null,
+            'invalid_message' => 'File provided is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -98,6 +98,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'compound' => $form->getConfig()->getCompound(),
             'method' => $form->getConfig()->getMethod(),
             'action' => $form->getConfig()->getAction(),
+            'invalid_message' => 'Form is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php b/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
@@ -27,6 +27,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             // Pass errors to the parent
             'error_bubbling' => true,
             'compound' => false,
+            'invalid_message' => 'Hidden value provided is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
@@ -43,6 +43,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             // Integer cast rounds towards 0, so do the same when displaying fractions
             'rounding_mode' => \NumberFormatter::ROUND_DOWN,
             'compound' => false,
+            'invalid_message' => 'Integer value provided is invalid.',
         ));
 
         $resolver->setAllowedValues(array(

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
@@ -24,6 +24,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'choices' => Intl::getLanguageBundle()->getLanguageNames(),
+            'invalid_message' => 'Language provided is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
@@ -24,6 +24,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'choices' => Intl::getLocaleBundle()->getLocaleNames(),
+            'invalid_message' => 'Locale provided is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
@@ -56,6 +56,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'divisor' => 1,
             'currency' => 'EUR',
             'compound' => false,
+            'invalid_message' => 'Money value provided is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
@@ -41,6 +41,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'grouping' => false,
             'rounding_mode' => \NumberFormatter::ROUND_HALFUP,
             'compound' => false,
+            'invalid_message' => 'Number value provided is invalid.',
         ));
 
         $resolver->setAllowedValues(array(

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php b/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
@@ -36,6 +36,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setDefaults(array(
             'always_empty' => true,
             'trim' => false,
+            'invalid_message' => 'Password provided is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
@@ -35,6 +35,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'precision' => 0,
             'type' => 'fractional',
             'compound' => false,
+            'invalid_message' => 'Percent value provided is invalid.',
         ));
 
         $resolver->setAllowedValues(array(

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php b/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php
@@ -12,9 +12,20 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class RadioType extends AbstractType
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults(array(
+            'invalid_message' => 'Selected value is invalid.',
+        ));
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php b/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
@@ -54,6 +54,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'first_name' => 'first',
             'second_name' => 'second',
             'error_bubbling' => false,
+            'invalid_message' => 'Repeated value is invalid.',
         ));
 
         $resolver->setAllowedTypes(array(

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ResetType.php b/src/Symfony/Component/Form/Extension/Core/Type/ResetType.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\ButtonTypeInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * A reset button.
@@ -21,6 +22,16 @@
  */
 class ResetType extends AbstractType implements ButtonTypeInterface
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults(array(
+            'invalid_message' => 'Reset button is invalid.',
+        ));
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php b/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
@@ -12,9 +12,20 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class SearchType extends AbstractType
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults(array(
+            'invalid_message' => 'Search button is invalid.',
+        ));
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php b/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\SubmitButtonTypeInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * A submit button.
@@ -28,6 +29,16 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars['clicked'] = $form->isClicked();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults(array(
+            'invalid_message' => 'Submit button is invalid.',
+        ));
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
@@ -23,6 +23,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'compound' => false,
+            'invalid_message' => 'Text provided is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -202,6 +202,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             // this option.
             'data_class' => null,
             'compound' => $compound,
+            'invalid_message' => 'Time provided is invalid.',
         ));
 
         $resolver->setNormalizers(array(

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -30,6 +30,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'choices' => self::getTimezones(),
+            'invalid_message' => 'Timezone provided is invalid.',
         ));
     }
 

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
@@ -35,6 +35,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'default_protocol' => 'http',
+            'invalid_message' => 'Url provided is invalid.',
         ));
 
         $resolver->setAllowedTypes(array(
-Original file line number
+Diff line change
@@ Expand Up @@
         {
             $resolver->setDefaults(array(
                 'choices' => Intl::getRegionBundle()->getCountryNames(),
+                'invalid_message' => 'Country provided is invalid.',
             ));
         }
@@ Expand Down @@