bug symfony#48505 [Mailer] Fix rendered templates for notifications (fabpot)

This PR was merged into the 6.2 branch.

Discussion
----------

[Mailer] Fix rendered templates for notifications

| Q             | A
| ------------- | ---
| Branch?       | 6.2
| Bug fix?      | yes
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tickets       | Fix symfony#48472
| License       | MIT
| Doc PR        | n/a

Alternative to symfony#48481

Commits
-------

085185d [Mailer] Fix rendered templates for notifications

Author: fabpot

src/Symfony/Bridge/Twig/Mime/BodyRenderer.php

@@ -59,15 +59,13 @@ public function render(Message $message): void
 
         if ($template = $message->getTextTemplate()) {
             $message->text($this->twig->render($template, $vars));
-            $message->textTemplate(null);
         }
 
         if ($template = $message->getHtmlTemplate()) {
             $message->html($this->twig->render($template, $vars));
-            $message->htmlTemplate(null);
         }
 
-        $message->context([]);
+        $message->markAsRendered();
 
         // if text body is empty, compute one from the HTML body
         if (!$message->getTextBody() && null !== $html = $message->getHtmlBody()) {

src/Symfony/Bridge/Twig/Mime/NotificationEmail.php

@@ -40,6 +40,7 @@ class NotificationEmail extends TemplatedEmail
         'raw' => false,
         'footer_text' => 'Notification e-mail sent by Symfony',
     ];
+    private bool $rendered = false;
 
     public function __construct(Headers $headers = null, AbstractPart $body = null)
     {
@@ -178,6 +179,18 @@ public function getContext(): array
         return array_merge($this->context, parent::getContext());
     }
 
+    public function isRendered(): bool
+    {
+        return $this->rendered;
+    }
+
+    public function markAsRendered(): void
+    {
+        parent::markAsRendered();
+
+        $this->rendered = true;
+    }
+
     public function getPreparedHeaders(): Headers
     {
         $headers = parent::getPreparedHeaders();
@@ -225,15 +238,17 @@ private function getExceptionAsString(\Throwable|FlattenException $exception): s
      */
     public function __serialize(): array
     {
-        return [$this->context, $this->theme, parent::__serialize()];
+        return [$this->context, $this->theme, $this->rendered, parent::__serialize()];
     }
 
     /**
      * @internal
      */
     public function __unserialize(array $data): void
     {
-        if (3 === \count($data)) {
+        if (4 === \count($data)) {
+            [$this->context, $this->theme, $this->rendered, $parentData] = $data;
+        } elseif (3 === \count($data)) {
             [$this->context, $this->theme, $parentData] = $data;
         } else {
             // Backwards compatibility for deserializing data structures that were serialized without the theme

src/Symfony/Bridge/Twig/Mime/TemplatedEmail.php

@@ -67,6 +67,18 @@ public function getContext(): array
         return $this->context;
     }
 
+    public function isRendered(): bool
+    {
+        return null === $this->htmlTemplate && null === $this->textTemplate;
+    }
+
+    public function markAsRendered(): void
+    {
+        $this->textTemplate = null;
+        $this->htmlTemplate = null;
+        $this->context = [];
+    }
+
     /**
      * @internal
      */

src/Symfony/Component/Mailer/Transport/AbstractTransport.php

@@ -76,7 +76,7 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa
             $envelope = $event->getEnvelope();
             $message = $event->getMessage();
 
-            if ($message instanceof TemplatedEmail && ($message->getTextTemplate() || $message->getHtmlTemplate())) {
+            if ($message instanceof TemplatedEmail && !$message->isRendered()) {
                 throw new LogicException(sprintf('You must configure a "%s" when a "%s" instance has a text or HTML template set.', BodyRendererInterface::class, get_debug_type($message)));
             }
 

src/Symfony/Component/Mailer/composer.json

@@ -33,7 +33,8 @@
     "conflict": {
         "symfony/http-kernel": "<5.4",
         "symfony/messenger": "<6.2",
-        "symfony/mime": "<6.2"
+        "symfony/mime": "<6.2",
+        "symfony/twig-bridge": "<6.2.1"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Mailer\\": "" },