Merge remote-tracking branch 'origin/mail_interface_cleanup' into mail_interface_cleanup

Author: ffalkone

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

@@ -118,15 +118,19 @@ public function getEmailMessageDataProvider(): array
      */
     public function testEmailMessage($content, $type): void
     {
-        $mimePart = $this->mimePartFactory->create([
-            'content' => $content,
-            'description' => $this->description,
-            'type' => $type
-        ]);
+        $mimePart = $this->mimePartFactory->create(
+            [
+                'content' => $content,
+                'description' => $this->description,
+                'type' => $type
+            ]
+        );
 
-        $mimeMessage = $this->mimeMessageFactory->create([
-            'parts' => [$mimePart]
-        ]);
+        $mimeMessage = $this->mimeMessageFactory->create(
+            [
+                'parts' => [$mimePart]
+            ]
+        );
 
         $this->addressFactory = $this->di->get(AddressFactory::class);
         /** @var Address $addressTo */
@@ -194,21 +198,27 @@ public function testEmailMessage($content, $type): void
      */
     public function testEmailMessageWithAttachment(): void
     {
-        $mimePartMain = $this->mimePartFactory->create([
-            'content' => 'Test',
-            'description' => $this->description,
-            'type' => MimeInterface::TYPE_TEXT
-        ]);
-        $mimePartAttachment = $this->mimePartFactory->create([
-            'content' => $this->getXmlContent(),
-            'disposition' => MimeInterface::DISPOSITION_ATTACHMENT,
-            'fileName' => self::ATTACHMENT_FILE_NAME,
-            'type' => self::XML_TYPE
-        ]);
+        $mimePartMain = $this->mimePartFactory->create(
+            [
+                'content' => 'Test',
+                'description' => $this->description,
+                'type' => MimeInterface::TYPE_TEXT
+            ]
+        );
+        $mimePartAttachment = $this->mimePartFactory->create(
+            [
+                'content' => $this->getXmlContent(),
+                'disposition' => MimeInterface::DISPOSITION_ATTACHMENT,
+                'fileName' => self::ATTACHMENT_FILE_NAME,
+                'type' => self::XML_TYPE
+            ]
+        );
 
-        $mimeMessage = $this->mimeMessageFactory->create([
-            'parts' => [$mimePartMain, $mimePartAttachment]
-        ]);
+        $mimeMessage = $this->mimeMessageFactory->create(
+            [
+                'parts' => [$mimePartMain, $mimePartAttachment]
+            ]
+        );
 
         $this->addressFactory = $this->di->get(AddressFactory::class);
         /** @var Address $addressTo */
@@ -242,7 +252,8 @@ public function testEmailMessageWithAttachment(): void
     private function getXmlContent(): string
     {
         return '<?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Framework\Console\CommandList">
         <arguments>
             <argument name="commands" xsi:type="array">

lib/internal/Magento/Framework/Mail/EmailMessage.php

@@ -89,7 +89,7 @@ public function __construct(
             $this->message->setReplyTo($this->convertAddressArrayToAddressList($replyTo));
         }
         if ($replyTo) {
-            $this->message->setFrom($this->convertAddressArrayToAddressList($replyTo));
+            $this->message->setFrom($this->convertAddressArrayToAddressList($from));
         }
         if ($cc) {
             $this->message->setCc($this->convertAddressArrayToAddressList($cc));

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

@@ -416,14 +416,16 @@ protected function prepareMessage()
      */
     private function addAddressByType(string $addressType, $email, ?string $name = null): void
     {
-        if (is_array($email)) {
+        if (is_string($email)) {
+            $this->messageData[$addressType][] = $this->addressConverter->convert($email, $name);
+            return;
+        }
+        $convertedAddressArray = $this->addressConverter->convertMany($email);
+        if (isset($this->messageData[$addressType])) {
             $this->messageData[$addressType] = array_merge(
                 $this->messageData[$addressType],
-                $this->addressConverter->convertMany($email)
+                $convertedAddressArray
             );
-
-            return;
         }
-        $this->messageData[$addressType][] = $this->addressConverter->convert($email, $name);
     }
 }