fix redis messenger scheme comparison

Frederik Schwan · Frederik Schwan · commit 6f4e0a401bcd · 2024-01-02T14:11:03.000+01:00
Commit 3380518 introduced a new Redis Sentinel DSN for the redis messenger transport which uses a scheme syntax like `redis:?host[rs:1234]&host[rs2:1234]`. Though, the coresponding factory only supports schemes which start with `redis://` or `rediss://` which renders the redis sentinel features for the messenger unusable. This commit fixes the supported schemes by removing the `//` portion of them. fixes #52899
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportFactoryTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportFactoryTest.php
@@ -28,22 +28,48 @@ public function testSupportsOnlyRedisTransports()
 
         $this->assertTrue($factory->supports('redis://localhost', []));
         $this->assertTrue($factory->supports('rediss://localhost', []));
+        $this->assertTrue($factory->supports('redis:?host[host1:5000]&host[host2:5000]&host[host3:5000]&sentinel_master=test&dbindex=0', []));
         $this->assertFalse($factory->supports('sqs://localhost', []));
         $this->assertFalse($factory->supports('invalid-dsn', []));
     }
 
     /**
      * @group integration
+     *
+     * @dataProvider createTransportProvider
      */
-    public function testCreateTransport()
+    public function testCreateTransport(string $dsn, array $options = [])
     {
         $this->skipIfRedisUnavailable();
 
         $factory = new RedisTransportFactory();
         $serializer = $this->createMock(SerializerInterface::class);
-        $expectedTransport = new RedisTransport(Connection::fromDsn('redis://'.getenv('REDIS_HOST'), ['stream' => 'bar', 'delete_after_ack' => true]), $serializer);
 
-        $this->assertEquals($expectedTransport, $factory->createTransport('redis://'.getenv('REDIS_HOST'), ['stream' => 'bar', 'delete_after_ack' => true], $serializer));
+        $this->assertEquals(
+            new RedisTransport(Connection::fromDsn($dsn, $options), $serializer),
+            $factory->createTransport($dsn, $options, $serializer)
+        );
+    }
+
+    /**
+     * @return iterable<array{0: string, 1: array}>
+     */
+    public static function createTransportProvider(): iterable
+    {
+        yield 'scheme "redis" without options' => [
+            'redis://'.getenv('REDIS_HOST'),
+            [],
+        ];
+
+        yield 'scheme "redis" with options' => [
+            'redis://'.getenv('REDIS_HOST'),
+            ['stream' => 'bar', 'delete_after_ack' => true],
+        ];
+
+        yield 'redis_sentinel' => [
+            'redis:?host['.str_replace(' ', ']&host[', getenv('REDIS_SENTINEL_HOSTS')).']',
+            ['sentinel_master' => getenv('REDIS_SENTINEL_SERVICE')],
+        ];
     }
 
     private function skipIfRedisUnavailable()
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransportFactory.php
@@ -32,6 +32,6 @@ public function createTransport(#[\SensitiveParameter] string $dsn, array $optio
 
     public function supports(#[\SensitiveParameter] string $dsn, array $options): bool
     {
-        return str_starts_with($dsn, 'redis://') || str_starts_with($dsn, 'rediss://');
+        return str_starts_with($dsn, 'redis:') || str_starts_with($dsn, 'rediss:');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@ public function createTransport(#[\SensitiveParameter] string $dsn, array $optio`
`32`	`32`
`33`	`33`	`public function supports(#[\SensitiveParameter] string $dsn, array $options): bool`
`34`	`34`	`{`
`35`		`- return str_starts_with($dsn, 'redis://') \|\| str_starts_with($dsn, 'rediss://');`
	`35`	`+ return str_starts_with($dsn, 'redis:') \|\| str_starts_with($dsn, 'rediss:');`
`36`	`36`	`}`
`37`	`37`	`}`