From ad50297e7bf4ea39db62f0969579a1ca8eb5f1a3 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Mon, 8 Oct 2018 15:25:11 +0100
Subject: [PATCH 01/12] Removed setFromByStore and replaced with default
 parameter to setFrom

---
 .../Sales/Model/Order/Email/SenderBuilder.php | 16 +----
 .../Model/Order/Email/SenderBuilderTest.php   | 25 ++++----
 .../Mail/Template/TransportBuilder.php        |  5 +-
 .../Mail/Template/TransportBuilderByStore.php | 54 ----------------
 .../Template/TransportBuilderByStoreTest.php  | 64 -------------------
 .../Unit/Template/TransportBuilderTest.php    |  5 +-
 6 files changed, 21 insertions(+), 148 deletions(-)
 delete mode 100644 lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
 delete mode 100644 lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php

diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index 7ec089b882972..e5c9c4b4afddc 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -5,9 +5,7 @@
  */
 namespace Magento\Sales\Model\Order\Email;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Mail\Template\TransportBuilder;
-use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
 use Magento\Sales\Model\Order\Email\Container\Template;
 
@@ -28,29 +26,19 @@ class SenderBuilder
      */
     protected $transportBuilder;
 
-    /**
-     * @var TransportBuilderByStore
-     */
-    private $transportBuilderByStore;
-
     /**
      * @param Template $templateContainer
      * @param IdentityInterface $identityContainer
      * @param TransportBuilder $transportBuilder
-     * @param TransportBuilderByStore $transportBuilderByStore
      */
     public function __construct(
         Template $templateContainer,
         IdentityInterface $identityContainer,
-        TransportBuilder $transportBuilder,
-        TransportBuilderByStore $transportBuilderByStore = null
+        TransportBuilder $transportBuilder
     ) {
         $this->templateContainer = $templateContainer;
         $this->identityContainer = $identityContainer;
         $this->transportBuilder = $transportBuilder;
-        $this->transportBuilderByStore = $transportBuilderByStore ?: ObjectManager::getInstance()->get(
-            TransportBuilderByStore::class
-        );
     }
 
     /**
@@ -110,7 +98,7 @@ protected function configureEmailTemplate()
         $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());
         $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());
         $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());
-        $this->transportBuilderByStore->setFromByStore(
+        $this->transportBuilder->setFrom(
             $this->identityContainer->getEmailIdentity(),
             $this->identityContainer->getStore()->getId()
         );
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
index 38209bb22aef4..a3b7f6ef574dc 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Sales\Test\Unit\Model\Order\Email;
 
-use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\SenderBuilder;
 
 class SenderBuilderTest extends \PHPUnit\Framework\TestCase
@@ -36,11 +35,6 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
      */
     private $storeMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $transportBuilderByStore;
-
     protected function setUp()
     {
         $templateId = 'test_template_id';
@@ -82,11 +76,10 @@ protected function setUp()
                 'setTemplateIdentifier',
                 'setTemplateOptions',
                 'setTemplateVars',
+                'setFrom',
             ]
         );
 
-        $this->transportBuilderByStore = $this->createMock(TransportBuilderByStore::class);
-
         $this->templateContainerMock->expects($this->once())
             ->method('getTemplateId')
             ->will($this->returnValue($templateId));
@@ -109,8 +102,8 @@ protected function setUp()
         $this->identityContainerMock->expects($this->once())
             ->method('getEmailIdentity')
             ->will($this->returnValue($emailIdentity));
-        $this->transportBuilderByStore->expects($this->once())
-            ->method('setFromByStore')
+        $this->transportBuilder->expects($this->once())
+            ->method('setFrom')
             ->with($this->equalTo($emailIdentity));
 
         $this->identityContainerMock->expects($this->once())
@@ -120,8 +113,7 @@ protected function setUp()
         $this->senderBuilder = new SenderBuilder(
             $this->templateContainerMock,
             $this->identityContainerMock,
-            $this->transportBuilder,
-            $this->transportBuilderByStore
+            $this->transportBuilder
         );
     }
 
