Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix issue with progress callback order
  • Loading branch information
WendellAdriel committed Sep 16, 2025
commit 7a0052f1ccc900fc92b4dffeac9248501697332c
54 changes: 34 additions & 20 deletions src/Illuminate/Http/Client/Batch.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Carbon\CarbonImmutable;
use Closure;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Promise\EachPromise;
use GuzzleHttp\Promise\Utils as PromiseUtils;
use GuzzleHttp\Utils;

Expand Down Expand Up @@ -359,34 +360,47 @@ public function send(): array
default => $item,
};

$promise->then(function ($result) use ($key, &$results, $progressCallback, $catchCallback) {
$results[$key] = $result;
$this->decrementPendingRequests();
$promises[$key] = $promise;
}

if ($result instanceof Response && $result->successful()) {
if ($progressCallback !== null) {
$progressCallback($this, $key, $result);
}
if (! empty($promises)) {
(new EachPromise($promises, [
'fulfilled' => function ($result, $key) use (&$results, $progressCallback, $catchCallback) {
$results[$key] = $result;
$this->decrementPendingRequests();

return $result;
}
if ($result instanceof Response && $result->successful()) {
if ($progressCallback !== null) {
$progressCallback($this, $key, $result);
}

return $result;
}

if (($result instanceof Response && $result->failed()) || $result instanceof RequestException) {
$this->incrementFailedRequests();
if (($result instanceof Response && $result->failed()) || $result instanceof RequestException) {
$this->incrementFailedRequests();

if ($catchCallback !== null) {
$catchCallback($this, $key, $result);
if ($catchCallback !== null) {
$catchCallback($this, $key, $result);
}
}
}

return $result;
});
return $result;
},
'rejected' => function ($reason, $key) use (&$results, $catchCallback) {
$this->decrementPendingRequests();

$promises[$key] = $promise;
}
if ($reason instanceof RequestException) {
$this->incrementFailedRequests();

if (! empty($promises)) {
PromiseUtils::settle($promises)->wait();
if ($catchCallback !== null) {
$catchCallback($this, $key, $reason);
}
}

return $reason;
},
]))->promise()->wait();
}

if (! $this->cancelled()) {
Expand Down