Skip to content

Commit 2b9e6e8

Browse files
Merge branch '7.4' into 8.0
* 7.4: (21 commits) [ObjectMapper] lazy loading [Filesystem] Unify logic for isAbsolute() in Path [DependencyInjection] Include return type in AppReference shape [Finder] Make method calls explicit in ExcludeDirectoryFilterIterator [Cache] Remove unset call on undefined variable in PhpArrayAdapter [Twig] Ensure WrappedTemplatedEmail::getReturnPath() returns a string [Routing] Simplify importing routes defined on controller services Fix tests [DependendcyInjection] Improve shape for "from_callable" definitions [PHPDoc] Fix various PHPDoc syntax errors [Console] Add missing VERBOSITY_SILENT case in CommandDataCollector [Notifier] Remove unused $transportName argument in EmailChannel::notify() [Translation] Remove an unused argument passed to parseNode() method [HttpClient] Reject 3xx pushed responses [Serializer] Use Asia/Tokyo instead of Japan in tests [ProxyManagerBridge] Remove comment that reference github discussion [JsonPath] Remove unused "nothing" property from JsonCrawler [ErrorHandler] Improve PHPDoc precision in SerializerErrorRenderer [Routing] Fix matching the "0" URL [Form] Fix EnumType choice_label logic for grouped choices ...
2 parents 11eb7ff + 31cf2f6 commit 2b9e6e8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Tests/Normalizer/DateTimeNormalizerTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -303,13 +303,13 @@ public function testDenormalizeUsingPreserveContextTimezoneAndFormatPassedInCons
303303
{
304304
$normalizer = new DateTimeNormalizer(
305305
[
306-
DateTimeNormalizer::TIMEZONE_KEY => new \DateTimeZone('Japan'),
306+
DateTimeNormalizer::TIMEZONE_KEY => new \DateTimeZone('Asia/Tokyo'),
307307
DateTimeNormalizer::FORMAT_KEY => 'Y-m-d\\TH:i:sO',
308308
DateTimeNormalizer::FORCE_TIMEZONE_KEY => true,
309309
]
310310
);
311311
$actual = $normalizer->denormalize('2016-12-01T12:34:56+0000', \DateTimeInterface::class);
312-
$this->assertEquals(new \DateTimeZone('Japan'), $actual->getTimezone());
312+
$this->assertEquals(new \DateTimeZone('Asia/Tokyo'), $actual->getTimezone());
313313
}
314314

315315
public function testDenormalizeUsingPreserveContextTimezoneAndFormatPassedInContext()
@@ -319,12 +319,12 @@ public function testDenormalizeUsingPreserveContextTimezoneAndFormatPassedInCont
319319
\DateTimeInterface::class,
320320
null,
321321
[
322-
DateTimeNormalizer::TIMEZONE_KEY => new \DateTimeZone('Japan'),
322+
DateTimeNormalizer::TIMEZONE_KEY => new \DateTimeZone('Asia/Tokyo'),
323323
DateTimeNormalizer::FORMAT_KEY => 'Y-m-d\\TH:i:sO',
324324
DateTimeNormalizer::FORCE_TIMEZONE_KEY => true,
325325
]
326326
);
327-
$this->assertEquals(new \DateTimeZone('Japan'), $actual->getTimezone());
327+
$this->assertEquals(new \DateTimeZone('Asia/Tokyo'), $actual->getTimezone());
328328
}
329329

330330
public function testDenormalizeUsingPreserveContextTimezoneWithoutFormat()
@@ -334,11 +334,11 @@ public function testDenormalizeUsingPreserveContextTimezoneWithoutFormat()
334334
\DateTimeInterface::class,
335335
null,
336336
[
337-
DateTimeNormalizer::TIMEZONE_KEY => new \DateTimeZone('Japan'),
337+
DateTimeNormalizer::TIMEZONE_KEY => new \DateTimeZone('Asia/Tokyo'),
338338
DateTimeNormalizer::FORCE_TIMEZONE_KEY => true,
339339
]
340340
);
341-
$this->assertEquals(new \DateTimeZone('Japan'), $actual->getTimezone());
341+
$this->assertEquals(new \DateTimeZone('Asia/Tokyo'), $actual->getTimezone());
342342
}
343343

344344
public function testDenormalizeUsingPreserveContextShouldBeIgnoredWithoutTimezoneInContext()

0 commit comments

Comments
 (0)