@@ -129,6 +121,8 @@ public function testSend()
     {
         $customerName = 'test_name';
         $customerEmail = 'test_email';
+        $identity = 'email_identity_test';
+        
         $transportMock = $this->createMock(
             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
         );
@@ -151,6 +145,9 @@ public function testSend()
         $this->storeMock->expects($this->once())
             ->method('getId')
             ->willReturn(1);
+        $this->transportBuilder->expects($this->once())
+            ->method('setFrom')
+            ->with($identity, 1);
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
             ->with($this->equalTo($customerEmail), $this->equalTo($customerName));
@@ -164,6 +161,7 @@ public function testSend()
 
     public function testSendCopyTo()
     {
+        $identity = 'email_identity_test';
         $transportMock = $this->createMock(
             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
         );
@@ -177,6 +175,9 @@ public function testSendCopyTo()
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
             ->with($this->equalTo('example@mail.com'));
+        $this->transportBuilder->expects($this->once())
+            ->method('setFrom')
+            ->with($identity, 1);
         $this->identityContainerMock->expects($this->once())
             ->method('getStore')
             ->willReturn($this->storeMock);
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index eac5d74c6e3dc..4a34f9abff340 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -176,11 +176,12 @@ public function setReplyTo($email, $name = null)
      * Set mail from address
      *
      * @param string|array $from
+     * @param string|int $store
      * @return $this
      */
-    public function setFrom($from)
+    public function setFrom($from, $store = null)
     {
-        $result = $this->_senderResolver->resolve($from);
+        $result = $this->_senderResolver->resolve($from, $store);
         $this->message->setFrom($result['email'], $result['name']);
         return $this;
     }
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
deleted file mode 100644
index 785c93824a57d..0000000000000
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Mail\Template;
-
-use Magento\Framework\Mail\MessageInterface;
-
-class TransportBuilderByStore
-{
-    /**
-     * Message.
-     *
-     * @var \Magento\Framework\Mail\Message
-     */
-    protected $message;
-
-    /**
-     * Sender resolver.
-     *
-     * @var \Magento\Framework\Mail\Template\SenderResolverInterface
-     */
-    private $senderResolver;
-
-    /**
-     * @param MessageInterface $message
-     * @param SenderResolverInterface $senderResolver
-     */
-    public function __construct(
-        MessageInterface $message,
-        SenderResolverInterface $senderResolver
-    ) {
-        $this->message = $message;
-        $this->senderResolver = $senderResolver;
-    }
-
-    /**
-     * Set mail from address by store.
-     *
-     * @param string|array $from
-     * @param string|int $store
-     *
-     * @return $this
-     */
-    public function setFromByStore($from, $store)
-    {
-        $result = $this->senderResolver->resolve($from, $store);
-        $this->message->setFrom($result['email'], $result['name']);
-
-        return $this;
-    }
-}
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
deleted file mode 100644
index 80df2887a3a93..0000000000000
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Mail\Test\Unit\Template;
-
-use Magento\Framework\Mail\Template\TransportBuilderByStore;
-
-class TransportBuilderByStoreTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Framework\Mail\Template\TransportBuilderByStore
-     */
-    protected $model;
-
-    /**
-     * @var \Magento\Framework\Mail\Message | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $messageMock;
-
-    /**
-     * @var \Magento\Framework\Mail\Template\SenderResolverInterface | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $senderResolverMock;
-
-    /**
-     * @return void
-     */
-    protected function setUp()
-    {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->messageMock = $this->createMock(\Magento\Framework\Mail\Message::class);
-        $this->senderResolverMock = $this->createMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
-
-        $this->model = $objectManagerHelper->getObject(
-            TransportBuilderByStore::class,
-            [
-                'message' => $this->messageMock,
-                'senderResolver' => $this->senderResolverMock,
-            ]
-        );
-    }
-
-    /**
-     * @return void
-     */
-    public function testSetFromByStore()
-    {
-        $sender = ['email' => 'from@example.com', 'name' => 'name'];
-        $store = 1;
-        $this->senderResolverMock->expects($this->once())
-            ->method('resolve')
-            ->with($sender, $store)
-            ->willReturn($sender);
-        $this->messageMock->expects($this->once())
-            ->method('setFrom')
-            ->with('from@example.com', 'name')
-            ->willReturnSelf();
-
-        $this->model->setFromByStore($sender, $store);
-    }
-}
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index 596640480c823..59560b4cbe2da 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -170,16 +170,17 @@ public function getTransportDataProvider()
     public function testSetFrom()
     {
         $sender = ['email' => 'from@example.com', 'name' => 'name'];
+        $store = 1;
         $this->senderResolverMock->expects($this->once())
             ->method('resolve')
-            ->with($sender)
+            ->with($sender, $store)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
             ->method('setFrom')
             ->with('from@example.com', 'name')
             ->willReturnSelf();
 
-        $this->builder->setFrom($sender);
+        $this->builder->setFrom($sender, $store);
     }
 
     /**

From e16ff74e4f5f24a4a2530b6aced6ef50032515e0 Mon Sep 17 00:00:00 2001
From: gwharton <30697781+gwharton@users.noreply.github.com>
Date: Tue, 9 Oct 2018 11:26:02 +0100
Subject: [PATCH 02/12] Added annotation block to Sender Builder

---
 app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index e5c9c4b4afddc..e09e13ccded24 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -9,6 +9,9 @@
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
 use Magento\Sales\Model\Order\Email\Container\Template;
 
+/**
+ * Sender Builder
+ */
 class SenderBuilder
 {
     /**

From 621d2cfeaf8e0a15e592cdc001c856385b3cbd83 Mon Sep 17 00:00:00 2001
From: gwharton <30697781+gwharton@users.noreply.github.com>
Date: Tue, 9 Oct 2018 11:27:08 +0100
Subject: [PATCH 03/12] Added short description to annotation block

---
 .../Magento/Framework/Mail/Template/TransportBuilder.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 4a34f9abff340..89f770cad4022 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -17,6 +17,8 @@
 use Magento\Framework\Phrase;
 
 /**
+ * TransportBuilder
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */

From b6f9e48289119117df230b6578ac9ff3d69e4996 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Tue, 16 Oct 2018 09:39:17 +0100
Subject: [PATCH 04/12] Added new setFromByStore function and deprecated old
 function.

TODO : Rest of Magento codebase still uses deprecated setFrom
---
 .../Sales/Model/Order/Email/SenderBuilder.php   |  2 +-
 .../Model/Order/Email/SenderBuilderTest.php     | 10 +++++-----
 .../Mail/Template/TransportBuilder.php          | 17 ++++++++++++++++-
 .../Test/Unit/Template/TransportBuilderTest.php |  4 ++--
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index e09e13ccded24..98bd942cd0b10 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -101,7 +101,7 @@ protected function configureEmailTemplate()
         $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());
         $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());
         $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());
