@@ -54,9 +54,9 @@ public function testNormalizeUsingFormatPassedInConstructor()
54
54
55
55
public function testNormalizeUsingTimeZonePassedInConstructor ()
56
56
{
57
- $ normalizer = new DateTimeNormalizer ([DateTimeNormalizer::TIMEZONE_KEY => new \DateTimeZone ('Japan ' )]);
57
+ $ normalizer = new DateTimeNormalizer ([DateTimeNormalizer::TIMEZONE_KEY => new \DateTimeZone ('Asia/Tokyo ' )]);
58
58
59
- $ this ->assertSame ('2016-12-01T00:00:00+09:00 ' , $ normalizer ->normalize (new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('Japan ' ))));
59
+ $ this ->assertSame ('2016-12-01T00:00:00+09:00 ' , $ normalizer ->normalize (new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('Asia/Tokyo ' ))));
60
60
$ this ->assertSame ('2016-12-01T09:00:00+09:00 ' , $ normalizer ->normalize (new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('UTC ' ))));
61
61
}
62
62
@@ -73,9 +73,9 @@ public function testNormalizeUsingTimeZonePassedInContext($expected, $input, $ti
73
73
public static function normalizeUsingTimeZonePassedInContextProvider ()
74
74
{
75
75
yield ['2016-12-01T00:00:00+00:00 ' , new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('UTC ' )), null ];
76
- yield ['2016-12-01T00:00:00+09:00 ' , new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('Japan ' )), new \DateTimeZone ('Japan ' )];
77
- yield ['2016-12-01T09:00:00+09:00 ' , new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('UTC ' )), new \DateTimeZone ('Japan ' )];
78
- yield ['2016-12-01T09:00:00+09:00 ' , new \DateTime ('2016/12/01 ' , new \DateTimeZone ('UTC ' )), new \DateTimeZone ('Japan ' )];
76
+ yield ['2016-12-01T00:00:00+09:00 ' , new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('Asia/Tokyo ' )), new \DateTimeZone ('Asia/Tokyo ' )];
77
+ yield ['2016-12-01T09:00:00+09:00 ' , new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('UTC ' )), new \DateTimeZone ('Asia/Tokyo ' )];
78
+ yield ['2016-12-01T09:00:00+09:00 ' , new \DateTime ('2016/12/01 ' , new \DateTimeZone ('UTC ' )), new \DateTimeZone ('Asia/Tokyo ' )];
79
79
}
80
80
81
81
/**
@@ -139,7 +139,7 @@ public static function normalizeUsingTimeZonePassedInContextAndExpectedFormatWit
139
139
'2018-12-01T18:03:06.067634 ' ,
140
140
new \DateTimeZone ('UTC ' )
141
141
),
142
- new \DateTimeZone ('Europe/Kiev ' ),
142
+ new \DateTimeZone ('Europe/Kyiv ' ),
143
143
];
144
144
145
145
yield [
@@ -181,7 +181,7 @@ public function testDenormalize()
181
181
182
182
public function testDenormalizeUsingTimezonePassedInConstructor ()
183
183
{
184
- $ timezone = new \DateTimeZone ('Japan ' );
184
+ $ timezone = new \DateTimeZone ('Asia/Tokyo ' );
185
185
$ expected = new \DateTimeImmutable ('2016/12/01 17:35:00 ' , $ timezone );
186
186
$ normalizer = new DateTimeNormalizer ([DateTimeNormalizer::TIMEZONE_KEY => $ timezone ]);
187
187
@@ -214,18 +214,18 @@ public static function denormalizeUsingTimezonePassedInContextProvider()
214
214
{
215
215
yield 'with timezone ' => [
216
216
'2016/12/01 17:35:00 ' ,
217
- new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Japan ' )),
218
- new \DateTimeZone ('Japan ' ),
217
+ new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Asia/Tokyo ' )),
218
+ new \DateTimeZone ('Asia/Tokyo ' ),
219
219
];
220
220
yield 'with timezone as string ' => [
221
221
'2016/12/01 17:35:00 ' ,
222
- new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Japan ' )),
223
- 'Japan ' ,
222
+ new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Asia/Tokyo ' )),
223
+ 'Asia/Tokyo ' ,
224
224
];
225
225
yield 'with format without timezone information ' => [
226
226
'2016.12.01 17:35:00 ' ,
227
- new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Japan ' )),
228
- new \DateTimeZone ('Japan ' ),
227
+ new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Asia/Tokyo ' )),
228
+ new \DateTimeZone ('Asia/Tokyo ' ),
229
229
'Y.m.d H:i:s ' ,
230
230
];
231
231
yield 'ignored with format with timezone information ' => [
0 commit comments