[RateLimiter] Only use old windowEndAt if it is still current

xesxen · xesxen · commit 1073a52b5c30 · 2021-02-10T01:27:54.000+01:00
diff --git a/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php b/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
@@ -64,7 +64,11 @@ public static function createFromPreviousWindow(self $window, int $intervalInSec
     {
         $new = new self($window->id, $intervalInSeconds);
         $new->hitCountForLastWindow = $window->hitCount;
-        $new->windowEndAt = $window->windowEndAt + $intervalInSeconds;
+        $windowEndAt = $window->windowEndAt + $intervalInSeconds;
+
+        if (time() < $windowEndAt) {
+            $new->windowEndAt = $windowEndAt;
+        }
 
         return $new;
     }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,11 @@ public static function createFromPreviousWindow(self $window, int $intervalInSec`
`64`	`64`	`{`
`65`	`65`	`$new = new self($window->id, $intervalInSeconds);`
`66`	`66`	`$new->hitCountForLastWindow = $window->hitCount;`
`67`		`- $new->windowEndAt = $window->windowEndAt + $intervalInSeconds;`
	`67`	`+ $windowEndAt = $window->windowEndAt + $intervalInSeconds;`
	`68`	`+`
	`69`	`+ if (time() < $windowEndAt) {`
	`70`	`+ $new->windowEndAt = $windowEndAt;`
	`71`	`+ }`
`68`	`72`
`69`	`73`	`return $new;`
`70`	`74`	`}`