-        $this->transportBuilder->setFrom(
+        $this->transportBuilder->setFromByStore(
             $this->identityContainer->getEmailIdentity(),
             $this->identityContainer->getStore()->getId()
         );
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
index a3b7f6ef574dc..86d65cc476668 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -76,7 +76,7 @@ protected function setUp()
                 'setTemplateIdentifier',
                 'setTemplateOptions',
                 'setTemplateVars',
-                'setFrom',
+                'setFromByStore',
             ]
         );
 
@@ -103,8 +103,8 @@ protected function setUp()
             ->method('getEmailIdentity')
             ->will($this->returnValue($emailIdentity));
         $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
-            ->with($this->equalTo($emailIdentity));
+            ->method('setFromByStore')
+            ->with($this->equalTo($emailIdentity), 1);
 
         $this->identityContainerMock->expects($this->once())
             ->method('getEmailCopyTo')
@@ -146,7 +146,7 @@ public function testSend()
             ->method('getId')
             ->willReturn(1);
         $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
+            ->method('setFromByStore')
             ->with($identity, 1);
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
@@ -176,7 +176,7 @@ public function testSendCopyTo()
             ->method('addTo')
             ->with($this->equalTo('example@mail.com'));
         $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
+            ->method('setFromByStore')
             ->with($identity, 1);
         $this->identityContainerMock->expects($this->once())
             ->method('getStore')
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 89f770cad4022..9343adfecf58d 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -177,8 +177,9 @@ public function setReplyTo($email, $name = null)
     /**
      * Set mail from address
      *
+     * @deprecated Use setFromByStore
+     * 
      * @param string|array $from
-     * @param string|int $store
      * @return $this
      */
     public function setFrom($from, $store = null)
