Skip to content

[WIP][Form] added support for different invalid messages for date, time. #4444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[WIP][Form] added support for different invalid messages for date, time. #4444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
195361f
[WIP][Form] added support for different invalid messages for date, time.
gh0stonio May 28, 2012
82f5ed2
[Form] fix default values to make test pass again
gh0stonio May 28, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ public function buildForm(FormBuilder $builder, array $options)
$builder->appendClientTransformer(new DateTimeToStringTransformer($options['data_timezone'], $options['user_timezone'], $format));
} else {
// Only pass a subset of the options to children

// Check if an invalid date message is defined
if(isset($options['date_invalid_message'])) {
$options['invalid_message'] = $options['date_invalid_message'];
}
if(isset($options['date_invalid_message_parameters'])) {
$options['invalid_message_parameters'] = $options['date_invalid_message_parameters'];
}
$dateOptions = array_intersect_key($options, array_flip(array(
'years',
'months',
Expand All @@ -53,6 +61,14 @@ public function buildForm(FormBuilder $builder, array $options)
'invalid_message',
'invalid_message_parameters'
)));

// Check if an invalid time message is defined
if(isset($options['time_invalid_message'])) {
$options['invalid_message'] = $options['time_invalid_message'];
}
if(isset($options['time_invalid_message_parameters'])) {
$options['invalid_message_parameters'] = $options['time_invalid_message_parameters'];
}
$timeOptions = array_intersect_key($options, array_flip(array(
'hours',
'minutes',
Expand Down Expand Up @@ -151,6 +167,10 @@ public function getDefaultOptions(array $options)
'widget' => null,
// This will overwrite "empty_value" child options
'empty_value' => null,
'date_invalid_message' => null,
'time_invalid_message' => null,
'date_invalid_message_parameters' => array(),
'time_invalid_message_parameters' => array(),
);
}

Expand Down
24 changes: 24 additions & 0 deletions tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,28 @@ public function testSubmit_invalidDateTime()
$this->assertEquals(array(new FormError('Customized invalid message', array())), $form['date']->getErrors());
$this->assertEquals(array(new FormError('Customized invalid message', array())), $form['time']->getErrors());
}

public function testSubmit_invalidDateTime_differentMessages()
{
$form = $this->factory->create('datetime', null, array(
'date_invalid_message' => 'Customized invalid date message',
'time_invalid_message' => 'Customized invalid time message',
));

$form->bind(array(
'date' => array(
'day' => '31',
'month' => '9',
'year' => '2010',
),
'time' => array(
'hour' => '25',
'minute' => '4',
),
));

$this->assertFalse($form->isValid());
$this->assertEquals(array(new FormError('Customized invalid date message', array())), $form['date']->getErrors());
$this->assertEquals(array(new FormError('Customized invalid time message', array())), $form['time']->getErrors());
}
}