Skip to content

Magento_GiftMessage: avoid using deprecated escape* methods from Abst… #31705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Magento_GiftMessage: avoid using deprecated escape* methods from Abst… #31705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function getMessageText()
{
if ($this->getItem()->getGiftMessageId()) {
$model = $this->_messageHelper->getGiftMessage($this->getItem()->getGiftMessageId());
return $this->escapeHtml($model->getMessage());
return $this->_escaper->escapeHtml($model->getMessage());
}
return '';
}
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public function canDisplayGiftmessage()
*/
public function getSender()
{
return $this->escapeHtml($this->getMessage()->getSender());
return $this->_escaper->escapeHtml($this->getMessage()->getSender());
}

/**
Expand All @@ -220,7 +220,7 @@ public function getSender()
*/
public function getRecipient()
{
return $this->escapeHtml($this->getMessage()->getRecipient());
return $this->_escaper->escapeHtml($this->getMessage()->getRecipient());
}

/**
Expand All @@ -230,6 +230,6 @@ public function getRecipient()
*/
public function getMessageText()
{
return $this->escapeHtml($this->getMessage()->getMessage());
return $this->_escaper->escapeHtml($this->getMessage()->getMessage());
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/GiftMessage/Block/Message/Inline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ public function getEntityHasMessage()
*/
public function getEscaped($value, $defaultValue = '')
{
return $this->escapeHtml(trim($value) != '' ? $value : $defaultValue);
return $this->_escaper->escapeHtml(trim($value) != '' ? $value : $defaultValue);
}

/**
Expand Down
10 changes: 7 additions & 3 deletions app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,24 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

/**
* @var \Magento\Framework\Escaper $escaper
*/
?>

<?php if ($block->canDisplayGiftmessageForm()) : ?>
<div id="gift_options_giftmessage" class="giftcard-form giftcard-send-form fieldset admin__fieldset">
<div class="field admin__field">
<label class="admin__field-label" for="current_item_giftmessage_sender"><?= $block->escapeHtml(__('From')) ?></label>
<label class="admin__field-label" for="current_item_giftmessage_sender"><?= $escaper->escapeHtml(__('From')) ?></label>
<div class="control admin__field-control">
<input type="text" class="input-text admin__control-text"
name="current_item_giftmessage_sender"
id="current_item_giftmessage_sender" />
</div>
</div>
<div class="field admin__field">
<label class="admin__field-label" for="current_item_giftmessage_recipient"><?= $block->escapeHtml(__('To')) ?></label>
<label class="admin__field-label" for="current_item_giftmessage_recipient"><?= $escaper->escapeHtml(__('To')) ?></label>
<div class="control admin__field-control">
<input type="text"
class="input-text admin__control-text"
Expand All @@ -25,7 +29,7 @@
</div>
</div>
<div class="field admin__field">
<label class="admin__field-label" for="current_item_giftmessage_message"><?= $block->escapeHtml(__('Message')) ?></label>
<label class="admin__field-label" for="current_item_giftmessage_message"><?= $escaper->escapeHtml(__('Message')) ?></label>
<div class="control admin__field-control">
<textarea class="textarea admin__control-textarea"
cols="15"
Expand Down
9 changes: 6 additions & 3 deletions app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
* See COPYING.txt for license details.
*/

/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
/**
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
* @var \Magento\Framework\Escaper $escaper
*/
?>

<?php if ($block->getChildHtml()):?>
Expand All @@ -15,10 +18,10 @@
</div>
<div class="ui-dialog-buttonset">
<button type="button" class="action-close" id="gift_options_cancel_button">
<span><?= $block->escapeHtml(__('Cancel')) ?></span>
<span><?= $escaper->escapeHtml(__('Cancel')) ?></span>
</button>
<button type="button" class="action-primary" id="gift_options_ok_button">
<span><?= $block->escapeHtml(__('OK')) ?></span>
<span><?= $escaper->escapeHtml(__('OK')) ?></span>
</button>
</div>
</div>
Expand Down
7 changes: 5 additions & 2 deletions app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
* See COPYING.txt for license details.
*/

/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
/**
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
* @var \Magento\Framework\Escaper $escaper
*/
?>

<?php $_item = $block->getItem() ?>
Expand All @@ -14,7 +17,7 @@
<tr class="row-gift-options">
<td colspan="7">
<a class="action-link" href="#" id="gift_options_link_<?= (int) $_item->getId() ?>">
<?= $block->escapeHtml(__('Gift Options')) ?>
<?= $escaper->escapeHtml(__('Gift Options')) ?>
</a>
<?php $itemId = (int) ($_item->getId());
$scriptString = <<<script
Expand Down
6 changes: 5 additions & 1 deletion app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

/**
* @var \Magento\Framework\Escaper $escaper
*/
?>

<?php if ($block->canDisplayGiftMessage()) : ?>
Expand All @@ -13,7 +17,7 @@

<?php if ($block->getMessageText()) : ?>
<div class="gift-options-tooltip-content">
<div><strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>:</div>
<div><strong><?= $escaper->escapeHtml(__('Gift Message')) ?></strong>:</div>
<div><?= /* @noEscape */ $block->getMessageText() ?></div>
</div>
<?php endif; ?>
Expand Down
7 changes: 5 additions & 2 deletions app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
* See COPYING.txt for license details.
*/

/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
/**
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
* @var \Magento\Framework\Escaper $escaper
*/
?>

<?php $_childHtml = trim($block->getChildHtml('', false)); ?>
Expand All @@ -13,7 +16,7 @@
<tr>
<td colspan="10" class="last">
<a class="action-link" href="#" id="gift_options_link_<?= (int) $_item->getId() ?>">
<?= $block->escapeHtml(__('Gift Options')) ?>
<?= $escaper->escapeHtml(__('Gift Options')) ?>
</a>
<?php $itemId = (int) ($_item->getId());
$scriptString = <<<script
Expand Down
32 changes: 18 additions & 14 deletions app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,37 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

/**
* @var \Magento\Framework\Escaper $escaper
*/
?>

<?php if ($block->canDisplayGiftmessage()) : ?>
<div id="gift-message-form-data-<?= (int) $block->getItem()->getId() ?>" class="no-display">
<form id="<?= $block->escapeHtmlAttr($block->getFieldId('form')) ?>"
action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
<form id="<?= $escaper->escapeHtmlAttr($block->getFieldId('form')) ?>"
action="<?= $escaper->escapeUrl($block->getSaveUrl()) ?>">
<input type="hidden"
id="<?= $block->escapeHtmlAttr($block->getFieldId('type')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('type')) ?>"
id="<?= $escaper->escapeHtmlAttr($block->getFieldId('type')) ?>"
name="<?= $escaper->escapeHtmlAttr($block->getFieldName('type')) ?>"
value="order_item" />
<input type="hidden"
id="<?= $block->escapeHtmlAttr($block->getFieldId('sender')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('sender')) ?>"
value="<?= $block->escapeHtmlAttr($block->getSender()) ?>" />
id="<?= $escaper->escapeHtmlAttr($block->getFieldId('sender')) ?>"
name="<?= $escaper->escapeHtmlAttr($block->getFieldName('sender')) ?>"
value="<?= $escaper->escapeHtmlAttr($block->getSender()) ?>" />
<input type="hidden"
id="<?= $block->escapeHtmlAttr($block->getFieldId('recipient')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('recipient')) ?>"
value="<?= $block->escapeHtmlAttr($block->getRecipient()) ?>" />
id="<?= $escaper->escapeHtmlAttr($block->getFieldId('recipient')) ?>"
name="<?= $escaper->escapeHtmlAttr($block->getFieldName('recipient')) ?>"
value="<?= $escaper->escapeHtmlAttr($block->getRecipient()) ?>" />
<input type="hidden"
id="<?= $block->escapeHtmlAttr($block->getFieldId('message')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('message')) ?>"
value="<?= $block->escapeHtmlAttr($block->getMessageText()) ?>" />
id="<?= $escaper->escapeHtmlAttr($block->getFieldId('message')) ?>"
name="<?= $escaper->escapeHtmlAttr($block->getFieldName('message')) ?>"
value="<?= $escaper->escapeHtmlAttr($block->getMessageText()) ?>" />
</form>

<?php if ($block->getMessageText()) : ?>
<div class="gift-options-tooltip-content">
<div><strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>: </div>
<div><strong><?= $escaper->escapeHtml(__('Gift Message')) ?></strong>: </div>
<div><?= /* @noEscape */ $block->getMessageText() ?></div>
</div>
<?php endif; ?>
Expand Down
Loading