Skip to content

Commit 46460fd

Browse files
Merge branch '6.4' into 7.0
* 6.4: (32 commits) [Validator] Fix registering "is_valid()" for `#[Expression]` [Scheduler] Trigger unique messages at runtime [Scheduler] Fix CHANGELOG [Clock] Add `DatePoint`: an immutable DateTime implementation with stricter error handling and return types [Scheduler] Allow modifying the schedule at runtime and recalculate heap [Cache] Fix Redis6Proxy [Finder] Disable failing test about open_basedir Fix merge Fix merge Minor CS fixes Deprecate `Kernel::stripComments()` Remove setAccessible reflection call in tests [Notifier] Telegram Bridge add escaping for \ [Component][AssertMapper] add type hint of an argument in asset mapper command [Translation] [Phrase] Refacto ReadConfig and WriteConfig into arrays [Routing] Fix routing collection defaults when adding a new route to a collection [Messenger] Fix cloned TraceableStack not unstacking the stack independently [Translation] Add `--as-tree` option to `translation:pull` command [Mime] Allow to add some headers as a strings [Translation] Give current locale to locale switcher runWithLocale callback ...
2 parents ccd903f + 35079c0 commit 46460fd

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Response/TraceableResponse.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ public function __wakeup(): void
5757
public function __destruct()
5858
{
5959
try {
60-
$this->response->__destruct();
60+
if (method_exists($this->response, '__destruct')) {
61+
$this->response->__destruct();
62+
}
6163
} finally {
6264
if ($this->event?->isStarted()) {
6365
$this->event->stop();

Retry/GenericRetryStrategy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function getDelay(AsyncContext $context, ?string $responseContent, ?Trans
103103

104104
if ($this->jitter > 0) {
105105
$randomness = (int) ($delay * $this->jitter);
106-
$delay = $delay + random_int(-$randomness, +$randomness);
106+
$delay += random_int(-$randomness, +$randomness);
107107
}
108108

109109
if ($delay > $this->maxDelayMs && 0 !== $this->maxDelayMs) {

0 commit comments

Comments
 (0)