Skip to content

Commit f3a70a9

Browse files
committed
Merge branch '6.4' into 7.0
* 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
2 parents b6cbcff + bf75489 commit f3a70a9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Firewall/ContextListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ private function safelyUnserialize(string $serializedToken): mixed
256256
$token = null;
257257
$prevUnserializeHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
258258
$prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler) {
259-
if (__FILE__ === $file) {
259+
if (__FILE__ === $file && !\in_array($type, [\E_DEPRECATED, \E_USER_DEPRECATED], true)) {
260260
throw new \ErrorException($msg, 0x37313BC, $type, $file, $line);
261261
}
262262

0 commit comments

Comments
 (0)