bug symfony#38358 [Messenger] Fix redis connection error message (alexander-schranz)

nicolas-grekas · nicolas-grekas · commit 8731a4fc0e4d · 2020-09-30T18:06:36.000+02:00
This PR was submitted for the 4.3 branch but it was merged into the 4.4 branch instead. Discussion ---------- [Messenger] Fix redis connection error message Use correct instance of redis to getLastError | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Fix #... | License | MIT | Doc PR | symfony/symfony-docs#...  The `$redis` is only set in the tests, the correct redis instance is available under `$this->connection`. Reproduce: give a false `AUTH` to the redis: Before: > [Error] > Call to a member function getLastError() on null Now: > [Symfony\Component\Messenger\Exception\InvalidArgumentException] > Redis connection failed: ERR Client sent AUTH, but no password is set Commits ------- f4e42ad Fix redis connection error message
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
@@ -61,11 +61,11 @@ public function __construct(array $configuration, array $connectionCredentials =
         }
 
         if (null !== $auth && !$this->connection->auth($auth)) {
-            throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());
+            throw new InvalidArgumentException('Redis connection failed: '.$this->connection->getLastError());
         }
 
         if (($dbIndex = $configuration['dbindex'] ?? self::DEFAULT_OPTIONS['dbindex']) && !$this->connection->select($dbIndex)) {
-            throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());
+            throw new InvalidArgumentException('Redis connection failed: '.$this->connection->getLastError());
         }
 
         foreach (['stream', 'group', 'consumer'] as $key) {

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,11 @@ public function __construct(array $configuration, array $connectionCredentials =`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`if (null !== $auth && !$this->connection->auth($auth)) {`
`64`		`- throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());`
	`64`	`+ throw new InvalidArgumentException('Redis connection failed: '.$this->connection->getLastError());`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (($dbIndex = $configuration['dbindex'] ?? self::DEFAULT_OPTIONS['dbindex']) && !$this->connection->select($dbIndex)) {`
`68`		`- throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());`
	`68`	`+ throw new InvalidArgumentException('Redis connection failed: '.$this->connection->getLastError());`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`foreach (['stream', 'group', 'consumer'] as $key) {`