@@ -188,6 +189,20 @@ public function setFrom($from, $store = null)
         return $this;
     }
 
+    /**
+     * Set mail from address by store
+     *
+     * @param string|array $from
+     * @param string|int $store
+     * @return $this
+     */
+    public function setFromByStore($from, $store = null)
+    {
+        $result = $this->_senderResolver->resolve($from, $store);
+        $this->message->setFrom($result['email'], $result['name']);
+        return $this;
+    }
+
     /**
      * Set template identifier
      *
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index 59560b4cbe2da..32bd536f96c9d 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -176,11 +176,11 @@ public function testSetFrom()
             ->with($sender, $store)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
-            ->method('setFrom')
+            ->method('setFromByStore')
             ->with('from@example.com', 'name')
             ->willReturnSelf();
 
-        $this->builder->setFrom($sender, $store);
+        $this->builder->setFromByStore($sender, $store);
     }
 
     /**

From 0dc85785e522e2be8c72dfeaee7e9f5054195034 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Tue, 16 Oct 2018 10:13:30 +0100
Subject: [PATCH 05/12] Removed code duplication

---
 .../Framework/Mail/Template/TransportBuilder.php      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 9343adfecf58d..7d29500bcd983 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -177,16 +177,17 @@ public function setReplyTo($email, $name = null)
     /**
      * Set mail from address
      *
-     * @deprecated Use setFromByStore
+     * @deprecated This function sets the from address for the first store only.
+     * new function setFromByStore introduced to allow setting of from address
+     * based on store.
+     * @see setFromByStore()
      * 
      * @param string|array $from
      * @return $this
      */
-    public function setFrom($from, $store = null)
+    public function setFrom($from)
     {
-        $result = $this->_senderResolver->resolve($from, $store);
-        $this->message->setFrom($result['email'], $result['name']);
-        return $this;
+        return($this->setFromByStore($from));
     }
 
     /**

From 122019c953037df74ef97245a42b274eae2e6639 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Tue, 16 Oct 2018 10:22:04 +0100
Subject: [PATCH 06/12] Fixed TransportBuilderTest

---
 .../Mail/Test/Unit/Template/TransportBuilderTest.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index 32bd536f96c9d..5f20a790a2d32 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -167,7 +167,7 @@ public function getTransportDataProvider()
     /**
      * @return void
      */
