Skip to content

Commit 3d628f8

Browse files
author
Oleksii Korshenko
authored
Merge pull request #1769 from magento-engcom/2.2-develop-prs
Public Pull Requests #1770 9515: South Korea Zip Code Validation incorrect by @RomaKis #12132 10210: Transport variable can not be altered in email_invoice_set_template_vars_before Event (backport MAGETWO-69482 to 2.2) by @RomaKis Fixed Public Issues #9515 South Korea Zip Code Validation incorrect #10210 Transport variable can not be altered in email_invoice_set_template_vars_before Event
2 parents 9c3d257 + 9e5c010 commit 3d628f8

File tree

15 files changed

+92
-30
lines changed

15 files changed

+92
-30
lines changed

‎app/code/Magento/Directory/etc/zip_codes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
</zip>
227227
<zip countryCode="KR">
228228
<codes>
229-
<code id="pattern_1" active="true" example="123-456">^[0-9]{3}-[0-9]{3}$</code>
229+
<code id="pattern_1" active="true" example="12345">^[0-9]{5}$</code>
230230
</codes>
231231
</zip>
232232
<zip countryCode="KG">

‎app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77

88
use Magento\Sales\Model\Order\Email\Sender;
99
use Magento\Sales\Model\Order\Creditmemo\SenderInterface;
10+
use Magento\Framework\DataObject;
1011

