Merge remote-tracking branch 'tango/MC-33700' into Chaika-PR-2020-05-12

Author: veloraven

app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml

@@ -6,9 +6,11 @@
 
 use Magento\Framework\App\TemplateTypesInterface;
 
+// phpcs:disable Generic.Files.LineLength.TooLong
+
 /** @var $block \Magento\Email\Block\Adminhtml\Template\Edit */
 ?>
-<?php if (!$block->getEditMode()) : ?>
+<?php if (!$block->getEditMode()): ?>
 <form action="<?= $block->escapeUrl($block->getLoadUrl()) ?>" method="post" id="email_template_load_form">
     <?= $block->getBlockHtml('formkey') ?>
     <fieldset class="admin__fieldset form-inline">
@@ -17,14 +19,14 @@ use Magento\Framework\App\TemplateTypesInterface;
             <label class="admin__field-label" for="template_select"><span><?= $block->escapeHtml(__('Template')) ?></span></label>
             <div class="admin__field-control">
                 <select id="template_select" name="code" class="admin__control-select required-entry">
-                    <?php foreach ($block->getTemplateOptions() as $group => $options) : ?>
-                        <?php if ($group) : ?>
+                    <?php foreach ($block->getTemplateOptions() as $group => $options): ?>
+                        <?php if ($group): ?>
                             <optgroup label="<?= $block->escapeHtmlAttr($group) ?>">
                         <?php endif; ?>
-                        <?php foreach ($options as $option) : ?>
+                        <?php foreach ($options as $option): ?>
                             <option value="<?= $block->escapeHtmlAttr($option['value']) ?>"<?= /* @noEscape */ $block->getOrigTemplateCode() == $option['value'] ? ' selected="selected"' : '' ?>><?= $block->escapeHtml($option['label']) ?></option>
                         <?php endforeach; ?>
-                        <?php if ($group) : ?>
+                        <?php if ($group): ?>
                             </optgroup>
                         <?php endif; ?>
                     <?php endforeach; ?>
@@ -114,6 +116,8 @@ require([
         },
 
         stripTags: function () {
+            var self = this;
+
             confirm({
                 content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to strip tags?'))) ?>",
                 actions: {
@@ -125,7 +129,7 @@ require([
                         ).stripTags().strip();
                         $('convert_button_back').show();
                         $('field_template_styles').hide();
-                        this.typeChange = true;
+                        self.typeChange = true;
                         return false;
                     }
                 }

dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php

@@ -9,6 +9,8 @@
 
 use Magento\Email\Model\BackendTemplate;
 use Magento\Email\Model\Template;
+use Magento\Framework\App\TemplateTypesInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -47,11 +49,26 @@ protected function setUp(): void
      *
      * @param string|array $email
      * @dataProvider emailDataProvider
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function testAddToEmail($email)
     {
-        $templateId = $this->template->load('email_exception_fixture', 'template_code')->getId();
+        $template = $this->template->load('email_exception_fixture', 'template_code');
+        $templateId = $template->getId();
+
+        switch ($template->getType()) {
+            case TemplateTypesInterface::TYPE_TEXT:
+                $templateType = MimeInterface::TYPE_TEXT;
+                break;
+
+            case TemplateTypesInterface::TYPE_HTML:
+                $templateType = MimeInterface::TYPE_HTML;
+                break;
+
+            default:
+                $templateType = '';
+                $this->fail('Unsupported Mime Type');
+        }
 
         $this->builder->setTemplateModel(BackendTemplate::class);
 
@@ -62,9 +79,11 @@ public function testAddToEmail($email)
         $this->builder->addTo($email);
 
         /** @var EmailMessage $emailMessage */
-        $emailMessage = $this->builder->getTransport();
+        $emailMessage = $this->builder->getTransport()->getMessage();
+
+        $this->assertStringContainsStringIgnoringCase($templateType, $emailMessage->getHeaders()['Content-Type']);
 
-        $addresses = $emailMessage->getMessage()->getTo();
+        $addresses = $emailMessage->getTo();
 
         $emails = [];
         /** @var Address $toAddress */

lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php

@@ -12,9 +12,8 @@
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\MailException;
-use Magento\Framework\Mail\EmailMessageInterface;
-use Magento\Framework\Mail\EmailMessageInterfaceFactory;
 use Magento\Framework\Mail\AddressConverter;
+use Magento\Framework\Mail\EmailMessageInterfaceFactory;
 use Magento\Framework\Mail\Exception\InvalidArgumentException;
 use Magento\Framework\Mail\MessageInterface;
 use Magento\Framework\Mail\MessageInterfaceFactory;
@@ -28,7 +27,7 @@
 use Magento\Framework\Phrase;
 
 /**
- * TransportBuilder
+ * TransportBuilder for Mail Templates
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -380,11 +379,11 @@ protected function prepareMessage()
 
         switch ($template->getType()) {
             case TemplateTypesInterface::TYPE_TEXT:
-                $part['type'] = MimeInterface::TYPE_TEXT;
+                $partType = MimeInterface::TYPE_TEXT;
                 break;
 
             case TemplateTypesInterface::TYPE_HTML:
-                $part['type'] = MimeInterface::TYPE_HTML;
+                $partType = MimeInterface::TYPE_HTML;
                 break;
 
             default:
@@ -394,7 +393,12 @@ protected function prepareMessage()
         }
 
         /** @var \Magento\Framework\Mail\MimePartInterface $mimePart */
-        $mimePart = $this->mimePartInterfaceFactory->create(['content' => $content]);
+        $mimePart = $this->mimePartInterfaceFactory->create(
+            [
+                'content' => $content,
+                'type' => $partType
+            ]
+        );
         $this->messageData['encoding'] = $mimePart->getCharset();
         $this->messageData['body'] = $this->mimeMessageInterfaceFactory->create(
             ['parts' => [$mimePart]]