Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf65e098

Browse files
committed
bug#48949 [HttpKernel] Use TZ from clock service in DateTimeValueResolver (nicolas-grekas)
This PR was merged into the 6.3 branch.Discussion----------[HttpKernel] Use TZ from clock service in DateTimeValueResolver| Q | A| ------------- | ---| Branch? | 6.3| Bug fix? | yes| New feature? | no| Deprecations? | no| Tickets | -| License | MIT| Doc PR | -Fixing#48098 + making tests green by using legit TZ names.Commits-------1acf90e [HttpKernel] Use TZ from clock service in DateTimeValueResolver
2 parents675ee80 +1acf90e commitf65e098

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

‎src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
7373
}
7474

7575
if (null !==$format) {
76-
$date =$class::createFromFormat($format,$value);
76+
$date =$class::createFromFormat($format,$value,$this->clock?->now()->getTimeZone());
7777

7878
if (($class::getLastErrors() ?: ['warning_count' =>0])['warning_count']) {
7979
$date =false;
@@ -83,7 +83,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
8383
$value ='@'.$value;
8484
}
8585
try {
86-
$date =new$class($value);
86+
$date =new$class($value,$this->clock?->now()->getTimeZone());
8787
}catch (\Exception) {
8888
$date =false;
8989
}

‎src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public function testUnsupportedArgument()
8484
*/
8585
publicfunctiontestFullDate(string$timezone,bool$withClock)
8686
{
87-
date_default_timezone_set($timezone);
88-
$resolver =newDateTimeValueResolver($withClock ?newMockClock() :null);
87+
date_default_timezone_set($withClock ?'UTC' :$timezone);
88+
$resolver =newDateTimeValueResolver($withClock ?newMockClock('now',$timezone) :null);
8989

9090
$argument =newArgumentMetadata('dummy', \DateTimeImmutable::class,false,false,null);
9191
$request =self::requestWithAttributes(['dummy' =>'2012-07-21 00:00:00']);
@@ -103,7 +103,7 @@ public function testFullDate(string $timezone, bool $withClock)
103103
*/
104104
publicfunctiontestUnixTimestamp(string$timezone,bool$withClock)
105105
{
106-
date_default_timezone_set($timezone);
106+
date_default_timezone_set($withClock ?'UTC' :$timezone);
107107
$resolver =newDateTimeValueResolver($withClock ?newMockClock('now',$timezone) :null);
108108

109109
$argument =newArgumentMetadata('dummy', \DateTimeImmutable::class,false,false,null);
@@ -212,7 +212,7 @@ public function testCustomClass()
212212
*/
213213
publicfunctiontestDateTimeImmutable(string$timezone,bool$withClock)
214214
{
215-
date_default_timezone_set($timezone);
215+
date_default_timezone_set($withClock ?'UTC' :$timezone);
216216
$resolver =newDateTimeValueResolver($withClock ?newMockClock('now',$timezone) :null);
217217

218218
$argument =newArgumentMetadata('dummy', \DateTimeImmutable::class,false,false,null);
@@ -231,7 +231,7 @@ public function testDateTimeImmutable(string $timezone, bool $withClock)
231231
*/
232232
publicfunctiontestWithFormat(string$timezone,bool$withClock)
233233
{
234-
date_default_timezone_set($timezone);
234+
date_default_timezone_set($withClock ?'UTC' :$timezone);
235235
$resolver =newDateTimeValueResolver($withClock ?newMockClock('now',$timezone) :null);
236236

237237
$argument =newArgumentMetadata('dummy', \DateTimeInterface::class,false,false,null,false, [

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp