[Mime] use isRendered method to ensure we can avoid rendering an email twice

Benjamin Ellis · Benjamin Ellis · commit 7ed10bde4b36 · 2025-01-23T11:59:21.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php b/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php
@@ -42,15 +42,15 @@ public function render(Message $message): void
             return;
         }
 
-        if (null === $message->getTextTemplate() && null === $message->getHtmlTemplate()) {
+        if ($message->isRendered()) {
             // email has already been rendered
             return;
         }
 
         $messageContext = $message->getContext();
 
         if (isset($messageContext['email'])) {
-            throw new InvalidArgumentException(sprintf('A "%s" context cannot have an "email" entry as this is a reserved variable.', get_debug_type($message)));
+            throw new InvalidArgumentException(\sprintf('A "%s" context cannot have an "email" entry as this is a reserved variable.', get_debug_type($message)));
         }
 
         $vars = array_merge($this->context, $messageContext, [

Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,15 @@ public function render(Message $message): void`
`42`	`42`	`return;`
`43`	`43`	`}`
`44`	`44`
`45`		`- if (null === $message->getTextTemplate() && null === $message->getHtmlTemplate()) {`
	`45`	`+ if ($message->isRendered()) {`
`46`	`46`	`// email has already been rendered`
`47`	`47`	`return;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`$messageContext = $message->getContext();`
`51`	`51`
`52`	`52`	`if (isset($messageContext['email'])) {`
`53`		`- throw new InvalidArgumentException(sprintf('A "%s" context cannot have an "email" entry as this is a reserved variable.', get_debug_type($message)));`
	`53`	`+ throw new InvalidArgumentException(\sprintf('A "%s" context cannot have an "email" entry as this is a reserved variable.', get_debug_type($message)));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`$vars = array_merge($this->context, $messageContext, [`