[RateLimiter] Allow to get RateLimit without consuming again.

ERuban · ERuban · commit a2a89d731e37 · 2023-11-30T22:57:49.000+04:00
diff --git a/src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php b/src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php
@@ -65,7 +65,7 @@ public function reserve(int $tokens = 1, float $maxTime = null): Reservation
             $now = microtime(true);
             $hitCount = $window->getHitCount();
             $availableTokens = $this->getAvailableTokens($hitCount);
-            if (0 !== $tokens && $availableTokens >= $tokens) {
+            if ((0 !== $tokens || 0 !== $availableTokens) && $availableTokens >= $tokens) {
                 $window->add($tokens);
 
                 $reservation = new Reservation($now, new RateLimit($this->getAvailableTokens($window->getHitCount()), \DateTimeImmutable::createFromFormat('U', floor($now)), true, $this->limit));
diff --git a/src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowLimiterTest.php b/src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowLimiterTest.php
@@ -52,6 +52,26 @@ public function testConsume()
         $rateLimit = $limiter->consume(10);
         $this->assertTrue($rateLimit->isAccepted());
         $this->assertSame(10, $rateLimit->getLimit());
+
+        // Test without consuming a try
+        $limiter->reset();
+
+        $rateLimit = $limiter->consume(0);
+        $this->assertTrue($rateLimit->isAccepted());
+        $this->assertEquals(
+            \DateTimeImmutable::createFromFormat('U', (string)floor(microtime(true))),
+            $rateLimit->getRetryAfter()
+        );
+
+        $limiter->reset();
+        $limiter->consume(10);
+
+        $rateLimit = $limiter->consume(0);
+        $this->assertFalse($rateLimit->isAccepted());
+        $this->assertEquals(
+            \DateTimeImmutable::createFromFormat('U', (string)floor(microtime(true) + 12 / 10)),
+            $rateLimit->getRetryAfter()
+        );
     }
 
     public function testWaitIntervalOnConsumeOverLimit()
