Handle previously converted DateTime arguments

mbabker · mbabker · commit 5fb1e8898cb7 · 2022-04-27T19:44:43.000-05:00
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
@@ -40,6 +40,13 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
     {
         $value = $request->attributes->get($argument->getName());
 
+        // If the value is already a DateTimeInterface (i.e. from the framework extra bundle's param converters), yield it as is
+        if ($value instanceof \DateTimeInterface) {
+            yield $value;
+
+            return;
+        }
+
         if ($argument->isNullable() && !$value) {
             yield null;
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
@@ -113,6 +113,21 @@ public function testNullableWithEmptyAttribute()
         $this->assertNull($results[0]);
     }
 
+    public function testPreviouslyConvertedAttribute()
+    {
+        $resolver = new DateTimeValueResolver();
+
+        $argument = new ArgumentMetadata('dummy', \DateTime::class, false, false, null, true);
+        $request = self::requestWithAttributes(['dummy' => $datetime = new \DateTime()]);
+
+        /** @var \Generator $results */
+        $results = $resolver->resolve($request, $argument);
+        $results = iterator_to_array($results);
+
+        $this->assertCount(1, $results);
+        $this->assertSame($datetime, $results[0]);
+    }
+
     public function testCustomClass()
     {
         date_default_timezone_set('UTC');
