initialize the current time with midnight before modifying the date

xabbuh · xabbuh · commit d4e97456eca1 · 2024-04-09T09:41:38.000+02:00
diff --git a/src/Symfony/Component/Clock/DatePoint.php b/src/Symfony/Component/Clock/DatePoint.php
@@ -32,15 +32,21 @@ public function __construct(string $datetime = 'now', ?\DateTimeZone $timezone =
 
             if (\PHP_VERSION_ID < 80300) {
                 try {
-                    $timezone = (new parent($datetime, $timezone ?? $now->getTimezone()))->getTimezone();
+                    $builtInDate = new parent($datetime, $timezone ?? $now->getTimezone());
+                    $timezone = ($builtInDate)->getTimezone();
                 } catch (\Exception $e) {
                     throw new \DateMalformedStringException($e->getMessage(), $e->getCode(), $e);
                 }
             } else {
-                $timezone = (new parent($datetime, $timezone ?? $now->getTimezone()))->getTimezone();
+                $builtInDate = new parent($datetime, $timezone ?? $now->getTimezone());
+                $timezone = ($builtInDate)->getTimezone();
             }
 
             $now = $now->setTimezone($timezone)->modify($datetime);
+
+            if ('00:00:00' === $builtInDate->format('H:i:s')) {
+                $now = $now->setTime(0, 0);
+            }
         } elseif (null !== $timezone) {
             $now = $now->setTimezone($timezone);
         }
diff --git a/src/Symfony/Component/Clock/Tests/DatePointTest.php b/src/Symfony/Component/Clock/Tests/DatePointTest.php
@@ -57,4 +57,11 @@ public function testModify()
         $this->expectExceptionMessage('Failed to parse time string (Bad Date)');
         $date->modify('Bad Date');
     }
+
+    public function testTimeDefaultsToMidnight()
+    {
+        $date = new DatePoint('2024-04-09');
+
+        $this->assertSame('2024-04-09 00:00:00', $date->format('Y-m-d H:i:s'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,4 +57,11 @@ public function testModify()`
`57`	`57`	`$this->expectExceptionMessage('Failed to parse time string (Bad Date)');`
`58`	`58`	`$date->modify('Bad Date');`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ public function testTimeDefaultsToMidnight()`
	`62`	`+ {`
	`63`	`+ $date = new DatePoint('2024-04-09');`
	`64`	`+`
	`65`	`+ $this->assertSame('2024-04-09 00:00:00', $date->format('Y-m-d H:i:s'));`
	`66`	`+ }`
`60`	`67`	`}`