Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 6.4:
  [Messenger] Revert "Resend failed retries back to failure transport "
  [Config][Messenger][Security] Don't turn deprecations into exceptions when unserializing
  [FrameworkBundle] Merge test from 5.4
  • Loading branch information
fabpot committed Feb 26, 2024
2 parents b6cbcff + bf75489 commit f3a70a9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Firewall/ContextListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ private function safelyUnserialize(string $serializedToken): mixed
$token = null;
$prevUnserializeHandler = ini_set('unserialize_callback_func', __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, 0x37313BC, $type, $file, $line);
}

Expand Down

0 comments on commit f3a70a9

Please sign in to comment.