1112
/**
1213
* Email notification sender for Creditmemo.
14+
*
15+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1316
*/
1417
class EmailSender extends Sender implements SenderInterface
1518
{
@@ -106,13 +109,17 @@ public function send(
106109
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
107110
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
108111
];
112+
$transportObject = new DataObject($transport);
109113

114+
/**
115+
* Event argument `transport` is @deprecated. Use `transportObject` instead.
116+
*/
110117
$this->eventManager->dispatch(
111118
'email_creditmemo_set_template_vars_before',
112-
['sender' => $this, 'transport' => $transport]
119+
['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
113120
);
114121

115-
$this->templateContainer->setTemplateVars($transport);
122+
$this->templateContainer->setTemplateVars($transportObject->getData());
116123

117124
if ($this->checkAndSend($order)) {
118125
$creditmemo->setEmailSent(true);

‎app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\Sales\Model\Order\Email\NotifySender;
1313
use Magento\Sales\Model\Order\Address\Renderer;
1414
use Magento\Framework\Event\ManagerInterface;
15+
use Magento\Framework\DataObject;
1516

1617
/**
1718
* Class CreditmemoCommentSender
@@ -71,13 +72,17 @@ public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
7172
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
7273
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
7374
];
75+
$transportObject = new DataObject($transport);
7476

77+
/**
78+
* Event argument `transport` is @deprecated. Use `transportObject` instead.
79+
*/
7580
$this->eventManager->dispatch(
7681
'email_creditmemo_comment_set_template_vars_before',
77-
['sender' => $this, 'transport' => $transport]
82+
['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
7883
);
7984

80-
$this->templateContainer->setTemplateVars($transport);
85+
$this->templateContainer->setTemplateVars($transportObject->getData());
8186

8287
return $this->checkAndSend($order, $notify);
8388
}

‎app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Magento\Sales\Model\ResourceModel\Order\Creditmemo as CreditmemoResource;
1515
use Magento\Sales\Model\Order\Address\Renderer;
1616
use Magento\Framework\Event\ManagerInterface;
17+
use Magento\Framework\DataObject;
1718

1819
/**
1920
* Class CreditmemoSender
@@ -102,7 +103,7 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
102103

103104
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
104105
$order = $creditmemo->getOrder();
105-
106+
106107
$transport = [
107108
'order' => $order,
108109
'creditmemo' => $creditmemo,
@@ -113,13 +114,17 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
113114
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
114115
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
115116
];
117+
$transportObject = new DataObject($transport);
116118

119+
/**
120+
* Event argument `transport` is @deprecated. Use `transportObject` instead.
121+
*/
117122
$this->eventManager->dispatch(
118123
'email_creditmemo_set_template_vars_before',
119-
['sender' => $this, 'transport' => $transport]
124+
['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
120125
);
121126

122-
$this->templateContainer->setTemplateVars($transport);
127+
$this->templateContainer->setTemplateVars($transportObject->getData());
123128

124129
if ($this->checkAndSend($order)) {
125130
$creditmemo->setEmailSent(true);

‎app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\Sales\Model\Order\Invoice;
1313
use Magento\Sales\Model\Order\Address\Renderer;
1414
use Magento\Framework\Event\ManagerInterface;
15+
use Magento\Framework\DataObject;
1516

1617
/**
1718
* Class InvoiceCommentSender
@@ -71,13 +72,17 @@ public function send(Invoice $invoice, $notify = true, $comment = '')
7172
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
7273
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
7374
];
75+
$transportObject = new DataObject($transport);
7476

77+
/**
78+
* Event argument `transport` is @deprecated. Use `transportObject` instead.
79+
*/
7580
$this->eventManager->dispatch(
7681
'email_invoice_comment_set_template_vars_before',
77-
['sender' => $this, 'transport' => $transport]
82+
['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
7883
);
7984

80-
$this->templateContainer->setTemplateVars($transport);
85+
$this->templateContainer->setTemplateVars($transportObject->getData());
8186

8287
return $this->checkAndSend($order, $notify);
8388
}

‎app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Magento\Sales\Model\ResourceModel\Order\Invoice as InvoiceResource;
1515
use Magento\Sales\Model\Order\Address\Renderer;
1616
use Magento\Framework\Event\ManagerInterface;
17+
use Magento\Framework\DataObject;
1718

1819
/**
1920
* Class InvoiceSender
@@ -113,13 +114,17 @@ public function send(Invoice $invoice, $forceSyncMode = false)
113114
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
114115
'formattedBillingAddress' => $this->getFormattedBillingAddress($order)
115116
];
117+
$transportObject = new DataObject($transport);
116118

119+
/**
120+
* Event argument `transport` is @deprecated. Use `transportObject` instead.
121+
*/
117122
$this->eventManager->dispatch(
118123
'email_invoice_set_template_vars_before',
119-
['sender' => $this, 'transport' => $transport]
124+
['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
120125
);
121126

122-
$this->templateContainer->setTemplateVars($transport);
127+
$this->templateContainer->setTemplateVars($transportObject->getData());
123128

124129
if ($this->checkAndSend($order)) {
125130
$invoice->setEmailSent(true);

‎app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Magento\Sales\Model\Order\Email\NotifySender;
1212
use Magento\Sales\Model\Order\Address\Renderer;
1313
use Magento\Framework\Event\ManagerInterface;
14+
use Magento\Framework\DataObject;
1415

1516
/**
1617
* Class OrderCommentSender
@@ -68,13 +69,17 @@ public function send(Order $order, $notify = true, $comment = '')
6869
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
6970
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
7071
];
72+
$transportObject = new DataObject($transport);
7173

74+
/**
75+
* Event argument `transport` is @deprecated. Use `transportObject` instead.
76+
*/
7277
$this->eventManager->dispatch(
7378
'email_order_comment_set_template_vars_before',
74-
['sender' => $this, 'transport' => $transport]
79+
['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
7580
);
7681

77-
$this->templateContainer->setTemplateVars($transport);
82+
$this->templateContainer->setTemplateVars($transportObject->getData());
7883

7984
return $this->checkAndSend($order, $notify);
8085
}

‎app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\Sales\Model\Order\Shipment;
1313
use Magento\Sales\Model\Order\Address\Renderer;
1414
use Magento\Framework\Event\ManagerInterface;
15+
use Magento\Framework\DataObject;
1516

1617
/**
1718
* Class ShipmentCommentSender
@@ -71,13 +72,17 @@ public function send(Shipment $shipment, $notify = true, $comment = '')
7172
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
7273
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
7374
];
75+
$transportObject = new DataObject($transport);
7476

77+
/**
78+
* Event argument `transport` is @deprecated. Use `transportObject` instead.
79+
*/
7580
$this->eventManager->dispatch(
7681
'email_shipment_comment_set_template_vars_before',
77-
['sender' => $this, 'transport' => $transport]
82+
['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
7883
);
7984

80-
$this->templateContainer->setTemplateVars($transport);
85+
$this->templateContainer->setTemplateVars($transportObject->getData());
8186

8287
return $this->checkAndSend($order, $notify);
8388
}

‎app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Magento\Sales\Model\ResourceModel\Order\Shipment as ShipmentResource;
1515
use Magento\Sales\Model\Order\Address\Renderer;
1616
use Magento\Framework\Event\ManagerInterface;
17+
use Magento\Framework\DataObject;
1718

1819
/**
1920
* Class ShipmentSender
@@ -102,7 +103,7 @@ public function send(Shipment $shipment, $forceSyncMode = false)
102103

103104
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
104105
$order = $shipment->getOrder();
105-
106+
106107
$transport = [
107108
'order' => $order,
108109
'shipment' => $shipment,
@@ -113,13 +114,17 @@ public function send(Shipment $shipment, $forceSyncMode = false)
113114
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
114115
'formattedBillingAddress' => $this->getFormattedBillingAddress($order)
115116
];
117+
$transportObject = new DataObject($transport);
116118

119+
/**
120+
* Event argument `transport` is @deprecated. Use `transportObject` instead.
121+
*/
117122
$this->eventManager->dispatch(
118123
'email_shipment_set_template_vars_before',
119-
['sender' => $this, 'transport' => $transport]
124+
['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
120125
);
121126

122-
$this->templateContainer->setTemplateVars($transport);
127+
$this->templateContainer->setTemplateVars($transportObject->getData());
123128

124129
if ($this->checkAndSend($order)) {
125130
$shipment->setEmailSent(true);

‎app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77

88
use Magento\Sales\Model\Order\Email\Sender;
99
use Magento\Sales\Model\Order\Invoice\SenderInterface;
10+
use Magento\Framework\DataObject;
1011

1112
/**
1213
* Email notification sender for Invoice.
14+
*
15+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1316
*/
1417
class EmailSender extends Sender implements SenderInterface
1518
{
@@ -106,13 +109,17 @@ public function send(
106109
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
107110
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
108111
];
112+
$transportObject = new DataObject($transport);
109113

114+
/**
115+
* Event argument `transport` is @deprecated. Use `transportObject` instead.
116+
*/
110117
$this->eventManager->dispatch(
111118
'email_invoice_set_template_vars_before',
112-
['sender' => $this, 'transport' => $transport]
119+
['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
113120
);
114121

115-
$this->templateContainer->setTemplateVars($transport);
122+
$this->templateContainer->setTemplateVars($transportObject->getData());
116123

117124
if ($this->checkAndSend($order)) {
118125
$invoice->setEmailSent(true);

0 commit comments

Comments
 (0)