Convert previously converted attribute to match the expected type

GromNaN · GromNaN · commit ae845dbc6c0f · 2022-11-04T12:38:42.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
@@ -49,21 +49,20 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
         }
 
         $value = $request->attributes->get($argument->getName());
-
-        if ($value instanceof \DateTimeInterface) {
-            return [$value];
-        }
-
-        if ($argument->isNullable() && !$value) {
-            return [null];
-        }
-
         $class = \DateTimeInterface::class === $argument->getType() ? \DateTimeImmutable::class : $argument->getType();
 
-        if ($this->clock && !$value) {
-            $date = $this->clock->withTimeZone(date_default_timezone_get())->now();
+        if (!$value) {
+            if ($argument->isNullable()) {
+                return [null];
+            }
+            if (!$this->clock) {
+                return [new $class];
+            }
+            $value = $this->clock->withTimeZone(date_default_timezone_get())->now();
+        }
 
-            return $date instanceof $class ? [$date] : [$class::createFromInterface($date)];
+        if ($value instanceof \DateTimeInterface) {
+            return $value instanceof $class ? [$value] : [$class::createFromInterface($value)];
         }
 
         $format = null;
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
@@ -123,17 +123,21 @@ public function testNullableWithEmptyAttribute()
         $this->assertNull($results[0]);
     }
 
-    public function testPreviouslyConvertedAttribute()
+    /**
+     * @dataProvider getClasses
+     */
+    public function testPreviouslyConvertedAttribute(string $class)
     {
         $resolver = new DateTimeValueResolver();
 
-        $argument = new ArgumentMetadata('dummy', \DateTimeImmutable::class, false, false, null, true);
+        $argument = new ArgumentMetadata('dummy', $class, false, false, null, true);
         $request = self::requestWithAttributes(['dummy' => $datetime = new \DateTimeImmutable()]);
 
         $results = $resolver->resolve($request, $argument);
 
         $this->assertCount(1, $results);
-        $this->assertSame($datetime, $results[0]);
+        $this->assertEquals($datetime, $results[0], 'The value is the same, but the class can be modified.');
+        $this->assertInstanceOf($class, $results[0]);
     }
 
     public function testCustomClass()
@@ -224,12 +228,29 @@ public function test404Exception(ArgumentMetadata $argument, Request $request)
 
     /**
      * @param class-string<\DateTimeInterface> $class
-     *
-     * @testWith ["DateTimeInterface"]
-     *           ["DateTimeImmutable"]
-     *           ["DateTime"]
+     * @dataProvider getClasses
+     */
+    public function testNow(string $class)
+    {
+        date_default_timezone_set($timezone = 'Etc/GMT+9');
+        $resolver = new DateTimeValueResolver();
+
+        $argument = new ArgumentMetadata('dummy', $class, false, false, null, false);
+        $request = self::requestWithAttributes(['dummy' => null]);
+
+        $results = $resolver->resolve($request, $argument);
+
+        $this->assertCount(1, $results);
+        $this->assertInstanceOf($class, $results[0]);
+        $this->assertSame($timezone, $results[0]->getTimezone()->getName(), 'Default timezone');
+        $this->assertEquals('0', $results[0]->diff(new \DateTimeImmutable())->format('%s'));
+    }
+
+    /**
+     * @param class-string<\DateTimeInterface> $class
+     * @dataProvider getClasses
      */
-    public function testNowFromClock(string $class)
+    public function testNowWithClock(string $class)
     {
         date_default_timezone_set($timezone = 'Etc/GMT+9');
         $clock = new MockClock('2022-02-20 22:20:02');
@@ -246,6 +267,13 @@ public function testNowFromClock(string $class)
         $this->assertEquals($clock->now(), $results[0]);
     }
 
+    public function getClasses()
+    {
+        yield [\DateTimeInterface::class];
+        yield [\DateTime::class];
+        yield [FooDateTime::class];
+    }
+
     private static function requestWithAttributes(array $attributes): Request
     {
         $request = Request::create('/');
