Confirmation emails have no FROM or FROM email address 2.2.4 magento#…

…14952. Undone commit f2bfdd9 which caused issue
sashas777 · May 4, 2018 · da9b12e · da9b12e
1 parent aca8c0b
commit da9b12e
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 142 deletions.
diff --git 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->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
@@ -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,10 +76,10 @@ protected function setUp()
  'setTemplateIdentifier',
  'setTemplateOptions',
  'setTemplateVars',
+ 'setFromByStore'
  ]
  );
 
- $this->transportBuilderByStore = $this->createMock(TransportBuilderByStore::class);
 
  $this->templateContainerMock->expects($this->once())
  ->method('getTemplateId')
@@ -109,7 +103,7 @@ protected function setUp()
  $this->identityContainerMock->expects($this->once())
  ->method('getEmailIdentity')
  ->will($this->returnValue($emailIdentity));
- $this->transportBuilderByStore->expects($this->once())
+ $this->transportBuilder->expects($this->once())
  ->method('setFromByStore')
  ->with($this->equalTo($emailIdentity));
 
@@ -120,8 +114,7 @@ protected function setUp()
  $this->senderBuilder = new SenderBuilder(
  $this->templateContainerMock,
  $this->identityContainerMock,
- $this->transportBuilder,
- $this->transportBuilderByStore
+ $this->transportBuilder
  );
  }
 

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -279,4 +279,20 @@ protected function prepareMessage()
 
  return $this;
  }
+
+ /**
+ * 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/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -216,4 +216,23 @@ public function testSetReplyTo()
 
  $this->builder->setReplyTo('replyTo@example.com', 'replyName');
  }
+
+ /**
+ * @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);
+ }
 }