[RateLimiter] Resolve crash on near-round timestamps

xesxen · xesxen · commit 496595270d4f · 2022-01-23T17:26:04.000+01:00
diff --git a/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php b/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
@@ -122,6 +122,6 @@ public function getHitCount(): int
 
     public function getRetryAfter(): \DateTimeImmutable
     {
-        return \DateTimeImmutable::createFromFormat('U.u', $this->windowEndAt);
+        return \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', $this->windowEndAt));
     }
 }
diff --git a/src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowTest.php b/src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowTest.php
@@ -102,4 +102,13 @@ public function testGetRetryAfterUsesMicrotime()
         // should be 500ms left (10 - 9.5)
         $this->assertEqualsWithDelta(0.5, $window->getRetryAfter()->format('U.u') - microtime(true), 0.2);
     }
+
+    public function testCreateAtExactTime()
+    {
+        ClockMock::register(SlidingWindow::class);
+        ClockMock::withClockMock(1234567890.000000);
+        $window = new SlidingWindow('foo', 10);
+        $window->getRetryAfter();
+        $this->assertEquals('1234567900.000000', $window->getRetryAfter()->format('U.u'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,6 @@ public function getHitCount(): int`
`122`	`122`
`123`	`123`	`public function getRetryAfter(): \DateTimeImmutable`
`124`	`124`	`{`
`125`		`- return \DateTimeImmutable::createFromFormat('U.u', $this->windowEndAt);`
	`125`	`+ return \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', $this->windowEndAt));`
`126`	`126`	`}`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,4 +102,13 @@ public function testGetRetryAfterUsesMicrotime()`
`102`	`102`	`// should be 500ms left (10 - 9.5)`
`103`	`103`	`$this->assertEqualsWithDelta(0.5, $window->getRetryAfter()->format('U.u') - microtime(true), 0.2);`
`104`	`104`	`}`
	`105`	`+`
	`106`	`+ public function testCreateAtExactTime()`
	`107`	`+ {`
	`108`	`+ ClockMock::register(SlidingWindow::class);`
	`109`	`+ ClockMock::withClockMock(1234567890.000000);`
	`110`	`+ $window = new SlidingWindow('foo', 10);`
	`111`	`+ $window->getRetryAfter();`
	`112`	`+ $this->assertEquals('1234567900.000000', $window->getRetryAfter()->format('U.u'));`
	`113`	`+ }`
`105`	`114`	`}`