minor #47270 [Clock] fix transient NativeClock test (xabbuh)

fabpot · fabpot · commit fc868f41ab43 · 2022-08-14T15:41:14.000+02:00
This PR was merged into the 6.2 branch. Discussion ---------- [Clock] fix transient NativeClock test | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- 05e7de4 fix transient NativeClock test
diff --git a/src/Symfony/Component/Clock/NativeClock.php b/src/Symfony/Component/Clock/NativeClock.php
@@ -31,7 +31,7 @@ public function __construct(\DateTimeZone|string $timezone = null)
 
     public function now(): \DateTimeImmutable
     {
-        return new \DateTimeImmutable('now', $this->timezone);
+        return \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6f', microtime(true)))->setTimezone($this->timezone);
     }
 
     public function sleep(float|int $seconds): void
diff --git a/src/Symfony/Component/Clock/Tests/NativeClockTest.php b/src/Symfony/Component/Clock/Tests/NativeClockTest.php
@@ -14,6 +14,9 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Clock\NativeClock;
 
+/**
+ * @group time-sensitive
+ */
 class NativeClockTest extends TestCase
 {
     public function testConstruct()
@@ -32,14 +35,14 @@ public function testConstruct()
     public function testNow()
     {
         $clock = new NativeClock();
-        $before = new \DateTimeImmutable();
+        $before = microtime(true);
         usleep(10);
         $now = $clock->now();
         usleep(10);
-        $after = new \DateTimeImmutable();
+        $after = microtime(true);
 
-        $this->assertGreaterThan($before, $now);
-        $this->assertLessThan($after, $now);
+        $this->assertGreaterThan($before, (float) $now->format('U.u'));
+        $this->assertLessThan($after, (float) $now->format('U.u'));
     }
 
     public function testSleep()
@@ -53,7 +56,7 @@ public function testSleep()
         usleep(10);
         $after = microtime(true);
 
-        $this->assertGreaterThan($before + 1.5, $now);
+        $this->assertSame($before + 1.5, $now);
         $this->assertLessThan($after, $now);
         $this->assertLessThan(1.9, $now - $before);
         $this->assertSame($tz, $clock->now()->getTimezone()->getName());

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function __construct(\DateTimeZone\|string $timezone = null)`
`31`	`31`
`32`	`32`	`public function now(): \DateTimeImmutable`
`33`	`33`	`{`
`34`		`- return new \DateTimeImmutable('now', $this->timezone);`
	`34`	`+ return \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6f', microtime(true)))->setTimezone($this->timezone);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function sleep(float\|int $seconds): void`