Skip to content

Commit 9b71e40

Browse files
author
Joan He
committed
MAGETWO-99477：[Backport for 2.2] Eliminate @escapeNotVerified in Checkout-related (CE) Modules
1 parent 670a3c2 commit 9b71e40

File tree

5 files changed

+95
-87
lines changed

5 files changed

+95
-87
lines changed

‎app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
* Shopping cart additional info
1111
* @var $block \Magento\Framework\View\Element\Template
1212
*/
13+
14+
// phpcs:disable PSR2.Files.ClosingTag
1315
?>
1416
<?php
1517
$name = $block->getNameInLayout();

‎app/code/Magento/Checkout/view/frontend/templates/js/components.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
// phpcs:disable PSR2.Files.ClosingTag
78
?>
89
<?= $block->getChildHtml() ?>

‎app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
*/
66

77
?>
8-
<?php /** @var $block \Magento\Checkout\Block\Shipping\Price */ ?>
8+
<?php
9+
// phpcs:disable PSR2.Files.ClosingTag
10+
11+
/** @var $block \Magento\Checkout\Block\Shipping\Price */
12+
?>
913

1014
<?php $shippingPrice = $block->getShippingPrice(); ?>
1115
<?= $block->escapeHtml($shippingPrice) ?>

‎app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -77,49 +77,49 @@
7777
<ol class="items">
7878
<?php foreach ($block->getItems() as $_index => $_item): ?>
7979
<?php $_product = $_item->getProduct() ?>
80-
<li class="item">
81-
<div class="product">
82-
<div class="number">
83-
<?= $block->escapeHtml(__('<span>Item %1</span> of %2', $_index+1, $block->countItems()), ['span']) ?>
84-
</div>
85-
<div class="img photo container">
86-
<?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
87-
</div>
88-
<strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
89-
</div>
90-
<div class="options">
91-
<div class="options-items-container" id="options-items-container-<?= (int) $block->getEntity()->getId() ?>-<?= (int) $_item->getId() ?>"></div>
92-
<?php if ($block->isItemMessagesAvailable($_item)): ?>
93-
<button class="action action-gift"
94-
data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId() ?>"}}'>
95-
<span><?= $block->escapeHtml(__('Gift Message')) ?></span>
96-
</button>
97-
<div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>" class="block message hidden">
98-
<fieldset class="fieldset">
99-
<p><?= $block->escapeHtml(__('Leave a box blank if you don\'t want to add a gift message for that item.')) ?></p>
100-
<div class="field from">
101-
<label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
102-
<div class="control">
103-
<input type="text" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
104-
</div>
105-
</div>
106-
<div class="field to">
107-
<label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label"><span><?= $block->escapeHtmlAttr(__('To')) ?></span></label>
108-
<div class="control">
109-
<input type="text" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
110-
</div>
111-
</div>
112-
<div class="field text">
113-
<label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
114-
<div class="control">
115-
<textarea id="gift-message-<?= (int) $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
116-
</div>
117-
</div>
118-
</fieldset>
119-
</div>
120-
<?php endif; ?>
121-
</div>
122-
</li>
80+
<li class="item">
81+
<div class="product">
82+
<div class="number">
83+
<?= $block->escapeHtml(__('<span>Item %1</span> of %2', $_index+1, $block->countItems()), ['span']) ?>
84+
</div>
85+
<div class="img photo container">
86+
<?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
87+
</div>
88+
<strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
89+
</div>
90+
<div class="options">
91+
<div class="options-items-container" id="options-items-container-<?= (int) $block->getEntity()->getId() ?>-<?= (int) $_item->getId() ?>"></div>
92+
<?php if ($block->isItemMessagesAvailable($_item)): ?>
93+
<button class="action action-gift"
94+
data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId() ?>"}}'>
95+
<span><?= $block->escapeHtml(__('Gift Message')) ?></span>
96+
</button>
97+
<div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>" class="block message hidden">
98+
<fieldset class="fieldset">
99+
<p><?= $block->escapeHtml(__('Leave a box blank if you don\'t want to add a gift message for that item.')) ?></p>
100+
<div class="field from">
101+
<label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
102+
<div class="control">
103+
<input type="text" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
104+
</div>
105+
</div>
106+
<div class="field to">
107+
<label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label"><span><?= $block->escapeHtmlAttr(__('To')) ?></span></label>
108+
<div class="control">
109+
<input type="text" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
110+
</div>
111+
</div>
112+
<div class="field text">
113+
<label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
114+
<div class="control">
115+
<textarea id="gift-message-<?= (int) $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
116+
</div>
117+
</div>
118+
</fieldset>
119+
</div>
120+
<?php endif; ?>
121+
</div>
122+
</li>
123123
<?php endforeach; ?>
124124
</ol>
125125
</dd>
@@ -204,53 +204,53 @@ case 'multishipping_address': ?>
204204

