[Messenger] Add rediss:// DSN scheme support for TLS to Redis transport

Author: njutn95

CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+5.3
+---
+
+ * Add `rediss://` DSN scheme support for TLS protocol
+ * Deprecate TLS option, use `rediss://127.0.0.1` instead of `redis://127.0.0.1?tls=1`
+
 5.2.0
 -----
 

Tests/Transport/ConnectionTest.php

@@ -86,6 +86,9 @@ public function testFromDsnWithOptionsAndTrailingSlash()
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testFromDsnWithTls()
     {
         $redis = $this->createMock(\Redis::class);
@@ -97,6 +100,9 @@ public function testFromDsnWithTls()
         Connection::fromDsn('redis://127.0.0.1?tls=1', [], $redis);
     }
 
+    /**
+     * @group legacy
+     */
     public function testFromDsnWithTlsOption()
     {
         $redis = $this->createMock(\Redis::class);
@@ -108,6 +114,17 @@ public function testFromDsnWithTlsOption()
         Connection::fromDsn('redis://127.0.0.1', ['tls' => true], $redis);
     }
 
+    public function testFromDsnWithRedissScheme()
+    {
+        $redis = $this->createMock(\Redis::class);
+        $redis->expects($this->once())
+            ->method('connect')
+            ->with('tls://127.0.0.1', 6379)
+            ->willReturn(null);
+
+        Connection::fromDsn('rediss://127.0.0.1', [], $redis);
+    }
+
     public function testFromDsnWithQueryOptions()
     {
         $this->assertEquals(

Transport/Connection.php

@@ -119,9 +119,10 @@ public function __construct(array $configuration, array $connectionCredentials =
     public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $redis = null): self
     {
         $url = $dsn;
+        $scheme = 0 === strpos($dsn, 'rediss:') ? 'rediss' : 'redis';
 
-        if (preg_match('#^redis:///([^:@])+$#', $dsn)) {
-            $url = str_replace('redis:', 'file:', $dsn);
+        if (preg_match('#^'.$scheme.':///([^:@])+$#', $dsn)) {
+            $url = str_replace($scheme.':', 'file:', $dsn);
         }
 
         if (false === $parsedUrl = parse_url($url)) {
@@ -164,8 +165,9 @@ public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $re
             unset($redisOptions['dbindex']);
         }
 
-        $tls = false;
+        $tls = 'rediss' === $scheme;
         if (\array_key_exists('tls', $redisOptions)) {
+            trigger_deprecation('symfony/redis-messenger', '5.3', 'Providing "tls" parameter is deprecated, use "rediss://" DSN scheme instead');
             $tls = filter_var($redisOptions['tls'], \FILTER_VALIDATE_BOOLEAN);
             unset($redisOptions['tls']);
         }