Skip to content

[Messenger] Fix Redis messenger scheme comparison #52930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Jan 2, 2024
Merged

[Messenger] Fix Redis messenger scheme comparison #52930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransportFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:');
}
}