diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-08-25 13:39:41 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-08-25 13:39:41 +0300 |
| commit | 2d12ced897397a66853b3bc4b4fdac5b62c40bec (patch) | |
| tree | f74a50e6f5e2579af2c962892e91534725054c9d /vendor/guzzlehttp/promises/src/Utils.php | |
| parent | f7fc00326e2f51f269f26b24a54d34e07a36846e (diff) | |
| parent | 618cb5bf7830d90e670e8cd1fd114b06173ab374 (diff) | |
Merge branch 'feature/guzzle-7.10.0' into 'master'
Bump Guzzle to 7.10.0 for PHP 8.5 compatibility.
See merge request tt-rss/tt-rss!180
Diffstat (limited to 'vendor/guzzlehttp/promises/src/Utils.php')
| -rw-r--r-- | vendor/guzzlehttp/promises/src/Utils.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vendor/guzzlehttp/promises/src/Utils.php b/vendor/guzzlehttp/promises/src/Utils.php index 45b0893fc..3193d2a12 100644 --- a/vendor/guzzlehttp/promises/src/Utils.php +++ b/vendor/guzzlehttp/promises/src/Utils.php @@ -144,7 +144,9 @@ final class Utils $results[$idx] = $value; }, function ($reason, $idx, Promise $aggregate): void { - $aggregate->reject($reason); + if (Is::pending($aggregate)) { + $aggregate->reject($reason); + } } )->then(function () use (&$results) { ksort($results); |