Skip to content

Magento_Integration: avoid using deprecated escape* methods from Abst… #31702

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_Integration: avoid using deprecated escape* methods from Abst… #31702

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/Integration/Block/Adminhtml/Integration/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public function getHeaderText()
} else {
return __(
"Edit Integration '%1'",
$this->escapeHtml(
$this->_escaper->escapeHtml(
$this->_registry->registry(Integration::REGISTRY_KEY_CURRENT_INTEGRATION)[Info::DATA_NAME]
)
);
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ protected function _prepareAttributes(DataObject $row)
$attributes[] = sprintf(
'%s="%s"',
$attributeName,
$this->escapeHtmlAttr($attributeValue, false)
$this->_escaper->escapeHtmlAttr($attributeValue, false)
);
}

Expand All @@ -165,7 +165,7 @@ private function renderAttributes(array $attributes): string
//Will render event handlers and style as separate tags
continue;
}
$html .= ($html ? ' ' : '') ."{$attributeName}=\"{$this->escapeHtmlAttr($attributeValue)}\"";
$html .= ($html ? ' ' : '') ."{$attributeName}=\"{$this->_escaper->escapeHtmlAttr($attributeValue)}\"";
}

return $html;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ protected function _getAttributesHtml()
if ($value === null || $value == '') {
continue;
}
$html[] = sprintf('%s="%s"', $key, $this->escapeHtmlAttr($value, false));
$html[] = sprintf('%s="%s"', $key, $this->_escaper->escapeHtmlAttr($value, false));
}

return join(' ', $html);
Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
* See COPYING.txt for license details.
*
* @var \Magento\Backend\Block\Widget\Form\Container $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<div><p><?= $block->escapeHtml(__('The integration you selected asks you to approve access to the following:')) ?></p></div>
<div><p><?= $escaper->escapeHtml(__('The integration you selected asks you to approve access to the following:')) ?></p></div>
<div id="integration-activate-permissions-tabs">
<?= $block->getChildHtml('tabs') ?>
</div>
Expand Down
3 changes: 2 additions & 1 deletion ...to/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
* See COPYING.txt for license details.
*
* @var \Magento\Integration\Block\Adminhtml\Integration\Activate\Permissions\Tab\Webapi $block
* @var \Magento\Framework\Escaper $escaper
*/

/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
?>
<fieldset class="admin__fieldset form-inline entry-edit">
<?php if ($block->isTreeEmpty()): ?>
<p class="empty"><?= $block->escapeHtml(__('No permissions requested')) ?></p>
<p class="empty"><?= $escaper->escapeHtml(__('No permissions requested')) ?></p>
<?php else: ?>
<div class="field" data-role="tree-resources-container">
<div class="control">
Expand Down
19 changes: 9 additions & 10 deletions app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
* See COPYING.txt for license details.
*
* @var \Magento\Backend\Block\Template $block
* @var \Magento\Framework\Escaper $escaper
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
*/

/** @var \Magento\Backend\Block\Template $block */
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
?>

<?php $scriptString = <<<script
Expand All @@ -22,30 +21,30 @@
], function ($, Confirm) {

window.integration = new Integration(
'{$block->escapeJs(
'{$escaper->escapeJs(
$block->getUrl(
'*/*/permissionsDialog',
['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
)
)}',
'{$block->escapeJs(
'{$escaper->escapeJs(
$block->getUrl(
'*/*/tokensDialog',
['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
)
)}',
'{$block->escapeJs(
'{$escaper->escapeJs(
$block->getUrl(
'*/*/tokensExchange',
['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
)
)}',
'{$block->escapeJs(
'{$escaper->escapeJs(
$block->getUrl(
'*/*'
)
)}',
'{$block->escapeJs(
'{$escaper->escapeJs(
$block->getUrl(
'*/*/loginSuccessCallback'
)
Expand All @@ -59,8 +58,8 @@
$('div#integrationGrid').on('click', 'button#delete', function (e) {

new Confirm({
title: '{$block->escapeJs(__('Are you sure?'))}',
content: "{$block->escapeJs(__("Are you sure you want to delete this integration? " .
title: '{$escaper->escapeJs(__('Are you sure?'))}',
content: "{$escaper->escapeJs(__("Are you sure you want to delete this integration? " .
"You can't undo this action."))}",
actions: {
confirm: function () {
Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* See COPYING.txt for license details.
*
* @var \Magento\Backend\Block\Template $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<div><p><?= $block->escapeHtml(__("Please setup or sign in into your 3rd party account to complete setup of this integration.")) ?></p></div>
<div><p><?= $escaper->escapeHtml(__("Please setup or sign in into your 3rd party account to complete setup of this integration.")) ?></p></div>
17 changes: 10 additions & 7 deletions app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,30 @@
* See COPYING.txt for license details.
*/

/** @var $block \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi */
/**
* @var $block \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi
* @var \Magento\Framework\Escaper $escaper
*/
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
?>

<?= $block->getChildHtml() ?>

<fieldset class="fieldset form-inline entry-edit">
<legend class="legend">
<span><?= $block->escapeHtml(__('Available APIs')) ?></span>
<span><?= $escaper->escapeHtml(__('Available APIs')) ?></span>
</legend><br />

<div class="field">
<label class="label" for="all_resources"><span><?= $block->escapeHtml(__('Resource Access')) ?></span></label>
<label class="label" for="all_resources"><span><?= $escaper->escapeHtml(__('Resource Access')) ?></span></label>

<div class="control">
<select id="all_resources" name="all_resources" class="select">
<option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>>
<?= $block->escapeHtml(__('Custom')) ?>
<?= $escaper->escapeHtml(__('Custom')) ?>
</option>
<option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>>
<?= $block->escapeHtml(__('All')) ?>
<?= $escaper->escapeHtml(__('All')) ?>
</option>
</select>
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
Expand All @@ -40,11 +43,11 @@
no-display
<?php endif ?>"
data-role="tree-resources-container">
<label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
<label class="label"><span><?= $escaper->escapeHtml(__('Resources')) ?></span></label>

<div class="control">
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
$block->escapeHtmlAttr($block->getJsonSerializer()->serialize([
$escaper->escapeHtmlAttr($block->getJsonSerializer()->serialize([
'rolesTree' => [
"treeInitData" => $block->getTree(),
"treeInitSelectedData" => $block->getSelectedResources(),
Expand Down