Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 1737eaaef50a · 2021-07-07T15:14:58.000+02:00
* 5.4:
  Fix bad merge
diff --git a/Store/RedisStore.php b/Store/RedisStore.php
@@ -38,7 +38,7 @@ class RedisStore implements SharedLockStoreInterface
     /**
      * @param float $initialTtl The expiration delay of locks in seconds
      */
-    public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redisClient, float $initialTtl = 300.0)
+    public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis, float $initialTtl = 300.0)
     {
         if ($initialTtl <= 0) {
             throw new InvalidTtlException(sprintf('"%s()" expects a strictly positive TTL. Got %d.', __METHOD__, $initialTtl));

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class RedisStore implements SharedLockStoreInterface`
`38`	`38`	`/**`
`39`	`39`	`* @param float $initialTtl The expiration delay of locks in seconds`
`40`	`40`	`*/`
`41`		`- public function __construct(\Redis\|\RedisArray\|\RedisCluster\|\Predis\ClientInterface\|RedisProxy\|RedisClusterProxy $redisClient, float $initialTtl = 300.0)`
	`41`	`+ public function __construct(\Redis\|\RedisArray\|\RedisCluster\|\Predis\ClientInterface\|RedisProxy\|RedisClusterProxy $redis, float $initialTtl = 300.0)`
`42`	`42`	`{`
`43`	`43`	`if ($initialTtl <= 0) {`
`44`	`44`	`throw new InvalidTtlException(sprintf('"%s()" expects a strictly positive TTL. Got %d.', __METHOD__, $initialTtl));`