Skip to content

Commit 8513247

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: fix test [Messenger] fix `Envelope::all()` conditional return docblock
2 parents ee27680 + f0b9704 commit 8513247

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Tests/Transport/RedisTransportFactoryTest.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ public static function createTransportProvider(): iterable
6666
['stream' => 'bar', 'delete_after_ack' => true],
6767
];
6868

69-
yield 'redis_sentinel' => [
70-
'redis:?host['.str_replace(' ', ']&host[', getenv('REDIS_SENTINEL_HOSTS')).']',
71-
['sentinel_master' => getenv('REDIS_SENTINEL_SERVICE')],
72-
];
69+
if (false !== getenv('REDIS_SENTINEL_HOSTS') && false !== getenv('REDIS_SENTINEL_SERVICE')) {
70+
yield 'redis_sentinel' => [
71+
'redis:?host['.str_replace(' ', ']&host[', getenv('REDIS_SENTINEL_HOSTS')).']',
72+
['sentinel_master' => getenv('REDIS_SENTINEL_SERVICE')],
73+
];
74+
}
7375
}
7476

7577
private function skipIfRedisUnavailable()

0 commit comments

Comments
 (0)