Skip to content

Commit 14063c6

Browse files
committed
refactor(http): improve CURLRequest retry readability
Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>
1 parent c51108e commit 14063c6

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

system/HTTP/CURLRequest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ protected function sendWithRetries(array $curlOptions, array $retry, bool $httpE
480480

481481
if (! $this->shouldRetryResponse($response, $retry, $attempt)) {
482482
if ($httpErrors && $response->getStatusCode() >= 400) {
483-
throw HTTPException::forCurlError('22', 'The requested URL returned error: ' . $response->getStatusCode());
483+
throw HTTPException::forCurlError((string) CURLE_HTTP_RETURNED_ERROR, 'The requested URL returned error: ' . $response->getStatusCode());
484484
}
485485

486486
return $response;
@@ -623,9 +623,9 @@ protected function getRetryDelay(array $retry, int $attempt, ?ResponseInterface
623623
$delay = $retry['delay'];
624624

625625
if (is_array($delay)) {
626-
$lastDelay = end($delay);
626+
$lastDelay = $delay[array_key_last($delay)] ?? 0;
627627

628-
return $this->limitRetryDelay((int) ($delay[$attempt] ?? ($lastDelay !== false ? $lastDelay : 0)), $retry);
628+
return $this->limitRetryDelay((int) ($delay[$attempt] ?? $lastDelay), $retry);
629629
}
630630

631631
return $this->limitRetryDelay((int) $delay, $retry);

0 commit comments

Comments
 (0)