[Messenger][Redis] Fix auth option wrongly considered invalid

chalasr · chalasr · commit 4b81d112e19c · 2021-07-18T15:21:00.000+02:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
@@ -191,17 +191,6 @@ public function testAuthFromOptionsAndDsn()
         Connection::fromDsn('redis://password1@localhost/queue', ['auth' => 'password2'], $redis);
     }
 
-    public function testAuthAsUserInDsn()
-    {
-        $redis = $this->createMock(\Redis::class);
-
-        $redis->expects($this->exactly(1))->method('auth')
-            ->with('password')
-            ->willReturn(true);
-
-        Connection::fromDsn('redis://password:localhost/queue', [], $redis);
-    }
-
     public function testNoAuthWithEmptyPassword()
     {
         $redis = $this->createMock(\Redis::class);
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -223,8 +223,9 @@ public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $re
 
     private static function validateOptions(array $options): void
     {
-        $availableOptions = array_keys(self::DEFAULT_OPTIONS);
+        $availableOptions = array_keys(self::DEFAULT_OPTIONS) + ['auth', 'serializer'];
         $availableOptions[] = 'serializer';
+        $availableOptions[] = 'auth';
 
         if (0 < \count($invalidOptions = array_diff(array_keys($options), $availableOptions))) {
             trigger_deprecation('symfony/messenger', '5.1', 'Invalid option(s) "%s" passed to the Redis Messenger transport. Passing invalid options is deprecated.', implode('", "', $invalidOptions));

Original file line number	Diff line number	Diff line change
`@@ -223,8 +223,9 @@ public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $re`
`223`	`223`
`224`	`224`	`private static function validateOptions(array $options): void`
`225`	`225`	`{`
`226`		`- $availableOptions = array_keys(self::DEFAULT_OPTIONS);`
	`226`	`+ $availableOptions = array_keys(self::DEFAULT_OPTIONS) + ['auth', 'serializer'];`
`227`	`227`	`$availableOptions[] = 'serializer';`
	`228`	`+ $availableOptions[] = 'auth';`
`228`	`229`
`229`	`230`	`if (0 < \count($invalidOptions = array_diff(array_keys($options), $availableOptions))) {`
`230`	`231`	`trigger_deprecation('symfony/messenger', '5.1', 'Invalid option(s) "%s" passed to the Redis Messenger transport. Passing invalid options is deprecated.', implode('", "', $invalidOptions));`