205205
<dd id="allow-gift-options-for-items-container-<?= (int) $block->getEntity()->getId() ?>" class="order-options individual">
206206
<ol class="items">
207-
<?php foreach ($block->getItems() as $_index => $_item): ?>
208-
<?php $_product = $_item->getProduct() ?>
209-
<li class="item">
210-
<div class="product">
211-
<div class="number"><?= $block->escapeHtml(__('<span>Item %1</span> of %2', $_index+1, $block->countItems()), ['span']) ?></div>
212-
<div class="img photo container">
213-
<?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
207+
<?php foreach ($block->getItems() as $_index => $_item): ?>
208+
<?php $_product = $_item->getProduct() ?>
209+
<li class="item">
210+
<div class="product">
211+
<div class="number"><?= $block->escapeHtml(__('<span>Item %1</span> of %2', $_index+1, $block->countItems()), ['span']) ?></div>
212+
<div class="img photo container">
213+
<?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
214+
</div>
215+
<strong class="product-name"><?= $block->escapeHtml($_product->getName()) ?></strong>
214216
</div>
215-
<strong class="product-name"><?= $block->escapeHtml($_product->getName()) ?></strong>
216-
</div>
217-
<div class="options">
218-
<div class="options-items-container" id="options-items-container-<?= (int) $block->getEntity()->getId() ?>-<?= (int) $_item->getId() ?>"></div>
219-
<input type="hidden" name="giftoptions[quote_address_item][<?= (int) $_item->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
220-
<?php if ($block->isItemMessagesAvailable($_item)): ?>
221-
<?php $_giftMessage = true; ?>
222-
<button class="action action-gift"
223-
data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId() ?>"}}'>
224-
<span><?= $block->escapeHtml(__('Gift Message')) ?></span>
225-
</button>
226-
<div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>" class="block message hidden">
227-
<fieldset class="fieldset">
228-
<p><?= $block->escapeHtml(__('You can leave this box blank if you don\'t want to add a gift message for the item.')) ?></p>
229-
<input type="hidden" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
230-
<div class="field from">
231-
<label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
232-
<div class="control">
233-
<input type="text" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
217+
<div class="options">
218+
<div class="options-items-container" id="options-items-container-<?= (int) $block->getEntity()->getId() ?>-<?= (int) $_item->getId() ?>"></div>
219+
<input type="hidden" name="giftoptions[quote_address_item][<?= (int) $_item->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
220+
<?php if ($block->isItemMessagesAvailable($_item)): ?>
221+
<?php $_giftMessage = true; ?>
222+
<button class="action action-gift"
223+
data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId() ?>"}}'>
224+
<span><?= $block->escapeHtml(__('Gift Message')) ?></span>
225+
</button>
226+
<div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>" class="block message hidden">
227+
<fieldset class="fieldset">
228+
<p><?= $block->escapeHtml(__('You can leave this box blank if you don\'t want to add a gift message for the item.')) ?></p>
229+
<input type="hidden" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
230+
<div class="field from">
231+
<label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
232+
<div class="control">
233+
<input type="text" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
234+
</div>
234235
</div>
235-
</div>
236-
<div class="field to">
237-
<label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
238-
<div class="control">
239-
<input type="text" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
236+
<div class="field to">
237+
<label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
238+
<div class="control">
239+
<input type="text" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
240+
</div>
240241
</div>
241-
</div>
242-
<div class="field text">
243-
<label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
244-
<div class="control">
245-
<textarea id="gift-message-<?= (int) $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
242+
<div class="field text">
243+
<label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
244+
<div class="control">
245+
<textarea id="gift-message-<?= (int) $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
246+
</div>
246247
</div>
247-
</div>
248-
</fieldset>
249-
</div>
250-
<?php endif; ?>
251-
</div>
252-
</li>
253-
<?php endforeach; ?>
248+
</fieldset>
249+
</div>
250+
<?php endif; ?>
251+
</div>
252+
</li>
253+
<?php endforeach; ?>
254254
</ol>
255255
</dd>
256256
<?php endif; ?>

‎app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
// phpcs:disable PSR2.Files.ClosingTag
78
?>
89
<?= $block->getChildHtml() ?>

0 commit comments

Comments
 (0)