Redis: change to int keys because of type confusion between set and script

Author: willemstuursma

classes/mutex/PHPRedisMutex.php

@@ -37,7 +37,7 @@ public function __construct(array $redisAPIs, string $name, int $timeout = 3)
         parent::__construct($redisAPIs, $name, $timeout);
     }
 
-    protected function add($redis, string $key, string $value, int $expire): bool
+    protected function add($redis, string $key, int $value, int $expire): bool
     {
         /** @var Redis $redis */
         try {

classes/mutex/PredisMutex.php

@@ -33,7 +33,7 @@ public function __construct(array $clients, string $name, int $timeout = 3)
         parent::__construct($clients, $name, $timeout);
     }
 
-    protected function add($client, string $key, string $value, int $expire): bool
+    protected function add($client, string $key, int $value, int $expire): bool
     {
         /** @var ClientInterface $client */
         try {
@@ -61,7 +61,7 @@ protected function evalScript($client, string $script, int $numkeys, array $argu
             throw new LockReleaseException($message, 0, $e);
         }
     }
-    
+
     /**
      * @internal
      */

classes/mutex/RedisMutex.php

@@ -186,7 +186,7 @@ private function isMajority(int $count): bool
      * @throws LockAcquireException An unexpected error happened.
      * @internal
      */
-    abstract protected function add($redisAPI, string $key, string $value, int $expire): bool;
+    abstract protected function add($redisAPI, string $key, int $value, int $expire): bool;
 
     /**
      * @param mixed  $redisAPI The connected Redis API.

tests/mutex/MutexConcurrencyTest.php

@@ -268,39 +268,37 @@ public function provideMutexFactories()
             }];
         }
 
-        if (getenv("REDIS_URIS") && PHP_VERSION >= "7") {
-            $uris = explode(",", getenv("REDIS_URIS"));
-
-            $cases["PredisMutex"] = [function ($timeout = 3) use ($uris): Mutex {
-                $clients = array_map(
-                    function ($uri) {
-                        return new Client($uri);
-                    },
-                    $uris
-                );
-                return new PredisMutex($clients, "test", $timeout);
-            }];
+        $uris = getenv("REDIS_URIS") !== false ? explode(",", getenv("REDIS_URIS")) : ["redis://localhost:6379"];
 
-            $cases["PHPRedisMutex"] = [function ($timeout = 3) use ($uris): Mutex {
-                /** @var Redis[] $apis */
-                $apis = array_map(
-                    function (string $uri): Redis {
-                        $redis = new Redis();
-                        
-                        $uri = parse_url($uri);
-                        if (!empty($uri["port"])) {
-                            $redis->connect($uri["host"], $uri["port"]);
-                        } else {
-                            $redis->connect($uri["host"]);
-                        }
-                        
-                        return $redis;
-                    },
-                    $uris
-                );
-                return new PHPRedisMutex($apis, "test", $timeout);
-            }];
-        }
+        $cases["PredisMutex"] = [function ($timeout = 3) use ($uris): Mutex {
+            $clients = array_map(
+                function ($uri) {
+                    return new Client($uri);
+                },
+                $uris
+            );
+            return new PredisMutex($clients, "test", $timeout);
+        }];
+
+        $cases["PHPRedisMutex"] = [function ($timeout = 3) use ($uris): Mutex {
+            /** @var Redis[] $apis */
+            $apis = array_map(
+                function (string $uri): Redis {
+                    $redis = new Redis();
+
+                    $uri = parse_url($uri);
+                    if (!empty($uri["port"])) {
+                        $redis->connect($uri["host"], $uri["port"]);
+                    } else {
+                        $redis->connect($uri["host"]);
+                    }
+
+                    return $redis;
+                },
+                $uris
+            );
+            return new PHPRedisMutex($apis, "test", $timeout);
+        }];
 
         if (getenv("MYSQL_DSN")) {
             $cases["MySQLMutex"] = [function ($timeout = 3): Mutex {