Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5a9aba6

Browse filesBrowse files
committed
Merge branch '6.4' into 7.1
* 6.4: fix test [Messenger] fix `Envelope::all()` conditional return docblock
2 parents 1343e01 + 403a9c3 commit 5a9aba6
Copy full SHA for 5a9aba6

File tree

Expand file treeCollapse file tree

2 files changed

+7
-5
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+7
-5
lines changed

‎src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportFactoryTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportFactoryTest.php
+6-4Lines changed: 6 additions & 4 deletions
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()

‎src/Symfony/Component/Messenger/Envelope.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Envelope.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function last(string $stampFqcn): ?StampInterface
112112
*
113113
* @return StampInterface[]|StampInterface[][] The stamps for the specified FQCN, or all stamps by their class name
114114
*
115-
* @psalm-return ($stampFqcn is string : array<class-string<StampInterface>, list<StampInterface>> ? list<TStamp>)
115+
* @psalm-return ($stampFqcn is null ? array<class-string<StampInterface>, list<StampInterface>> : list<TStamp>)
116116
*/
117117
public function all(?string $stampFqcn = null): array
118118
{

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.