From bb452cd7c4e45acc2267645925bb818204b3e5e3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 18 Jul 2011 14:49:07 +0200 Subject: [PATCH] [Form] renamed invalid_message_template to invalid_message to be consistent with other error message names --- src/Symfony/Component/Form/Extension/Core/Type/FieldType.php | 4 ++-- .../Form/Extension/Core/Validator/DefaultValidator.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FieldType.php b/src/Symfony/Component/Form/Extension/Core/Type/FieldType.php index 24f93eadf085..8b4910805bec 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/FieldType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/FieldType.php @@ -54,7 +54,7 @@ public function buildForm(FormBuilder $builder, array $options) ->setAttribute('pattern', $options['pattern']) ->setAttribute('label', $options['label'] ?: $this->humanize($builder->getName())) ->setAttribute('attr', $options['attr'] ?: array()) - ->setAttribute('invalid_message_template', $options['invalid_message_template']) + ->setAttribute('invalid_message', $options['invalid_message']) ->setAttribute('invalid_message_parameters', $options['invalid_message_parameters']) ->setData($options['data']) ->addValidator(new DefaultValidator()) @@ -125,7 +125,7 @@ public function getDefaultOptions(array $options) 'error_mapping' => array(), 'label' => null, 'attr' => array(), - 'invalid_message_template' => 'This value is not valid', + 'invalid_message' => 'This value is not valid', 'invalid_message_parameters' => array(), ); diff --git a/src/Symfony/Component/Form/Extension/Core/Validator/DefaultValidator.php b/src/Symfony/Component/Form/Extension/Core/Validator/DefaultValidator.php index 4266880b3cfb..7268a3ee2fce 100644 --- a/src/Symfony/Component/Form/Extension/Core/Validator/DefaultValidator.php +++ b/src/Symfony/Component/Form/Extension/Core/Validator/DefaultValidator.php @@ -21,7 +21,7 @@ public function validate(FormInterface $form) { if (!$form->isSynchronized()) { $form->addError(new FormError( - $form->getAttribute('invalid_message_template'), + $form->getAttribute('invalid_message'), $form->getAttribute('invalid_message_parameters') )); }