Merge branch '5.4' into 6.4

fabpot · fabpot · commit bf7548976c19 · 2024-02-26T08:52:26.000+01:00
* 5.4:
  [Config][Messenger][Security] Don't turn deprecations into exceptions when unserializing
diff --git a/Firewall/ContextListener.php b/Firewall/ContextListener.php
@@ -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);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ private function safelyUnserialize(string $serializedToken): mixed`
`256`	`256`	`$token = null;`
`257`	`257`	`$prevUnserializeHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');`
`258`	`258`	`$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)) {`
`260`	`260`	`throw new \ErrorException($msg, 0x37313BC, $type, $file, $line);`
`261`	`261`	`}`
`262`	`262`