Skip to content

Commit a7558ba

Browse files
Merge branch '4.4' into 5.2
* 4.4: [Cache] backport type fixes
2 parents 0ff2b23 + 7bc1806 commit a7558ba

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Store/RedisStore.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@ class RedisStore implements SharedLockStoreInterface
3737
private $supportTime;
3838

3939
/**
40-
* @param \Redis|\RedisArray|\RedisCluster|RedisProxy|RedisClusterProxy|\Predis\ClientInterface $redisClient
41-
* @param float $initialTtl the expiration delay of locks in seconds
40+
* @param \Redis|\RedisArray|\RedisCluster|RedisProxy|RedisClusterProxy|\Predis\ClientInterface $redis
41+
* @param float $initialTtl The expiration delay of locks in seconds
4242
*/
43-
public function __construct($redisClient, float $initialTtl = 300.0)
43+
public function __construct($redis, float $initialTtl = 300.0)
4444
{
45-
if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\ClientInterface && !$redisClient instanceof RedisProxy && !$redisClient instanceof RedisClusterProxy) {
46-
throw new InvalidArgumentException(sprintf('"%s()" expects parameter 1 to be Redis, RedisArray, RedisCluster, RedisProxy, RedisClusterProxy or Predis\ClientInterface, "%s" given.', __METHOD__, get_debug_type($redisClient)));
45+
if (!$redis instanceof \Redis && !$redis instanceof \RedisArray && !$redis instanceof \RedisCluster && !$redis instanceof \Predis\ClientInterface && !$redis instanceof RedisProxy && !$redis instanceof RedisClusterProxy) {
46+
throw new InvalidArgumentException(sprintf('"%s()" expects parameter 1 to be Redis, RedisArray, RedisCluster, RedisProxy, RedisClusterProxy or Predis\ClientInterface, "%s" given.', __METHOD__, get_debug_type($redis)));
4747
}
4848

4949
if ($initialTtl <= 0) {
5050
throw new InvalidTtlException(sprintf('"%s()" expects a strictly positive TTL. Got %d.', __METHOD__, $initialTtl));
5151
}
5252

53-
$this->redis = $redisClient;
53+
$this->redis = $redis;
5454
$this->initialTtl = $initialTtl;
5555
}
5656

0 commit comments

Comments
 (0)