Merge branch '5.4' into 6.0

* 5.4:
  [Mime][TwigBridge] Fix tests

Author: chalasr

src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php

@@ -110,11 +110,11 @@ public function testSymfonySerialize()
             $propertyNormalizer,
         ], [new JsonEncoder()]);
 
-        $serialized = $serializer->serialize($e, 'json');
+        $serialized = $serializer->serialize($e, 'json', [ObjectNormalizer::IGNORED_ATTRIBUTES => ['cachedBody']]);
         $this->assertSame($expectedJson, json_encode(json_decode($serialized), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES));
 
         $n = $serializer->deserialize($serialized, TemplatedEmail::class, 'json');
-        $serialized = $serializer->serialize($e, 'json');
+        $serialized = $serializer->serialize($e, 'json', [ObjectNormalizer::IGNORED_ATTRIBUTES => ['cachedBody']]);
         $this->assertSame($expectedJson, json_encode(json_decode($serialized), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES));
 
         $n->from('[email protected]');

src/Symfony/Component/Mime/Tests/EmailTest.php

@@ -448,11 +448,11 @@ public function testSymfonySerialize()
             $propertyNormalizer,
         ], [new JsonEncoder()]);
 
-        $serialized = $serializer->serialize($e, 'json');
+        $serialized = $serializer->serialize($e, 'json', [ObjectNormalizer::IGNORED_ATTRIBUTES => ['cachedBody']]);
         $this->assertSame($expectedJson, json_encode(json_decode($serialized), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES));
 
         $n = $serializer->deserialize($serialized, Email::class, 'json');
-        $serialized = $serializer->serialize($e, 'json');
+        $serialized = $serializer->serialize($e, 'json', [ObjectNormalizer::IGNORED_ATTRIBUTES => ['cachedBody']]);
         $this->assertSame($expectedJson, json_encode(json_decode($serialized), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES));
 
         $n->from('[email protected]');