Guest User

Untitled

a guest
Dec 12th, 2018
112
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.07 KB | None | 0 0
  1. @package magento/framework
  2.  
  3. Index: Mail/Template/TransportBuilderByStore.php
  4. IDEA additional info:
  5. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  6. <+>UTF-8
  7. ===================================================================
  8. --- Mail/Template/TransportBuilderByStore.php (revision fb55bb2774fd6e2e4d4ea892372121836d7d319a)
  9. +++ Mail/Template/TransportBuilderByStore.php (date 1544600040000)
  10. @@ -8,6 +8,13 @@
  11.  
  12. use Magento\Framework\Mail\MessageInterface;
  13.  
  14. +/**
  15. + * Class TransportBuilderByStore
  16. + *
  17. + * @deprecated The ability to set From address based on store is now available
  18. + * in the \Magento\Framework\Mail\Template\TransportBuilder class
  19. + * @see \Magento\Framework\Mail\Template\TransportBuilder::setFromByStore
  20. + */
  21. class TransportBuilderByStore
  22. {
  23. /**
  24. Index: Mail/Test/Unit/Template/TransportBuilderTest.php
  25. IDEA additional info:
  26. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  27. <+>UTF-8
  28. ===================================================================
  29. --- Mail/Test/Unit/Template/TransportBuilderTest.php (revision fb55bb2774fd6e2e4d4ea892372121836d7d319a)
  30. +++ Mail/Test/Unit/Template/TransportBuilderTest.php (date 1544600040000)
  31. @@ -164,19 +164,20 @@
  32. /**
  33. * @return void
  34. */
  35. - public function testSetFrom()
  36. + public function testSetFromByStore()
  37. {
  38. $sender = ['email' => 'from@example.com', 'name' => 'name'];
  39. + $store = 1;
  40. $this->senderResolverMock->expects($this->once())
  41. ->method('resolve')
  42. - ->with($sender)
  43. + ->with($sender, $store)
  44. ->willReturn($sender);
  45. $this->messageMock->expects($this->once())
  46. ->method('setFrom')
  47. ->with('from@example.com', 'name')
  48. ->willReturnSelf();
  49.  
  50. - $this->builder->setFrom($sender);
  51. + $this->builder->setFromByStore($sender, $store);
  52. }
  53.  
  54. /**
  55. Index: Mail/Template/TransportBuilder.php
  56. IDEA additional info:
  57. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  58. <+>UTF-8
  59. ===================================================================
  60. --- Mail/Template/TransportBuilder.php (revision fb55bb2774fd6e2e4d4ea892372121836d7d319a)
  61. +++ Mail/Template/TransportBuilder.php (date 1544600040000)
  62. @@ -173,12 +173,29 @@
  63. /**
  64. * Set mail from address
  65. *
  66. + * @deprecated This function sets the from address for the first store only.
  67. + * new function setFromByStore introduced to allow setting of from address
  68. + * based on store.
  69. + * @see setFromByStore()
  70. + *
  71. * @param string|array $from
  72. * @return $this
  73. */
  74. public function setFrom($from)
  75. {
  76. - $result = $this->_senderResolver->resolve($from);
  77. + return $this->setFromByStore($from, null);
  78. + }
  79. +
  80. + /**
  81. + * Set mail from address by store
  82. + *
  83. + * @param string|array $from
  84. + * @param string|int $store
  85. + * @return $this
  86. + */
  87. + public function setFromByStore($from, $store = null)
  88. + {
  89. + $result = $this->_senderResolver->resolve($from, $store);
  90. $this->message->setFrom($result['email'], $result['name']);
  91. return $this;
  92. }
Add Comment
Please, Sign In to add comment