[Mime] Fixed tests after merge up from 4.4 branch

symfony · stloyd · Jul 8, 2022 · Jul 8, 2022 · 39cff1decd5256b0806a4eb04d1aad5f7d8a097c
commit 39cff1decd5256b0806a4eb04d1aad5f7d8a097c
diff --git 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
@@ -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
@@ -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');