diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch fivestar/fix-form-datetime-2_0 (PR #2326)

Browse Source 
Commits
-------

828b18f [Form] Fixed lacking attributes in DateTimeType

Discussion
----------

[Form] Fixed lacking attributes in DateTimeType

Added invalid_message and invalid_message_parameters. (Moved from #2311)
This commit is contained in:
Fabien Potencier 2011-10-05 11:21:28 +02:00
commit 5fe18cad90
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
View File

@ -55,6 +55,8 @@ class DateTimeType extends AbstractType
'days',
'empty_value',
'required',
'invalid_message',
'invalid_message_parameters'
)));
$timeOptions = array_intersect_key($options, array_flip(array(
'hours',
@ -63,6 +65,8 @@ class DateTimeType extends AbstractType
'with_seconds',
'empty_value',
'required',
'invalid_message',
'invalid_message_parameters'
)));
// If `widget` is set, overwrite widget options from `date` and `time`

24
tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php
View File

@ -16,6 +16,7 @@ require_once __DIR__ . '/LocalizedTestCase.php';
use Symfony\Component\Form\DateTimeField;
use Symfony\Component\Form\DateField;
use Symfony\Component\Form\TimeField;
use Symfony\Component\Form\FormError;
class DateTimeTypeTest extends LocalizedTestCase
{
@ -234,4 +235,27 @@ class DateTimeTypeTest extends LocalizedTestCase
$this->assertDateTimeEquals($dateTime, $form->getData());
}
public function testSubmit_invalidDateTime()
{
$form = $this->factory->create('datetime', null, array(
'invalid_message' => 'Customized invalid 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 message', array())), $form['date']->getErrors());
$this->assertEquals(array(new FormError('Customized invalid message', array())), $form['time']->getErrors());
}
}