Fix $auth check in RedisTrait

alexander-schranz · alexander-schranz · commit e8bcf5fb366a · 2020-08-10T14:52:24.000+02:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -182,7 +182,7 @@ public static function createConnection($dsn, array $options = [])
                         throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$error.'.');
                     }
 
-                    if ($auth && !$redis->auth($auth))
+                    if (($auth && !$redis->auth($auth))
                         || ($params['dbindex'] && !$redis->select($params['dbindex']))
                         || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
                     ) {
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
@@ -56,7 +56,7 @@ public function __construct(array $configuration, array $connectionCredentials =
         $this->connection->setOption(\Redis::OPT_SERIALIZER, $redisOptions['serializer'] ?? \Redis::SERIALIZER_PHP);
 
         $auth = $connectionCredentials['auth'] ?? null;
-        if (!$auth && !$this->connection->auth($auth)) {
+        if ($auth && !$this->connection->auth($auth)) {
             throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());
         }
 

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public static function createConnection($dsn, array $options = [])`
`182`	`182`	`throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$error.'.');`
`183`	`183`	`}`
`184`	`184`
`185`		`- if ($auth && !$redis->auth($auth))`
	`185`	`+ if (($auth && !$redis->auth($auth))`
`186`	`186`	`\|\| ($params['dbindex'] && !$redis->select($params['dbindex']))`
`187`	`187`	`\|\| ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))`
`188`	`188`	`) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function __construct(array $configuration, array $connectionCredentials =`
`56`	`56`	`$this->connection->setOption(\Redis::OPT_SERIALIZER, $redisOptions['serializer'] ?? \Redis::SERIALIZER_PHP);`
`57`	`57`
`58`	`58`	`$auth = $connectionCredentials['auth'] ?? null;`
`59`		`- if (!$auth && !$this->connection->auth($auth)) {`
	`59`	`+ if ($auth && !$this->connection->auth($auth)) {`
`60`	`60`	`throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());`
`61`	`61`	`}`
`62`	`62`