symfony
diff --git a/‎src/Symfony/Component/Mime/Email.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Email.php
+14Lines changed: 14 additions & 0 deletions b/‎src/Symfony/Component/Mime/Email.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Email.php
+14Lines changed: 14 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Mime/Tests/EmailTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Tests/EmailTest.php
+20Lines changed: 20 additions & 0 deletions b/‎src/Symfony/Component/Mime/Tests/EmailTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Tests/EmailTest.php
+20Lines changed: 20 additions & 0 deletions
@@ -43,6 +43,7 @@ class Email extends Message
     private $html;
     private $htmlCharset;
     private $attachments = [];
+    private ?AbstractPart $cachedBody = null; // Used to avoid wrong body hash in DKIM signatures with multiple parts (e.g. HTML + TEXT) due to multiple boundaries.
 
     /**
      * @return $this
@@ -282,6 +283,7 @@ public function text($body, string $charset = 'utf-8')
             throw new \TypeError(sprintf('The body must be a string, a resource or null (got "%s").', get_debug_type($body)));
         }
 
+        $this->cachedBody = null;
         $this->text = $body;
         $this->textCharset = $charset;
 
@@ -312,6 +314,7 @@ public function html($body, string $charset = 'utf-8')
             throw new \TypeError(sprintf('The body must be a string, a resource or null (got "%s").', get_debug_type($body)));
         }
 
+        $this->cachedBody = null;
         $this->html = $body;
         $this->htmlCharset = $charset;
 
@@ -342,6 +345,7 @@ public function attach($body, string $name = null, string $contentType = null)
             throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', get_debug_type($body)));
         }
 
+        $this->cachedBody = null;
         $this->attachments[] = ['body' => $body, 'name' => $name, 'content-type' => $contentType, 'inline' => false];
 
         return $this;
@@ -352,6 +356,7 @@ public function attach($body, string $name = null, string $contentType = null)
      */
     public function attachFromPath(string $path, string $name = null, string $contentType = null)
     {
+        $this->cachedBody = null;
         $this->attachments[] = ['path' => $path, 'name' => $name, 'content-type' => $contentType, 'inline' => false];
 
         return $this;
@@ -368,6 +373,7 @@ public function embed($body, string $name = null, string $contentType = null)
             throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', get_debug_type($body)));
         }
 
+        $this->cachedBody = null;
         $this->attachments[] = ['body' => $body, 'name' => $name, 'content-type' => $contentType, 'inline' => true];
 
         return $this;
@@ -378,6 +384,7 @@ public function embed($body, string $name = null, string $contentType = null)
      */
     public function embedFromPath(string $path, string $name = null, string $contentType = null)
     {
+        $this->cachedBody = null;
         $this->attachments[] = ['path' => $path, 'name' => $name, 'content-type' => $contentType, 'inline' => true];
 
         return $this;
@@ -388,6 +395,7 @@ public function embedFromPath(string $path, string $name = null, string $content
      */
     public function attachPart(DataPart $part)
     {
+        $this->cachedBody = null;
         $this->attachments[] = ['part' => $part];
 
         return $this;
@@ -446,6 +454,10 @@ public function ensureValidity()
      */
     private function generateBody(): AbstractPart
     {
+        if (null !== $this->cachedBody) {
+            return $this->cachedBody;
+        }
+
         $this->ensureValidity();
 
         [$htmlPart, $attachmentParts, $inlineParts] = $this->prepareParts();
@@ -471,6 +483,8 @@ private function generateBody(): AbstractPart
             }
         }
 
+        $this->cachedBody = $part;
+
         return $part;
     }
 
 
@@ -458,4 +458,24 @@ public function testTextBodyAcceptedTypes()
         $email->text($contents);
         $this->assertSame($contents, $email->getTextBody());
     }
+
+    public function testBodyCache()
+    {
+        $email = new Email();
+        $email->from('fabien@symfony.com');
+        $email->to('fabien@symfony.com');
+        $email->text('foo');
+        $body1 = $email->getBody();
+        $body2 = $email->getBody();
+        $this->assertSame($body1, $body2, 'The two bodies must reference the same object, so the body cache ensures that the hash for the DKIM signature is unique.');
+
+        $email = new Email();
+        $email->from('fabien@symfony.com');
+        $email->to('fabien@symfony.com');
+        $email->text('foo');
+        $body1 = $email->getBody();
+        $email->html('<b>bar</b>'); // We change a part to reset the body cache.
+        $body2 = $email->getBody();
+        $this->assertNotSame($body1, $body2, 'The two bodies must not reference the same object, so the body cache does not ensure that the hash for the DKIM signature is unique.');
+    }
 }