-    public function testSetFrom()
+    public function testSetFromByStore()
     {
         $sender = ['email' => 'from@example.com', 'name' => 'name'];
         $store = 1;
@@ -176,7 +176,7 @@ public function testSetFrom()
             ->with($sender, $store)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
-            ->method('setFromByStore')
+            ->method('setFrom')
             ->with('from@example.com', 'name')
             ->willReturnSelf();
 

From 193c6c2f6facf7276c1c8858d29ea3b847062ef5 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Tue, 16 Oct 2018 10:24:54 +0100
Subject: [PATCH 07/12] Fixed whitespace violations

---
 .../Magento/Framework/Mail/Template/TransportBuilder.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 7d29500bcd983..bb6727043f9b5 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -181,7 +181,7 @@ public function setReplyTo($email, $name = null)
      * new function setFromByStore introduced to allow setting of from address
      * based on store.
      * @see setFromByStore()
-     * 
+     *
      * @param string|array $from
      * @return $this
      */

From bd0aa57cc837918335015d051f08cf380dc186d0 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 17 Oct 2018 08:05:58 +0300
Subject: [PATCH 08/12] magento/magento2#18471 Alternative fix for Multi Store
 Emails issue

Fix small issue
---
 .../Magento/Framework/Mail/Template/TransportBuilder.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index bb6727043f9b5..3a9117deb4b17 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -187,7 +187,7 @@ public function setReplyTo($email, $name = null)
      */
     public function setFrom($from)
     {
-        return($this->setFromByStore($from));
+        return $this->setFromByStore($from, null);
     }
 
     /**

From 523b0464966f81f1f01aa13073092bfddf363219 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Thu, 18 Oct 2018 11:36:17 +0100
Subject: [PATCH 09/12] Reintroduced TransportBuilerByStore classes and marked
 deprecated

---
 .../Sales/Model/Order/Email/SenderBuilder.php |  7 +-
 .../Mail/Template/TransportBuilderByStore.php | 61 ++++++++++++++++++
 .../Template/TransportBuilderByStoreTest.php  | 64 +++++++++++++++++++
 3 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
 create mode 100644 lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php

diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index 98bd942cd0b10..a7d749ec04c7d 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -6,6 +6,7 @@
 namespace Magento\Sales\Model\Order\Email;
 
 use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
 use Magento\Sales\Model\Order\Email\Container\Template;
 
@@ -30,14 +31,18 @@ class SenderBuilder
     protected $transportBuilder;
 
     /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     *
      * @param Template $templateContainer
      * @param IdentityInterface $identityContainer
      * @param TransportBuilder $transportBuilder
+     * @param TransportBuilderByStore $transportBuilderByStore
      */
     public function __construct(
         Template $templateContainer,
         IdentityInterface $identityContainer,
-        TransportBuilder $transportBuilder
+        TransportBuilder $transportBuilder,
+        TransportBuilderByStore $transportBuilderByStore = null
     ) {
         $this->templateContainer = $templateContainer;
         $this->identityContainer = $identityContainer;
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
new file mode 100644
index 0000000000000..baac867fd6ce8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Mail\Template;
+
+use Magento\Framework\Mail\MessageInterface;
+
+/**
+ * Class TransportBuilderByStore
+ *
+ * @deprecated The ability to set From address based on store is now available
+ * in the \Magento\Framework\Mail\Template\TransportBuilder class
+ * @see \Magento\Framework\Mail\Template\TransportBuilder::setFromByStore
+ */
+class TransportBuilderByStore
+{
+    /**
+     * Message.
+     *
+     * @var \Magento\Framework\Mail\Message
+     */
+    protected $message;
+
+    /**
+     * Sender resolver.
+     *
+     * @var \Magento\Framework\Mail\Template\SenderResolverInterface
+     */
+    private $senderResolver;
+
+    /**
+     * @param MessageInterface $message
+     * @param SenderResolverInterface $senderResolver
+     */
+    public function __construct(
+        MessageInterface $message,
+        SenderResolverInterface $senderResolver
+    ) {
+        $this->message = $message;
+        $this->senderResolver = $senderResolver;
+    }
+
+    /**
+     * Set mail from address by store.
+     *
+     * @param string|array $from
+     * @param string|int $store
+     *
+     * @return $this
+     */
+    public function setFromByStore($from, $store)
+    {
+        $result = $this->senderResolver->resolve($from, $store);
+        $this->message->setFrom($result['email'], $result['name']);
+
+        return $this;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
new file mode 100644
index 0000000000000..80df2887a3a93
--- /dev/null
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Mail\Test\Unit\Template;
+
+use Magento\Framework\Mail\Template\TransportBuilderByStore;
+
+class TransportBuilderByStoreTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Mail\Template\TransportBuilderByStore
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Framework\Mail\Message | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $messageMock;
+
+    /**
+     * @var \Magento\Framework\Mail\Template\SenderResolverInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $senderResolverMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->messageMock = $this->createMock(\Magento\Framework\Mail\Message::class);
+        $this->senderResolverMock = $this->createMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
+
+        $this->model = $objectManagerHelper->getObject(
+            TransportBuilderByStore::class,
+            [
+                'message' => $this->messageMock,
+                'senderResolver' => $this->senderResolverMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testSetFromByStore()
+    {
+        $sender = ['email' => 'from@example.com', 'name' => 'name'];
+        $store = 1;
+        $this->senderResolverMock->expects($this->once())
+            ->method('resolve')
+            ->with($sender, $store)
+            ->willReturn($sender);
+        $this->messageMock->expects($this->once())
+            ->method('setFrom')
+            ->with('from@example.com', 'name')
+            ->willReturnSelf();
+
+        $this->model->setFromByStore($sender, $store);
+    }
+}

From c32ca7a0d58cbc57276349b26eb5ecd38451fd2d Mon Sep 17 00:00:00 2001
From: gwharton <30697781+gwharton@users.noreply.github.com>
Date: Sat, 20 Oct 2018 14:13:29 +0100
Subject: [PATCH 10/12] Fixed Whitespace issue

---
 .../Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
index 86d65cc476668..759d60d9e6613 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -122,7 +122,7 @@ public function testSend()
         $customerName = 'test_name';
         $customerEmail = 'test_email';
         $identity = 'email_identity_test';
-        
+
         $transportMock = $this->createMock(
             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
         );

From e39ce7a3f2a7e6ee134cff9a097b7321756c32cf Mon Sep 17 00:00:00 2001
From: Joshua Bixler <jbixler@vervocity.io>
Date: Thu, 8 Nov 2018 11:00:03 -0600
Subject: [PATCH 11/12] Correct setFrom in Magento\Framework\Mail\Template to
 match Zend Message

---
 lib/internal/Magento/Framework/Mail/Message.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index 6f156e42dfdba..d3b8569a0b27e 100644
--- a/lib/internal/Magento/Framework/Mail/Message.php
+++ b/lib/internal/Magento/Framework/Mail/Message.php
@@ -90,9 +90,9 @@ public function getBody()
     /**
      * {@inheritdoc}
      */
-    public function setFrom($fromAddress)
+    public function setFrom($fromAddress, $name = null)
     {
-        $this->zendMessage->setFrom($fromAddress);
+        $this->zendMessage->setFrom($fromAddress, $name);
         return $this;
     }
 

From 99621b32f8c7d3d12f83db7e67f5f1c1ef3e7f31 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Thu, 8 Nov 2018 17:12:58 +0000
Subject: [PATCH 12/12] Fixed setFrom function by deprecating old and
 introducing new function.

---
 lib/internal/Magento/Framework/Mail/Message.php   | 15 ++++++++++++++-
 .../Framework/Mail/Template/TransportBuilder.php  |  2 +-
 .../Mail/Template/TransportBuilderByStore.php     |  2 +-
 .../Unit/Template/TransportBuilderByStoreTest.php |  4 ++--
 .../Test/Unit/Template/TransportBuilderTest.php   |  4 ++--
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index 6f156e42dfdba..bc7193f107bb5 100644
--- a/lib/internal/Magento/Framework/Mail/Message.php
+++ b/lib/internal/Magento/Framework/Mail/Message.php
@@ -89,10 +89,23 @@ public function getBody()
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated This function is missing the from name. The
+     * setFromAddress() function sets both from address and from name.
+     * @see setFromAddress()
      */
     public function setFrom($fromAddress)
     {
-        $this->zendMessage->setFrom($fromAddress);
+        $this->setFromAddress($fromAddress, null);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setFromAddress($fromAddress, $fromName = null)
+    {
+        $this->zendMessage->setFrom($fromAddress, $fromName);
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 3a9117deb4b17..a7bb96122a84d 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -200,7 +200,7 @@ public function setFrom($from)
     public function setFromByStore($from, $store = null)
     {
         $result = $this->_senderResolver->resolve($from, $store);
-        $this->message->setFrom($result['email'], $result['name']);
+        $this->message->setFromAddress($result['email'], $result['name']);
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
index baac867fd6ce8..85b1b181d4f9e 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
@@ -54,7 +54,7 @@ public function __construct(
     public function setFromByStore($from, $store)
     {
         $result = $this->senderResolver->resolve($from, $store);
-        $this->message->setFrom($result['email'], $result['name']);
+        $this->message->setFromAddress($result['email'], $result['name']);
 
         return $this;
     }
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
index 80df2887a3a93..a28dbcd291baf 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
@@ -55,8 +55,8 @@ public function testSetFromByStore()
             ->with($sender, $store)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
-            ->method('setFrom')
-            ->with('from@example.com', 'name')
+            ->method('setFromAddress')
+            ->with($sender['email'], $sender['name'])
             ->willReturnSelf();
 
         $this->model->setFromByStore($sender, $store);
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index 5f20a790a2d32..b476eecd7f59f 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -176,8 +176,8 @@ public function testSetFromByStore()
             ->with($sender, $store)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
-            ->method('setFrom')
-            ->with('from@example.com', 'name')
+            ->method('setFromAddress')
+            ->with($sender['email'], $sender['name'])
             ->willReturnSelf();
 
         $this->builder->setFromByStore($sender, $store);