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

[Form] Refactored processing of the "empty_value" option in DateType

Browse Source
This commit is contained in:
Bernhard Schussek 2012-07-09 17:20:29 +02:00
parent 38c30b71bd
commit 14e293fc66
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Symfony/Component/Form/Extension/Core/Type/DateType.php
View File

@ -69,12 +69,6 @@ class DateType extends AbstractType
$yearOptions = $monthOptions = $dayOptions = array();
if ('choice' === $options['widget']) {
if (is_array($options['empty_value'])) {
$options['empty_value'] = array_merge(array('year' => null, 'month' => null, 'day' => null), $options['empty_value']);
} else {
$options['empty_value'] = array('year' => $options['empty_value'], 'month' => $options['empty_value'], 'day' => $options['empty_value']);
}
$years = $months = $days = array();
foreach ($options['years'] as $year) {
@ -170,6 +164,21 @@ class DateType extends AbstractType
return $options['widget'] !== 'single_text';
};
$emptyValueFilter = function (Options $options, $emptyValue) {
if (is_array($emptyValue)) {
return array_merge(
array('year' => null, 'month' => null, 'day' => null),
$emptyValue
);
}
return array(
'year' => $emptyValue,
'month' => $emptyValue,
'day' => $emptyValue
);
};
$resolver->setDefaults(array(
'years' => range(date('Y') - 5, date('Y') + 5),
'months' => range(1, 12),
@ -192,6 +201,10 @@ class DateType extends AbstractType
'compound' => $compound,
));
$resolver->setFilters(array(
'empty_value' => $emptyValueFilter,
));
$resolver->setAllowedValues(array(
'input' => array(
'datetime',