bug symfony#48110 [HttpKernel] Fix deprecation for DateTimeValueResolver with null on non-nullable argument (GromNaN)

nicolas-grekas · nicolas-grekas · commit b2a35c71b3ef · 2022-11-04T14:30:41.000+01:00
This PR was merged into the 6.1 branch. Discussion ---------- [HttpKernel] Fix deprecation for DateTimeValueResolver with null on non-nullable argument | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | https://github.com/symfony/symfony/pull/48098/files#r1013918566 | License | MIT | Doc PR | n/a Remove deprecation message when the value is `null` and the controller argument is not nullable. ``` Deprecated: DateTimeImmutable::__construct(): Passing null to parameter #1 ($datetime) of type string is deprecated ``` This class have been modified in 6.2. The new test case needs to be updated. Commits ------- 1d7387b Fix deprecation notice when date argument is not nullable and null value is provided
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
@@ -60,8 +60,6 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
             $format = $attribute->format;
         }
 
-        $date = false;
-
         if (null !== $format) {
             $date = $class::createFromFormat($format, $value);
 
@@ -73,7 +71,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
                 $value = '@'.$value;
             }
             try {
-                $date = new $class($value);
+                $date = new $class($value ?? 'now');
             } 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
@@ -113,6 +113,26 @@ public function testNullableWithEmptyAttribute()
         $this->assertNull($results[0]);
     }
 
+    /**
+     * @dataProvider getTimeZones
+     */
+    public function testNow(string $timezone)
+    {
+        date_default_timezone_set($timezone);
+        $resolver = new DateTimeValueResolver();
+
+        $argument = new ArgumentMetadata('dummy', \DateTime::class, false, false, null, false);
+        $request = self::requestWithAttributes(['dummy' => null]);
+
+        /** @var \Generator $results */
+        $results = $resolver->resolve($request, $argument);
+        $results = iterator_to_array($results);
+
+        $this->assertCount(1, $results);
+        $this->assertEquals('0', $results[0]->diff(new \DateTimeImmutable())->format('%s'));
+        $this->assertSame($timezone, $results[0]->getTimezone()->getName(), 'Default timezone');
+    }
+
     public function testPreviouslyConvertedAttribute()
     {
         $resolver = new DateTimeValueResolver();

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable`
`60`	`60`	`$format = $attribute->format;`
`61`	`61`	`}`
`62`	`62`
`63`		`- $date = false;`
`64`		`-`
`65`	`63`	`if (null !== $format) {`
`66`	`64`	`$date = $class::createFromFormat($format, $value);`
`67`	`65`
`@@ -73,7 +71,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable`
`73`	`71`	`$value = '@'.$value;`
`74`	`72`	`}`
`75`	`73`	`try {`
`76`		`- $date = new $class($value);`
	`74`	`+ $date = new $class($value ?? 'now');`
`77`	`75`	`} catch (\Exception) {`
`78`	`76`	`$date = false;`
`79`	`77`	`}`