From 39cff1decd5256b0806a4eb04d1aad5f7d8a097c Mon Sep 17 00:00:00 2001
From: Joseph Bielawski <stloyd@gmail.com>
Date: Fri, 8 Jul 2022 15:17:26 +0200
Subject: [PATCH] [Mime] Fixed tests after merge up from 4.4 branch

---
 src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php | 1 +
 src/Symfony/Component/Mime/Tests/EmailTest.php            | 1 +
 src/Symfony/Component/Mime/Tests/MessageConverterTest.php | 8 +++++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php
index f0fc64466a104..c9041b3dc1c1f 100644
--- a/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php
@@ -80,6 +80,7 @@ public function testSymfonySerialize()
             "inline": false
         }
     ],
+    "cachedBody": null,
     "headers": {
         "to": [
             {
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
index baa98e6470a46..dcd6e476353df 100644
--- a/src/Symfony/Component/Mime/Tests/EmailTest.php
+++ b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -418,6 +418,7 @@ public function testSymfonySerialize()
             "inline": false
         }
     ],
+    "cachedBody": null,
     "headers": {
         "to": [
             {
diff --git a/src/Symfony/Component/Mime/Tests/MessageConverterTest.php b/src/Symfony/Component/Mime/Tests/MessageConverterTest.php
index a0e71a08a9416..f67dfbcb4f166 100644
--- a/src/Symfony/Component/Mime/Tests/MessageConverterTest.php
+++ b/src/Symfony/Component/Mime/Tests/MessageConverterTest.php
@@ -66,11 +66,13 @@ public function testToEmail()
 
     private function assertConversion(Email $expected)
     {
-        $r = new \ReflectionMethod($expected, 'generateBody');
+        $message = new Message($expected->getHeaders(), $expected->getBody());
+        $converted = MessageConverter::toEmail($message);
+
+        $r = new \ReflectionMethod($converted, 'generateBody');
         $r->setAccessible(true);
+        $r->invoke($converted);
 
-        $message = new Message($expected->getHeaders(), $r->invoke($expected));
-        $converted = MessageConverter::toEmail($message);
         if ($expected->getHtmlBody()) {
             $this->assertStringMatchesFormat(str_replace('cid:test.jpg', 'cid:%s', $expected->getHtmlBody()), $converted->getHtmlBody());
             $expected->html('HTML content');