Fix null being used for Redis connect timeout (#2)

HealthengineAU · Nov 10, 2023 · 6e9677c · 6e9677c
1 parent a63cb17
commit 6e9677c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/lib/Resque/Redis.php b/lib/Resque/Redis.php
@@ -129,7 +129,7 @@ public function __construct($server, $database = null, $client = null)
                 // $user is not used, only $password
 
                 // Look for known Redis options
-                $timeout = isset($options['timeout']) ? intval($options['timeout']) : null;
+                $timeout = isset($options['timeout']) ? floatval($options['timeout']) : null;
                 $persistent = isset($options['persistent']) ? $options['persistent'] : '';
                 $maxRetries = isset($options['max_connect_retries']) ? $options['max_connect_retries'] : 0;
 
@@ -143,9 +143,9 @@ public function __construct($server, $database = null, $client = null)
 
                     try {
                         if (is_string($persistent) && trim($persistent) !== '') {
-                            $connected = $redis->pconnect($host, $port, $timeout, $persistent);
+                            $connected = $redis->pconnect($host, $port, $timeout ?? 0.0, $persistent);
                         } else {
-                            $connected = $redis->connect($host, $port, $timeout);
+                            $connected = $redis->connect($host, $port, $timeout ?? 0.0);
                         }
                     } catch (\RedisException $e) {
                         $lastException = $e;

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -715,16 +715,6 @@ parameters:
 			count: 2
 			path: lib/Resque/Redis.php
 
-		-
-			message: "#^Parameter \\#3 \\$timeout of method Redis\\:\\:connect\\(\\) expects float, int\\|null given\\.$#"
-			count: 1
-			path: lib/Resque/Redis.php
-
-		-
-			message: "#^Parameter \\#3 \\$timeout of method Redis\\:\\:pconnect\\(\\) expects float, int\\|null given\\.$#"
-			count: 1
-			path: lib/Resque/Redis.php
-
 		-
 			message: "#^Property Resque_Redis\\:\\:\\$keyCommands type has no value type specified in iterable type array\\.$#"
 			count: 1