Fix bad merge

nicolas-grekas · nicolas-grekas · commit 7b3ce516a8b0 · 2021-07-07T15:13:40.000+02:00
diff --git a/src/Symfony/Component/Semaphore/Store/RedisStore.php b/src/Symfony/Component/Semaphore/Store/RedisStore.php
@@ -32,15 +32,15 @@ class RedisStore implements PersistingStoreInterface
     private $redis;
 
     /**
-     * @param \Redis|\RedisArray|\RedisCluster|\RedisClusterProxy|\Predis\ClientInterface $redisClient
+     * @param \Redis|\RedisArray|\RedisCluster|\RedisClusterProxy|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis
      */
-    public function __construct($redisClient)
+    public function __construct($redis)
     {
-        if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\ClientInterface && !$redisClient instanceof RedisProxy && !$redisClient instanceof RedisClusterProxy) {
-            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)));
+        if (!$redis instanceof \Redis && !$redis instanceof \RedisArray && !$redis instanceof \RedisCluster && !$redis instanceof \Predis\ClientInterface && !$redis instanceof RedisProxy && !$redis instanceof RedisClusterProxy) {
+            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)));
         }
 
-        $this->redis = $redisClient;
+        $this->redis = $redis;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,15 @@ class RedisStore implements PersistingStoreInterface`
`32`	`32`	`private $redis;`
`33`	`33`
`34`	`34`	`/**`
`35`		`- * @param \Redis\|\RedisArray\|\RedisCluster\|\RedisClusterProxy\|\Predis\ClientInterface $redisClient`
	`35`	`+ * @param \Redis\|\RedisArray\|\RedisCluster\|\RedisClusterProxy\|\Predis\ClientInterface\|RedisProxy\|RedisClusterProxy $redis`
`36`	`36`	`*/`
`37`		`- public function __construct($redisClient)`
	`37`	`+ public function __construct($redis)`
`38`	`38`	`{`
`39`		`- if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\ClientInterface && !$redisClient instanceof RedisProxy && !$redisClient instanceof RedisClusterProxy) {`
`40`		`- 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)));`
	`39`	`+ if (!$redis instanceof \Redis && !$redis instanceof \RedisArray && !$redis instanceof \RedisCluster && !$redis instanceof \Predis\ClientInterface && !$redis instanceof RedisProxy && !$redis instanceof RedisClusterProxy) {`
	`40`	`+ 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)));`
`41`	`41`	`}`
`42`	`42`
`43`		`- $this->redis = $redisClient;`
	`43`	`+ $this->redis = $redis;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`