symfony
diff --git a/‎src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
+24-23Lines changed: 24 additions & 23 deletions b/‎src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
+24-23Lines changed: 24 additions & 23 deletions
diff --git a/‎src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowTest.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -43,11 +43,6 @@ final class SlidingWindow implements LimiterStateInterface
      */
     private $windowEndAt;
 
-    /**
-     * @var bool true if this window has been cached
-     */
-    private $cached = true;
-
     public function __construct(string $id, int $intervalInSeconds)
     {
         if ($intervalInSeconds < 1) {
@@ -56,7 +51,6 @@ public function __construct(string $id, int $intervalInSeconds)
         $this->id = $id;
         $this->intervalInSeconds = $intervalInSeconds;
         $this->windowEndAt = microtime(true) + $intervalInSeconds;
-        $this->cached = false;
     }
 
     public static function createFromPreviousWindow(self $window, int $intervalInSeconds): self
@@ -72,31 +66,17 @@ public static function createFromPreviousWindow(self $window, int $intervalInSec
         return $new;
     }
 
-    /**
-     * @internal
-     */
-    public function __sleep(): array
-    {
-        // $cached is not serialized, it should only be set
-        // upon first creation of the window.
-        return ['id', 'hitCount', 'intervalInSeconds', 'hitCountForLastWindow', 'windowEndAt'];
-    }
-
     public function getId(): string
     {
         return $this->id;
     }
 
     /**
-     * Store for the rest of this time frame and next.
+     * Returns the remaining of this timeframe and the next one.
      */
-    public function getExpirationTime(): ?int
+    public function getExpirationTime(): int
     {
-        if ($this->cached) {
-            return null;
-        }
-
-        return 2 * $this->intervalInSeconds;
+        return $this->windowEndAt + $this->intervalInSeconds - microtime(true);
     }
 
     public function isExpired(): bool
@@ -124,4 +104,25 @@ public function getRetryAfter(): \DateTimeImmutable
     {
         return \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', $this->windowEndAt));
     }
+
+    /**
+     * @internal
+     */
+    public function __serialize(): array
+    {
+        return [
+            pack('NNN', $this->hitCount, $this->hitCountForLastWindow, $this->intervalInSeconds).$this->id => $this->windowEndAt,
+        ];
+    }
+    /**
+     *
+     * @internal
+     */
+    public function __unserialize(array $data): void
+    {
+        $pack = key($data);
+        $this->windowEndAt = $data[$pack];
+        ['a' => $this->hitCount, 'b' => $this->hitCountForLastWindow, 'c' => $this->intervalInSeconds] = unpack('Na/Nb/Nc', $pack);
+        $this->id = substr($pack, 3);
+    }
 }
@@ -29,7 +29,7 @@ public function testGetExpirationTime()
 
         $data = serialize($window);
         $cachedWindow = unserialize($data);
-        $this->assertNull($cachedWindow->getExpirationTime());
+        $this->assertSame(2 * 10, $cachedWindow->getExpirationTime());
 
         $new = SlidingWindow::createFromPreviousWindow($cachedWindow, 15);
         $this->assertSame(2 * 15, $new->getExpirationTime());