From 72020d8134c8d1701b67da37abb50c2aa8d7a00d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 29 Jun 2021 11:51:57 +0200
Subject: [PATCH] [Messenger] fix FlattenExceptionNormalizer

---
 .../Serialization/Normalizer/FlattenExceptionNormalizer.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php
index 344eea7cc743f..f7d909f2c599d 100644
--- a/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php
+++ b/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php
@@ -42,13 +42,11 @@ public function normalize($object, $format = null, array $context = [])
             'file' => $object->getFile(),
             'line' => $object->getLine(),
             'previous' => null === $object->getPrevious() ? null : $this->normalize($object->getPrevious(), $format, $context),
+            'status' => $object->getStatusCode(),
             'status_text' => $object->getStatusText(),
             'trace' => $object->getTrace(),
             'trace_as_string' => $object->getTraceAsString(),
         ];
-        if (null !== $status = $object->getStatusCode()) {
-            $normalized['status'] = $status;
-        }
 
         return $normalized;
     }
@@ -70,7 +68,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
 
         $object->setMessage($data['message']);
         $object->setCode($data['code']);
-        $object->setStatusCode($data['status'] ?? null);
+        $object->setStatusCode($data['status'] ?? 500);
         $object->setClass($data['class']);
         $object->setFile($data['file']);
         $object->setLine($data['line']);