bug #54045 [Config][Messenger][Security] Don't turn deprecations into exceptions when unserializing (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 85d01657a1a1 · 2024-02-23T20:11:23.000-05:00
This PR was merged into the 5.4 branch. Discussion ---------- [Config][Messenger][Security] Don't turn deprecations into exceptions when unserializing | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT A deprecation ain't mean b0rken. Commits ------- 6518910 [Config][Messenger][Security] Don't turn deprecations into exceptions when unserializing
diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -156,7 +156,7 @@ private function safelyUnserialize(string $file)
         $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;
             }
 
diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php
@@ -58,7 +58,7 @@ private function safelyUnserialize(string $contents)
 
         $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);
             }
 
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -301,7 +301,7 @@ private function safelyUnserialize(string $serializedToken)
         $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
`@@ -156,7 +156,7 @@ private function safelyUnserialize(string $file)`
`156`	`156`	`$signalingException = new \UnexpectedValueException();`
`157`	`157`	`$prevUnserializeHandler = ini_set('unserialize_callback_func', self::class.'::handleUnserializeCallback');`
`158`	`158`	`$prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler, $signalingException) {`
`159`		`- if (__FILE__ === $file) {`
	`159`	`+ if (__FILE__ === $file && !\in_array($type, [\E_DEPRECATED, \E_USER_DEPRECATED], true)) {`
`160`	`160`	`throw $signalingException;`
`161`	`161`	`}`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private function safelyUnserialize(string $contents)`
`58`	`58`
`59`	`59`	`$prevUnserializeHandler = ini_set('unserialize_callback_func', self::class.'::handleUnserializeCallback');`
`60`	`60`	`$prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler) {`
`61`		`- if (__FILE__ === $file) {`
	`61`	`+ if (__FILE__ === $file && !\in_array($type, [\E_DEPRECATED, \E_USER_DEPRECATED], true)) {`
`62`	`62`	`throw new \ErrorException($msg, 0, $type, $file, $line);`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ private function safelyUnserialize(string $serializedToken)`
`301`	`301`	`$token = null;`
`302`	`302`	`$prevUnserializeHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');`
`303`	`303`	`$prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler) {`
`304`		`- if (__FILE__ === $file) {`
	`304`	`+ if (__FILE__ === $file && !\in_array($type, [\E_DEPRECATED, \E_USER_DEPRECATED], true)) {`
`305`	`305`	`throw new \ErrorException($msg, 0x37313BC, $type, $file, $line);`
`306`	`306`	`}`
`307`	`307`