Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a2a89d7

Browse filesBrowse files
committed
[RateLimiter] Allow to get RateLimit without consuming again.
1 parent 1c94f74 commit a2a89d7
Copy full SHA for a2a89d7

File tree

2 files changed

+21
-1
lines changed
Filter options

2 files changed

+21
-1
lines changed

‎src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/RateLimiter/Policy/SlidingWindowLimiter.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function reserve(int $tokens = 1, float $maxTime = null): Reservation
6565
$now = microtime(true);
6666
$hitCount = $window->getHitCount();
6767
$availableTokens = $this->getAvailableTokens($hitCount);
68-
if (0 !== $tokens && $availableTokens >= $tokens) {
68+
if ((0 !== $tokens || 0 !== $availableTokens) && $availableTokens >= $tokens) {
6969
$window->add($tokens);
7070

7171
$reservation = new Reservation($now, new RateLimit($this->getAvailableTokens($window->getHitCount()), \DateTimeImmutable::createFromFormat('U', floor($now)), true, $this->limit));

‎src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowLimiterTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowLimiterTest.php
+20Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,26 @@ public function testConsume()
5252
$rateLimit = $limiter->consume(10);
5353
$this->assertTrue($rateLimit->isAccepted());
5454
$this->assertSame(10, $rateLimit->getLimit());
55+
56+
// Test without consuming a try
57+
$limiter->reset();
58+
59+
$rateLimit = $limiter->consume(0);
60+
$this->assertTrue($rateLimit->isAccepted());
61+
$this->assertEquals(
62+
\DateTimeImmutable::createFromFormat('U', (string)floor(microtime(true))),
63+
$rateLimit->getRetryAfter()
64+
);
65+
66+
$limiter->reset();
67+
$limiter->consume(10);
68+
69+
$rateLimit = $limiter->consume(0);
70+
$this->assertFalse($rateLimit->isAccepted());
71+
$this->assertEquals(
72+
\DateTimeImmutable::createFromFormat('U', (string)floor(microtime(true) + 12 / 10)),
73+
$rateLimit->getRetryAfter()
74+
);
5575
}
5676

5777
public function testWaitIntervalOnConsumeOverLimit()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.