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 | |
| 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')
| -rw-r--r-- | vendor/guzzlehttp/promises/CHANGELOG.md | 28 | ||||
| -rw-r--r-- | vendor/guzzlehttp/promises/README.md | 2 | ||||
| -rw-r--r-- | vendor/guzzlehttp/promises/composer.json | 2 | ||||
| -rw-r--r-- | vendor/guzzlehttp/promises/src/Utils.php | 4 |
4 files changed, 33 insertions, 3 deletions
diff --git a/vendor/guzzlehttp/promises/CHANGELOG.md b/vendor/guzzlehttp/promises/CHANGELOG.md index 707925a0b..7df9c0ae6 100644 --- a/vendor/guzzlehttp/promises/CHANGELOG.md +++ b/vendor/guzzlehttp/promises/CHANGELOG.md @@ -1,6 +1,34 @@ # CHANGELOG +## 2.3.0 - 2025-08-22 + +### Added + +- PHP 8.5 support + + +## 2.2.0 - 2025-03-27 + +### Fixed + +- Revert "Allow an empty EachPromise to be resolved by running the queue" + + +## 2.1.0 - 2025-03-27 + +### Added + +- Allow an empty EachPromise to be resolved by running the queue + + +## 2.0.4 - 2024-10-17 + +### Fixed + +- Once settled, don't allow further rejection of additional promises + + ## 2.0.3 - 2024-07-18 ### Changed diff --git a/vendor/guzzlehttp/promises/README.md b/vendor/guzzlehttp/promises/README.md index d1c814fe7..493a9315b 100644 --- a/vendor/guzzlehttp/promises/README.md +++ b/vendor/guzzlehttp/promises/README.md @@ -41,7 +41,7 @@ composer require guzzlehttp/promises | Version | Status | PHP Version | |---------|---------------------|--------------| | 1.x | Security fixes only | >=5.5,<8.3 | -| 2.x | Latest | >=7.2.5,<8.5 | +| 2.x | Latest | >=7.2.5,<8.6 | ## Quick Start diff --git a/vendor/guzzlehttp/promises/composer.json b/vendor/guzzlehttp/promises/composer.json index f64ed7714..9d6e85678 100644 --- a/vendor/guzzlehttp/promises/composer.json +++ b/vendor/guzzlehttp/promises/composer.json @@ -30,7 +30,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "autoload": { "psr-4": { 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); |