symfony
diff --git a/‎src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php
+8-1Lines changed: 8 additions & 1 deletion b/‎src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php
+8-1Lines changed: 8 additions & 1 deletion
diff --git a/‎src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowLimiterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowLimiterTest.php
+15Lines changed: 15 additions & 0 deletions b/‎src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowLimiterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowLimiterTest.php
+15Lines changed: 15 additions & 0 deletions
@@ -74,7 +74,14 @@ public function reserve(int $tokens = 1, ?float $maxTime = null): Reservation
             if ($availableTokens >= $tokens) {
                 $window->add($tokens);
 
-                $reservation = new Reservation($now, new RateLimit($this->getAvailableTokens($window->getHitCount()), \DateTimeImmutable::createFromFormat('U', floor($now)), true, $this->limit));
+                if ($availableTokens === $tokens) {
+                    $resetDuration = $window->calculateTimeForTokens($this->limit, $tokens);
+                    $retryAfter = $now + $resetDuration;
+                } else {
+                    $retryAfter = $now;
+                }
+
+                $reservation = new Reservation($now, new RateLimit($this->getAvailableTokens($window->getHitCount()), \DateTimeImmutable::createFromFormat('U', floor($retryAfter)), true, $this->limit));
             } else {
                 $waitDuration = $window->calculateTimeForTokens($this->limit, $tokens);
 
 
@@ -70,6 +70,21 @@ public function testWaitIntervalOnConsumeOverLimit()
         $this->assertTrue($limiter->consume()->isAccepted());
     }
 
+    public function testConsumeLastToken()
+    {
+        $limiter = $this->createLimiter();
+        $limiter->reset();
+        $limiter->consume(9);
+
+        $rateLimit = $limiter->consume(1);
+        $this->assertSame(0, $rateLimit->getRemainingTokens());
+        $this->assertTrue($rateLimit->isAccepted());
+        $this->assertEquals(
+            \DateTimeImmutable::createFromFormat('U', (string) floor(microtime(true) + 12 / 10)),
+            $rateLimit->getRetryAfter()
+        );
+    }
+
     public function testReserve()
     {
         $limiter = $this->createLimiter();