Store millisecond timestamps as float instead of int to prevent int overflow issues on 32 bit based systems. Issue #43860

maartendekeizer · maartendekeizer · commit a65fdf08194f · 2021-12-27T11:22:25.000+01:00
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
@@ -248,7 +248,7 @@ public function reject(string $id): void
         }
     }
 
-    public function add(string $body, array $headers, int $delayInMs = 0): void
+    public function add(string $body, array $headers, float $delayInMs = 0): void
     {
         if ($this->autoSetup) {
             $this->setup();
@@ -267,7 +267,7 @@ public function add(string $body, array $headers, int $delayInMs = 0): void
                     throw new TransportException(json_last_error_msg());
                 }
 
-                $score = $this->getCurrentTimeInMilliseconds() + $delayInMs;
+                $score = $this->getCurrentTimeInMilliseconds() + (float) $delayInMs;
                 $added = $this->connection->zadd($this->queue, ['NX'], $score, $message);
             } else {
                 $message = json_encode([
@@ -316,9 +316,9 @@ public function setup(): void
         $this->autoSetup = false;
     }
 
-    private function getCurrentTimeInMilliseconds(): int
+    private function getCurrentTimeInMilliseconds(): float
     {
-        return (int) (microtime(true) * 1000);
+        return microtime(true) * (float) 1000;
     }
 
     public function cleanup(): void
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/RedisSender.php b/src/Symfony/Component/Messenger/Transport/RedisExt/RedisSender.php
@@ -42,7 +42,7 @@ public function send(Envelope $envelope): Envelope
         $delayStamp = $envelope->last(DelayStamp::class);
         $delayInMs = null !== $delayStamp ? $delayStamp->getDelay() : 0;
 
-        $this->connection->add($encodedMessage['body'], $encodedMessage['headers'] ?? [], $delayInMs);
+        $this->connection->add($encodedMessage['body'], $encodedMessage['headers'] ?? [], (float) $delayInMs);
 
         return $envelope;
     }

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ public function reject(string $id): void`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`
`251`		`- public function add(string $body, array $headers, int $delayInMs = 0): void`
	`251`	`+ public function add(string $body, array $headers, float $delayInMs = 0): void`
`252`	`252`	`{`
`253`	`253`	`if ($this->autoSetup) {`
`254`	`254`	`$this->setup();`
`@@ -267,7 +267,7 @@ public function add(string $body, array $headers, int $delayInMs = 0): void`
`267`	`267`	`throw new TransportException(json_last_error_msg());`
`268`	`268`	`}`
`269`	`269`
`270`		`- $score = $this->getCurrentTimeInMilliseconds() + $delayInMs;`
	`270`	`+ $score = $this->getCurrentTimeInMilliseconds() + (float) $delayInMs;`
`271`	`271`	`$added = $this->connection->zadd($this->queue, ['NX'], $score, $message);`
`272`	`272`	`} else {`
`273`	`273`	`$message = json_encode([`
`@@ -316,9 +316,9 @@ public function setup(): void`
`316`	`316`	`$this->autoSetup = false;`
`317`	`317`	`}`
`318`	`318`
`319`		`- private function getCurrentTimeInMilliseconds(): int`
	`319`	`+ private function getCurrentTimeInMilliseconds(): float`
`320`	`320`	`{`
`321`		`- return (int) (microtime(true) * 1000);`
	`321`	`+ return microtime(true) * (float) 1000;`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`public function cleanup(): void`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function send(Envelope $envelope): Envelope`
`42`	`42`	`$delayStamp = $envelope->last(DelayStamp::class);`
`43`	`43`	`$delayInMs = null !== $delayStamp ? $delayStamp->getDelay() : 0;`
`44`	`44`
`45`		`- $this->connection->add($encodedMessage['body'], $encodedMessage['headers'] ?? [], $delayInMs);`
	`45`	`+ $this->connection->add($encodedMessage['body'], $encodedMessage['headers'] ?? [], (float) $delayInMs);`
`46`	`46`
`47`	`47`	`return $envelope;`
`48`	`48`	`}`