Merge branch '6.4' into 7.1

xabbuh · xabbuh · commit 5a9aba69ab03 · 2024-11-26T10:50:51.000+01:00
* 6.4:
  fix test
  [Messenger] fix `Envelope::all()` conditional return docblock
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportFactoryTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportFactoryTest.php
@@ -66,10 +66,12 @@ public static function createTransportProvider(): iterable
             ['stream' => 'bar', 'delete_after_ack' => true],
         ];
 
-        yield 'redis_sentinel' => [
-            'redis:?host['.str_replace(' ', ']&host[', getenv('REDIS_SENTINEL_HOSTS')).']',
-            ['sentinel_master' => getenv('REDIS_SENTINEL_SERVICE')],
-        ];
+        if (false !== getenv('REDIS_SENTINEL_HOSTS') && false !== getenv('REDIS_SENTINEL_SERVICE')) {
+            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/Envelope.php b/src/Symfony/Component/Messenger/Envelope.php
@@ -112,7 +112,7 @@ public function last(string $stampFqcn): ?StampInterface
      *
      * @return StampInterface[]|StampInterface[][] The stamps for the specified FQCN, or all stamps by their class name
      *
-     * @psalm-return ($stampFqcn is string : array<class-string<StampInterface>, list<StampInterface>> ? list<TStamp>)
+     * @psalm-return ($stampFqcn is null ? array<class-string<StampInterface>, list<StampInterface>> : list<TStamp>)
      */
     public function all(?string $stampFqcn = null): array
     {

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function last(string $stampFqcn): ?StampInterface`
`112`	`112`	`*`
`113`	`113`	`* @return StampInterface[]\|StampInterface[][] The stamps for the specified FQCN, or all stamps by their class name`
`114`	`114`	`*`
`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>)`
`116`	`116`	`*/`
`117`	`117`	`public function all(?string $stampFqcn = null): array`
`118`	`118`	`{`