Merge branch '7.2' into 7.3

xabbuh · xabbuh · commit d867b1273343 · 2024-11-26T11:46:43.000+01:00
* 7.2:
  fix amphp/http-client 5 support
  fix test
  [Messenger] fix `Envelope::all()` conditional return docblock
diff --git a/src/Symfony/Component/HttpClient/Response/AmpResponseV5.php b/src/Symfony/Component/HttpClient/Response/AmpResponseV5.php
@@ -99,7 +99,8 @@ public function __construct(
         $onProgress = $options['on_progress'] ?? static function () {};
         $onProgress = $this->onProgress = static function () use (&$info, $onProgress, $resolve) {
             $info['total_time'] = microtime(true) - $info['start_time'];
-            $onProgress((int) $info['size_download'], ((int) (1 + $info['download_content_length']) ?: 1) - 1, (array) $info, $resolve);
+            $info['resolve'] = $resolve;
+            $onProgress((int) $info['size_download'], ((int) (1 + $info['download_content_length']) ?: 1) - 1, (array) $info);
         };
 
         $pause = 0.0;
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
@@ -111,7 +111,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
`@@ -111,7 +111,7 @@ public function last(string $stampFqcn): ?StampInterface`
`111`	`111`	`*`
`112`	`112`	`* @return StampInterface[]\|StampInterface[][] The stamps for the specified FQCN, or all stamps by their class name`
`113`	`113`	`*`
`114`		`- * @psalm-return ($stampFqcn is string : array<class-string<StampInterface>, list<StampInterface>> ? list<TStamp>)`
	`114`	`+ * @psalm-return ($stampFqcn is null ? array<class-string<StampInterface>, list<StampInterface>> : list<TStamp>)`
`115`	`115`	`*/`
`116`	`116`	`public function all(?string $stampFqcn = null): array`
`117`	`117`	`{`