bug #48949 [HttpKernel] Use TZ from clock service in DateTimeValueResolver (nicolas-grekas)

fabpot · fabpot · commit f65e0988dafd · 2023-01-11T13:37:03.000+01:00
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
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
@@ -73,7 +73,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
         }
 
         if (null !== $format) {
-            $date = $class::createFromFormat($format, $value);
+            $date = $class::createFromFormat($format, $value, $this->clock?->now()->getTimeZone());
 
             if (($class::getLastErrors() ?: ['warning_count' => 0])['warning_count']) {
                 $date = false;
@@ -83,7 +83,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
                 $value = '@'.$value;
             }
             try {
-                $date = new $class($value);
+                $date = new $class($value, $this->clock?->now()->getTimeZone());
             } catch (\Exception) {
                 $date = false;
             }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
@@ -84,8 +84,8 @@ public function testUnsupportedArgument()
      */
     public function testFullDate(string $timezone, bool $withClock)
     {
-        date_default_timezone_set($timezone);
-        $resolver = new DateTimeValueResolver($withClock ? new MockClock() : null);
+        date_default_timezone_set($withClock ? 'UTC' : $timezone);
+        $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeImmutable::class, false, false, null);
         $request = self::requestWithAttributes(['dummy' => '2012-07-21 00:00:00']);
@@ -103,7 +103,7 @@ public function testFullDate(string $timezone, bool $withClock)
      */
     public function testUnixTimestamp(string $timezone, bool $withClock)
     {
-        date_default_timezone_set($timezone);
+        date_default_timezone_set($withClock ? 'UTC' : $timezone);
         $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeImmutable::class, false, false, null);
@@ -212,7 +212,7 @@ public function testCustomClass()
      */
     public function testDateTimeImmutable(string $timezone, bool $withClock)
     {
-        date_default_timezone_set($timezone);
+        date_default_timezone_set($withClock ? 'UTC' : $timezone);
         $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeImmutable::class, false, false, null);
@@ -231,7 +231,7 @@ public function testDateTimeImmutable(string $timezone, bool $withClock)
      */
     public function testWithFormat(string $timezone, bool $withClock)
     {
-        date_default_timezone_set($timezone);
+        date_default_timezone_set($withClock ? 'UTC' : $timezone);
         $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeInterface::class, false, false, null, false, [

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if (null !== $format) {`
`76`		`- $date = $class::createFromFormat($format, $value);`
	`76`	`+ $date = $class::createFromFormat($format, $value, $this->clock?->now()->getTimeZone());`
`77`	`77`
`78`	`78`	`if (($class::getLastErrors() ?: ['warning_count' => 0])['warning_count']) {`
`79`	`79`	`$date = false;`
`@@ -83,7 +83,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array`
`83`	`83`	`$value = '@'.$value;`
`84`	`84`	`}`
`85`	`85`	`try {`
`86`		`- $date = new $class($value);`
	`86`	`+ $date = new $class($value, $this->clock?->now()->getTimeZone());`
`87`	`87`	`} catch (\Exception) {`
`88`	`88`	`$date = false;`
`89`	`89`	`}`