Skip to content

Commit

Permalink
Merge branch '5.4' into 6.4
Browse files Browse the repository at this point in the history
* 5.4:
  [Config][Messenger][Security] Don't turn deprecations into exceptions when unserializing
  • Loading branch information
fabpot committed Feb 26, 2024
2 parents 4cffc04 + 2114101 commit 443b264
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Transport/Serialization/PhpSerializer.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private function safelyUnserialize(string $contents): Envelope
$prevUnserializeHandler = ini_set('unserialize_callback_func', self::class.'::handleUnserializeCallback');
}
$prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler) {
if (__FILE__ === $file) {
if (__FILE__ === $file && !\in_array($type, [\E_DEPRECATED, \E_USER_DEPRECATED], true)) {
throw new \ErrorException($msg, 0, $type, $file, $line);
}

Expand Down

0 comments on commit 443b264

Please sign in to comment.