Merge branch '5.4' into 6.4

fabpot · fabpot · commit 6ea4affc27f2 · 2024-02-26T08:52:26.000+01:00
* 5.4:
  [Config][Messenger][Security] Don't turn deprecations into exceptions when unserializing
diff --git a/ResourceCheckerConfigCache.php b/ResourceCheckerConfigCache.php
@@ -150,7 +150,7 @@ private function safelyUnserialize(string $file): mixed
         $signalingException = new \UnexpectedValueException();
         $prevUnserializeHandler = ini_set('unserialize_callback_func', self::class.'::handleUnserializeCallback');
         $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler, $signalingException) {
-            if (__FILE__ === $file) {
+            if (__FILE__ === $file && !\in_array($type, [\E_DEPRECATED, \E_USER_DEPRECATED], true)) {
                 throw $signalingException;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ private function safelyUnserialize(string $file): mixed`
`150`	`150`	`$signalingException = new \UnexpectedValueException();`
`151`	`151`	`$prevUnserializeHandler = ini_set('unserialize_callback_func', self::class.'::handleUnserializeCallback');`
`152`	`152`	`$prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler, $signalingException) {`
`153`		`- if (__FILE__ === $file) {`
	`153`	`+ if (__FILE__ === $file && !\in_array($type, [\E_DEPRECATED, \E_USER_DEPRECATED], true)) {`
`154`	`154`	`throw $signalingException;`
`155`	`155`	`}`
`156`	`156`