Skip to content

Commit bd0d143

Browse files
Merge branch '5.4' into 6.3
* 5.4: [Messenger] Fix cloned TraceableStack not unstacking the stack independently [DependencyInjection] Fix autocasting null env values to empty string with container.env_var_processors_locator [Cache] Fix support for Redis Sentinel using php-redis 6.0.0 minor #51693 Disable the dead code analysis in Psalm (stof) Update the PR template [SecurityBundle][PasswordHasher] Fix password migration with custom hasher service with security bundle config [Translator] Fix support for `default_path` in XML [HttpClient] Fix TraceableResponse if response has no destruct method
2 parents 15f9f4b + 04784c6 commit bd0d143

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
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()
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();

0 commit comments

Comments
 (0)