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

Fix wrong DateTransformer timezone param for non-UTC configuration. #12808

Browse Source
This commit is contained in:
Sullivan SENECHAL 2014-12-09 10:23:15 +01:00 committed by Sullivan SENECHAL
parent 0a09eaf609
commit 0104f15e50
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,8 +57,8 @@ class DateType extends AbstractType
if ('single_text' === $options['widget']) { if ('single_text' === $options['widget']) {
$builder->addViewTransformer(new DateTimeToLocalizedStringTransformer( $builder->addViewTransformer(new DateTimeToLocalizedStringTransformer(
'UTC', null,
'UTC', null,
$dateFormat, $dateFormat,
$timeFormat, $timeFormat,
$calendar, $calendar,
@ -73,7 +73,7 @@ class DateType extends AbstractType
\Locale::getDefault(), \Locale::getDefault(),
$dateFormat, $dateFormat,
$timeFormat, $timeFormat,
'UTC', null,
$calendar, $calendar,
$pattern $pattern
); );
@ -105,7 +105,7 @@ class DateType extends AbstractType
->add('month', $options['widget'], $monthOptions) ->add('month', $options['widget'], $monthOptions)
->add('day', $options['widget'], $dayOptions) ->add('day', $options['widget'], $dayOptions)
->addViewTransformer(new DateTimeToArrayTransformer( ->addViewTransformer(new DateTimeToArrayTransformer(
'UTC', 'UTC', array('year', 'month', 'day') null, null, array('year', 'month', 'day')
)) ))
->setAttribute('formatter', $formatter) ->setAttribute('formatter', $formatter)
; ;
@ -113,15 +113,15 @@ class DateType extends AbstractType
if ('string' === $options['input']) { if ('string' === $options['input']) {
$builder->addModelTransformer(new ReversedTransformer( $builder->addModelTransformer(new ReversedTransformer(
new DateTimeToStringTransformer('UTC', 'UTC', 'Y-m-d') new DateTimeToStringTransformer(null, null, 'Y-m-d')
)); ));
} elseif ('timestamp' === $options['input']) { } elseif ('timestamp' === $options['input']) {
$builder->addModelTransformer(new ReversedTransformer( $builder->addModelTransformer(new ReversedTransformer(
new DateTimeToTimestampTransformer('UTC', 'UTC') new DateTimeToTimestampTransformer(null, null)
)); ));
} elseif ('array' === $options['input']) { } elseif ('array' === $options['input']) {
$builder->addModelTransformer(new ReversedTransformer( $builder->addModelTransformer(new ReversedTransformer(
new DateTimeToArrayTransformer('UTC', 'UTC', array('year', 'month', 'day')) new DateTimeToArrayTransformer(null, null, array('year', 'month', 'day'))
)); ));
} }
} }

10
src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
View File

@ -48,7 +48,7 @@ class TimeType extends AbstractType
} }
if ('single_text' === $options['widget']) { if ('single_text' === $options['widget']) {
$builder->addViewTransformer(new DateTimeToStringTransformer('UTC', 'UTC', $format)); $builder->addViewTransformer(new DateTimeToStringTransformer(null, null, $format));
} else { } else {
$hourOptions = $minuteOptions = $secondOptions = array( $hourOptions = $minuteOptions = $secondOptions = array(
'error_bubbling' => true, 'error_bubbling' => true,
@ -109,20 +109,20 @@ class TimeType extends AbstractType
$builder->add('second', $options['widget'], $secondOptions); $builder->add('second', $options['widget'], $secondOptions);
} }
$builder->addViewTransformer(new DateTimeToArrayTransformer('UTC', 'UTC', $parts, 'text' === $options['widget'])); $builder->addViewTransformer(new DateTimeToArrayTransformer(null, null, $parts, 'text' === $options['widget']));
} }
if ('string' === $options['input']) { if ('string' === $options['input']) {
$builder->addModelTransformer(new ReversedTransformer( $builder->addModelTransformer(new ReversedTransformer(
new DateTimeToStringTransformer('UTC', 'UTC', 'H:i:s') new DateTimeToStringTransformer(null, null, 'H:i:s')
)); ));
} elseif ('timestamp' === $options['input']) { } elseif ('timestamp' === $options['input']) {
$builder->addModelTransformer(new ReversedTransformer( $builder->addModelTransformer(new ReversedTransformer(
new DateTimeToTimestampTransformer('UTC', 'UTC') new DateTimeToTimestampTransformer(null, null)
)); ));
} elseif ('array' === $options['input']) { } elseif ('array' === $options['input']) {
$builder->addModelTransformer(new ReversedTransformer( $builder->addModelTransformer(new ReversedTransformer(
new DateTimeToArrayTransformer('UTC', 'UTC', $parts) new DateTimeToArrayTransformer(null, null, $parts)
)); ));
} }
} }