Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit c6c8020f2f2d · 2021-09-08T18:57:33.000+02:00
* 5.3:
  [Messenger] Support rediss in transport bridge
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportFactoryTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportFactoryTest.php
@@ -27,6 +27,7 @@ public function testSupportsOnlyRedisTransports()
         $factory = new RedisTransportFactory();
 
         $this->assertTrue($factory->supports('redis://localhost', []));
+        $this->assertTrue($factory->supports('rediss://localhost', []));
         $this->assertFalse($factory->supports('sqs://localhost', []));
         $this->assertFalse($factory->supports('invalid-dsn', []));
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransportFactory.php
@@ -30,7 +30,7 @@ public function createTransport(string $dsn, array $options, SerializerInterface
 
     public function supports(string $dsn, array $options): bool
     {
-        return 0 === strpos($dsn, 'redis://');
+        return 0 === strpos($dsn, 'redis://') || 0 === strpos($dsn, 'rediss://');
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public function testSupportsOnlyRedisTransports()`
`27`	`27`	`$factory = new RedisTransportFactory();`
`28`	`28`
`29`	`29`	`$this->assertTrue($factory->supports('redis://localhost', []));`
	`30`	`+ $this->assertTrue($factory->supports('rediss://localhost', []));`
`30`	`31`	`$this->assertFalse($factory->supports('sqs://localhost', []));`
`31`	`32`	`$this->assertFalse($factory->supports('invalid-dsn', []));`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function createTransport(string $dsn, array $options, SerializerInterface`
`30`	`30`
`31`	`31`	`public function supports(string $dsn, array $options): bool`
`32`	`32`	`{`
`33`		`- return 0 === strpos($dsn, 'redis://');`
	`33`	`+ return 0 === strpos($dsn, 'redis://') \|\| 0 === strpos($dsn, 'rediss://');`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`