Fix PhpRedis session tests to soften timing issues

Rework the session locking unit tests to be less reliant on arbitrary
sleep calls which can be very troublesome when running in Travis and
especially when running in Travis under valgrind.

Additionally, skip multiple newly added Redis 6.2 commands that aren't
yet implemented in RedisCluster.

Author: michael-grunder

tests/RedisClusterTest.php

@@ -49,6 +49,13 @@ public function testConnectException() { return $this->markTestSkipped(); }
     public function testTlsConnect() { return $this->markTestSkipped(); }
     public function testInvalidAuthArgs() { return $this->markTestSkipped(); }
 
+    public function testlMove() { return $this->markTestSkipped(); }
+    public function testsMisMember() { return $this->markTestSkipped(); }
+    public function testzDiff() { return $this->markTestSkipped(); }
+    public function testzDiffStore() { return $this->markTestSkipped(); }
+    public function testzMscore() { return $this->marktestSkipped(); }
+    public function testCopy() { return $this->marktestSkipped(); }
+
     /* Session locking feature is currently not supported in in context of Redis Cluster.
        The biggest issue for this is the distribution nature of Redis cluster */
     public function testSession_lockKeyCorrect() { return $this->markTestSkipped(); }

tests/RedisTest.php

@@ -6345,9 +6345,8 @@ public function testSession_lockKeyCorrect()
                     ini_get('redis.session.lock_retries') /
                     1000000.00);
 
-        $exist = $this->waitForSessionLockKey($sessionId, $maxwait + 1);
+        $exist = $this->waitForSessionLockKey($sessionId, $maxwait);
         $this->assertTrue($exist);
-        $this->redis->del($this->sessionPrefix . $sessionId . '_LOCK');
     }
 
     public function testSession_lockingDisabledByDefault()
@@ -6372,7 +6371,8 @@ public function testSession_lockReleasedOnClose()
         $this->setSessionHandler();
         $sessionId = $this->generateSessionId();
         $this->startSessionProcess($sessionId, 1, true);
-        $this->waitForProcess('startSession.php', 5);
+        $sleep = ini_get('redis.session.lock_wait_time') * ini_get('redis.session.lock_retries');
+        usleep($sleep + 10000);
         $this->assertFalse($this->redis->exists($this->sessionPrefix . $sessionId . '_LOCK'));
     }
 
@@ -6465,7 +6465,6 @@ public function testSession_defaultLockRetryCount()
         }
 
         $start = microtime(true);
-        $sessionSuccessful = $this->startSessionProcess($sessionId, 0, false, 10, true, 200000, 0);
         $end = microtime(true);
         $elapsedTime = $end - $start;
 
@@ -6844,7 +6843,7 @@ private function regenerateSessionId($sessionId, $locking = false, $destroyPrevi
      *
      * @return string
      */
-    private function getPhpCommand($script)
+    private static function getPhpCommand($script)
     {
         static $cmd = NULL;