8000 Fix wrong DateTransformer timezone param for non-UTC configuration. #… · symfony/symfony@0104f15 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0104f15

Browse files
soullivaneuhsoullivaneuh
committed
Fix wrong DateTransformer timezone param for non-UTC configuration. #12808 
1 parent 0a09eaf commit 0104f15

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎src/Symfony/Component/Form/Extension/Core/Type/DateType.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
5757

5858
if ('single_text' === $options['widget']) {
5959
$builder->addViewTransformer(new DateTimeToLocalizedStringTransformer(
60-
'UTC',
61-
'UTC',
60+
null,
61+
null,
6262
$dateFormat,
6363
$timeFormat,
6464
$calendar,
@@ -73,7 +73,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
7373
\Locale::getDefault(),
7474
$dateFormat,
7575
$timeFormat,
76-
'UTC',
76+
null,
7777
$calendar,
7878
$pattern
7979
);
@@ -105,23 +105,23 @@ public function buildForm(FormBuilderInterface $builder, array $options)
105105
->add('month', $options['widget'], $monthOptions)
106106
->add('day', $options['widget'], $dayOptions)
107107
->addViewTransformer(new DateTimeToArrayTransformer(
108-
'UTC', 'UTC', array('year', 'month', 'day')
108+
null, null, array('year', 'month', 'day')
109109
))
110110
->setAttribute('formatter', $formatter)
111111
;
112112
}
113113

114114
if ('string' === $options['input']) {
115115
$builder->addModelTransformer(new ReversedTransformer(
116-
new DateTimeToStringTransformer('UTC', 'UTC', 'Y-m-d')
116+
new DateTimeToStringTransformer(null, null, 'Y-m-d')
117117
));
118118
} elseif ('timestamp' === $options['input']) {
119119
$builder->addModelTransformer(new ReversedTransformer(
120-
new DateTimeToTimestampTransformer('UTC', 'UTC')
120+
new DateTimeToTimestampTransformer(null, null)
121121
));
122122
} elseif ('array' === $options['input']) {
123123
$builder->addModelTransformer(new ReversedTransformer(
124-
new DateTimeToArrayTransformer('UTC', 'UTC', array('year', 'month', 'day'))
124+
new DateTimeToArrayTransformer(null, null, array('year', 'month', 'day'))
125125
));
126126
}
127127
}

‎src/Symfony/Component/Form/Extension/Core/Type/TimeType.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
4848
}
4949

5050
if ('single_text' === $options['widget']) {
51-
$builder->addViewTransformer(new DateTimeToStringTransformer('UTC', 'UTC', $format));
51+
$builder->addViewTransformer(new DateTimeToStringTransformer(null, null, $format));
5252
} else {
5353
$hourOptions = $minuteOptions = $secondOptions = array(
5454
'error_bubbling' => true,
@@ -109,20 +109,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
109109
$builder->add('second', $options['widget'], $secondOptions);
110110
}
111111

112-
$builder->addViewTransformer(new DateTimeToArrayTransformer('UTC', 'UTC', $parts, 'text' === $options['widget']));
112+
$builder->addViewTransformer(new DateTimeToArrayTransformer(null, null, $parts, 'text' === $options['widget']));
113113
}
114114

115115
if ('string' === $options['input']) {
116116
$builder->addModelTransformer(new ReversedTransformer(
117-
new DateTimeToStringTransformer('UTC', 'UTC', 'H:i:s')
117+
new DateTimeToStringTransformer(null, null, 'H:i:s')
118118
));
119119
} elseif ('timestamp' === $options['input']) {
120120
$builder->addModelTransformer(new ReversedTransformer(
121-
new DateTimeToTimestampTransformer('UTC', 'UTC')
121+
new DateTimeToTimestampTransformer(null, null)
122122
));
123123
} elseif ('array' === $options['input']) {
124124
$builder->addModelTransformer(new ReversedTransformer(
125-
new DateTimeToArrayTransformer('UTC', 'UTC', $parts)
125+
new DateTimeToArrayTransformer(null, null, $parts)
126126
));
127127
}
128128
}

0 commit comments

Comments
 (0)
0