Merge branch '5.2' into 5.x

* 5.2:
  Fix #36973: Command description consistency
  Render email once

Author: fabpot

Command/DebugCommand.php

@@ -33,7 +33,7 @@
 class DebugCommand extends Command
 {
     protected static $defaultName = 'debug:twig';
-    protected static $defaultDescription = 'Shows a list of twig functions, filters, globals and tests';
+    protected static $defaultDescription = 'Show a list of twig functions, filters, globals and tests';
 
     private $twig;
     private $projectDir;

Command/LintCommand.php

@@ -35,7 +35,7 @@
 class LintCommand extends Command
 {
     protected static $defaultName = 'lint:twig';
-    protected static $defaultDescription = 'Lints a Twig template and outputs encountered errors';
+    protected static $defaultDescription = 'Lint a Twig template and outputs encountered errors';
 
     private $twig;
 

Mime/BodyRenderer.php

@@ -46,6 +46,14 @@ public function render(Message $message): void
         }
 
         $messageContext = $message->getContext();
+
+        $previousRenderingKey = $messageContext[__CLASS__] ?? null;
+        unset($messageContext[__CLASS__]);
+        $currentRenderingKey = md5(serialize([$messageContext, $message->getTextTemplate(), $message->getHtmlTemplate()]));
+        if ($previousRenderingKey === $currentRenderingKey) {
+            return;
+        }
+
         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)));
         }
@@ -66,6 +74,7 @@ public function render(Message $message): void
         if (!$message->getTextBody() && null !== $html = $message->getHtmlBody()) {
             $message->text($this->convertHtmlToText(\is_resource($html) ? stream_get_contents($html) : $html));
         }
+        $message->context($message->getContext() + [__CLASS__ => $currentRenderingKey]);
     }
 
     private function convertHtmlToText(string $html): string

Tests/Mime/BodyRendererTest.php

@@ -79,6 +79,27 @@ public function testRenderWithContextReservedEmailEntry()
         $this->prepareEmail('Text', '', ['email' => 'reserved!']);
     }
 
+    public function testRenderedOnce()
+    {
+        $twig = new Environment(new ArrayLoader([
+            'text' => 'Text',
+        ]));
+        $renderer = new BodyRenderer($twig);
+        $email = (new TemplatedEmail())
+            ->to('[email protected]')
+            ->from('[email protected]')
+        ;
+        $email->textTemplate('text');
+
+        $renderer->render($email);
+        $this->assertEquals('Text', $email->getTextBody());
+
+        $email->text('reset');
+
+        $renderer->render($email);
+        $this->assertEquals('reset', $email->getTextBody());
+    }
+
     private function prepareEmail(?string $text, ?string $html, array $context = []): TemplatedEmail
     {
         $twig = new Environment(new ArrayLoader([