@@ -55,9 +55,9 @@ public function testNormalizeUsingFormatPassedInConstructor()
55
55
56
56
public function testNormalizeUsingTimeZonePassedInConstructor ()
57
57
{
58
- $ normalizer = new DateTimeNormalizer ([DateTimeNormalizer::TIMEZONE_KEY => new \DateTimeZone ('Japan ' )]);
58
+ $ normalizer = new DateTimeNormalizer ([DateTimeNormalizer::TIMEZONE_KEY => new \DateTimeZone ('Asia/Tokyo ' )]);
59
59
60
- $ this ->assertSame ('2016-12-01T00:00:00+09:00 ' , $ normalizer ->normalize (new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('Japan ' ))));
60
+ $ this ->assertSame ('2016-12-01T00:00:00+09:00 ' , $ normalizer ->normalize (new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('Asia/Tokyo ' ))));
61
61
$ this ->assertSame ('2016-12-01T09:00:00+09:00 ' , $ normalizer ->normalize (new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('UTC ' ))));
62
62
}
63
63
@@ -72,9 +72,9 @@ public function testNormalizeUsingTimeZonePassedInContext($expected, $input, $ti
72
72
public static function normalizeUsingTimeZonePassedInContextProvider ()
73
73
{
74
74
yield ['2016-12-01T00:00:00+00:00 ' , new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('UTC ' )), null ];
75
- yield ['2016-12-01T00:00:00+09:00 ' , new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('Japan ' )), new \DateTimeZone ('Japan ' )];
76
- yield ['2016-12-01T09:00:00+09:00 ' , new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('UTC ' )), new \DateTimeZone ('Japan ' )];
77
- yield ['2016-12-01T09:00:00+09:00 ' , new \DateTime ('2016/12/01 ' , new \DateTimeZone ('UTC ' )), new \DateTimeZone ('Japan ' )];
75
+ yield ['2016-12-01T00:00:00+09:00 ' , new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('Asia/Tokyo ' )), new \DateTimeZone ('Asia/Tokyo ' )];
76
+ yield ['2016-12-01T09:00:00+09:00 ' , new \DateTimeImmutable ('2016/12/01 ' , new \DateTimeZone ('UTC ' )), new \DateTimeZone ('Asia/Tokyo ' )];
77
+ yield ['2016-12-01T09:00:00+09:00 ' , new \DateTime ('2016/12/01 ' , new \DateTimeZone ('UTC ' )), new \DateTimeZone ('Asia/Tokyo ' )];
78
78
}
79
79
80
80
#[DataProvider('normalizeUsingTimeZonePassedInContextAndExpectedFormatWithMicrosecondsProvider ' )]
@@ -246,7 +246,7 @@ public function testDenormalize()
246
246
247
247
public function testDenormalizeUsingTimezonePassedInConstructor ()
248
248
{
249
- $ timezone = new \DateTimeZone ('Japan ' );
249
+ $ timezone = new \DateTimeZone ('Asia/Tokyo ' );
250
250
$ expected = new \DateTimeImmutable ('2016/12/01 17:35:00 ' , $ timezone );
251
251
$ normalizer = new DateTimeNormalizer ([DateTimeNormalizer::TIMEZONE_KEY => $ timezone ]);
252
252
@@ -277,18 +277,18 @@ public static function denormalizeUsingTimezonePassedInContextProvider()
277
277
{
278
278
yield 'with timezone ' => [
279
279
'2016/12/01 17:35:00 ' ,
280
- new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Japan ' )),
281
- new \DateTimeZone ('Japan ' ),
280
+ new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Asia/Tokyo ' )),
281
+ new \DateTimeZone ('Asia/Tokyo ' ),
282
282
];
283
283
yield 'with timezone as string ' => [
284
284
'2016/12/01 17:35:00 ' ,
285
- new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Japan ' )),
286
- 'Japan ' ,
285
+ new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Asia/Tokyo ' )),
286
+ 'Asia/Tokyo ' ,
287
287
];
288
288
yield 'with format without timezone information ' => [
289
289
'2016.12.01 17:35:00 ' ,
290
- new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Japan ' )),
291
- new \DateTimeZone ('Japan ' ),
290
+ new \DateTimeImmutable ('2016/12/01 17:35:00 ' , new \DateTimeZone ('Asia/Tokyo ' )),
291
+ new \DateTimeZone ('Asia/Tokyo ' ),
292
292
'Y.m.d H:i:s ' ,
293
293
];
294
294
yield 'ignored with format with timezone information ' => [
0 commit comments