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
symfony · Feb 26, 2024 · 804a899 · 804a899
2 parents 6271373 + 443b264
commit 804a899
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/EventListener/SendFailedMessageToFailureTransportListener.php b/EventListener/SendFailedMessageToFailureTransportListener.php
@@ -49,6 +49,11 @@ public function onMessageFailed(WorkerMessageFailedEvent $event): void
 
         $envelope = $event->getEnvelope();
 
+        // avoid re-sending to the failed sender
+        if (null !== $envelope->last(SentToFailureTransportStamp::class)) {
+            return;
+        }
+
         $envelope = $envelope->with(
             new SentToFailureTransportStamp($event->getReceiverName()),
             new DelayStamp(0),

diff --git a/Transport/Serialization/PhpSerializer.php b/Transport/Serialization/PhpSerializer.php
@@ -81,7 +81,7 @@ private function safelyUnserialize(string $contents): Envelope
             $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);
             }