Small changes related to PHP 7

Author: willemstuursma

classes/mutex/FlockMutex.php

@@ -20,7 +20,7 @@
  */
 class FlockMutex extends LockMutex
 {
-    const INFINITE_TIMEOUT = -1;
+    public const INFINITE_TIMEOUT = -1;
 
     /**
      * @internal

classes/mutex/PredisMutex.php

@@ -52,7 +52,7 @@ protected function evalScript($client, string $script, int $numkeys, array $argu
     {
         /** @var ClientInterface $client */
         try {
-            return $client->eval(...array_merge([$script, $numkeys], $arguments));
+            return $client->eval($script, $numkeys, ...$arguments);
         } catch (PredisException $e) {
             $message = sprintf(
                 "Failed to release lock at %s",

classes/mutex/RedisMutex.php

@@ -126,18 +126,13 @@ protected function acquire(string $key, int $expire): bool
 
     protected function release(string $key): bool
     {
-        /*
-         * Question for Redis: Why do I have to try to delete also keys
-         * which I haven't acquired? I do observe collisions of the random
-         * token, which results in releasing the wrong key.
-         */
-
         /*
          * All Redis commands must be analyzed before execution to determine which keys the command will operate on. In
          * order for this to be true for EVAL, keys must be passed explicitly.
+         *
+         * @link https://redis.io/commands/set
          */
-        $script = '
-            if redis.call("get",KEYS[1]) == ARGV[1] then
+        $script = 'if redis.call("get",KEYS[1]) == ARGV[1] then
                 return redis.call("del",KEYS[1])
             else
                 return 0

tests/mutex/MutexConcurrencyTest.php

@@ -53,7 +53,7 @@ protected function tearDown()
      *
      * @return \PDO The PDO.
      */
-    private function getPDO($dsn, $user): \PDO
+    private function getPDO(string $dsn, string $user): \PDO
     {
         if ($this->pdo === null) {
             $this->pdo = new \PDO($dsn, $user);