bug symfony#43124 [Messenger] [Redis] Allow authentication with user and password (GaryPEGEOT)

This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [Messenger] [Redis] Allow authentication with user and password | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tickets | | License | MIT | Doc PR | N/A Allow to authenticate on Redis with user **and** password, instead of only password Commits ------- 5a6bf50 [Messenger] [Redis] Allow authentication with user and password

Author: chalasr

src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php

@@ -113,15 +113,26 @@ public function testKeepGettingPendingMessages()
  $this->assertNotNull($connection->get());
  }
 
- public function testAuth()
+ /**
+ * @param string|array $expected
+ *
+ * @dataProvider provideAuthDsn
+ */
+ public function testAuth($expected, string $dsn)
  {
  $redis = $this->createMock(\Redis::class);
 
  $redis->expects($this->exactly(1))->method('auth')
- ->with('password')
+ ->with($expected)
  ->willReturn(true);
 
- Connection::fromDsn('redis://password@localhost/queue', [], $redis);
+ Connection::fromDsn($dsn, [], $redis);
+ }
+
+ public function provideAuthDsn(): \Generator
+ {
+ yield 'Password only' => ['password', 'redis://password@localhost/queue'];
+ yield 'User and password' => [['user', 'password'], 'redis://user:password@localhost/queue'];
  }
 
  public function testNoAuthWithEmptyPassword()

src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php

@@ -97,7 +97,8 @@ public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $re
  $connectionCredentials = [
  'host' => $parsedUrl['host'] ?? '127.0.0.1',
  'port' => $parsedUrl['port'] ?? 6379,
- 'auth' => $parsedUrl['pass'] ?? $parsedUrl['user'] ?? null,
+ // See: https://github.com/phpredis/phpredis/#auth
+ 'auth' => isset($parsedUrl['pass']) && isset($parsedUrl['user']) ? [$parsedUrl['user'], $parsedUrl['pass']] : $parsedUrl['pass'] ?? $parsedUrl['user'] ?? null,
  ];
 
  if (isset($parsedUrl['query'])) {