Skip to content

Commit 98f3fea

Browse files
author
Oleksii Korshenko
authored
MAGETWO-70191: Convert long form tags with echo to use short-echo tags #1563 
2 parents a7042c1 + 640fab4 commit 98f3fea

File tree

877 files changed

+7624
-7483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

877 files changed

+7624
-7483
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"autoOpen": true,
2020
"buttons": false,
2121
"modalClass": "modal-system-messages",
22-
"title": "<?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?>"
22+
"title": "<?= /* @escapeNotVerified */ $block->getHeaderText() ?>"
2323
}
2424
}'>
2525
<li class="message message-warning warning">
26-
<?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?><br/>
27-
<a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
26+
<?= /* @escapeNotVerified */ $block->getNoticeMessageText() ?><br/>
27+
<a href="<?= /* @escapeNotVerified */ $block->getNoticeMessageUrl() ?>"><?= /* @escapeNotVerified */ $block->getReadDetailsText() ?></a>
2828
</li>
2929
</ul>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@
1515
<?php if ($lastCritical): ?>
1616
<ul class="message-system-list">
1717
<li class="message message-warning error">
18-
<?php /* @escapeNotVerified */ echo $lastCritical->getText();?>
18+
<?= /* @escapeNotVerified */ $lastCritical->getText() ?>
1919
</li>
2020
</ul>
2121
<?php endif; ?>
2222
<div class="message-system-short">
2323
<span class="message-system-short-label">
24-
<?php /* @escapeNotVerified */ echo __('System Messages:')?>
24+
<?= /* @escapeNotVerified */ __('System Messages:') ?>
2525
</span>
2626

2727
<?php if ($block->getCriticalCount()): ?>
2828
<div class="message message-warning error">
29-
<a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Critical System Messages'));?>">
30-
<?php /* @escapeNotVerified */ echo $block->getCriticalCount();?>
29+
<a class="message-link" href="#" title="<?= $block->escapeHtml(__('Critical System Messages')) ?>">
30+
<?= /* @escapeNotVerified */ $block->getCriticalCount() ?>
3131
</a>
3232
</div>
3333
<?php endif;?>
3434

3535
<?php if ($block->getMajorCount()): ?>
3636
<div class="message message-warning warning">
37-
<a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Major System Messages'));?>">
38-
<?php /* @escapeNotVerified */ echo $block->getMajorCount();?>
37+
<a class="message-link" href="#" title="<?= $block->escapeHtml(__('Major System Messages')) ?>">
38+
<?= /* @escapeNotVerified */ $block->getMajorCount() ?>
3939
</a>
4040
</div>
4141
<?php endif;?>
4242
</div>
43-
<div id="message-system-all" title="<?php echo $block->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $block->escapeHtml($block->getSystemMessageDialogJson());?>'></div>
43+
<div id="message-system-all" title="<?= $block->escapeHtml(__('System messages')) ?>" data-mage-init='<?= $block->escapeHtml($block->getSystemMessageDialogJson()) ?>'></div>
4444
</div>
4545
</div>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
?>
1010
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
1111

12-
<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
12+
<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?= $block->escapeHtml($block->getPopupTitle()) ?>">
1313
<ul class="message-system-list messages">
1414
<?php foreach ($block->getUnreadMessages() as $message): ?>
15-
<li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">
16-
<?php /* @escapeNotVerified */ echo $message->getText();?>
15+
<li class="message message-warning <?= /* @escapeNotVerified */ $block->getItemClass($message) ?>">
16+
<?= /* @escapeNotVerified */ $message->getText() ?>
1717
</li>
1818
<?php endforeach;?>
1919
</ul>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,70 +15,70 @@
1515
<div
1616
data-mage-init='{"toolbarEntry": {}}'
1717
class="notifications-wrapper admin__action-dropdown-wrap"
18-
data-notification-count="<?php /* @escapeNotVerified */ echo $notificationCount; ?>">
18+
data-notification-count="<?= /* @escapeNotVerified */ $notificationCount ?>">
1919
<?php if ($notificationCount > 0) : ?>
2020
<a
21-
href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
21+
href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
2222
class="notifications-action admin__action-dropdown"
2323
data-mage-init='{"dropdown":{}}'
24-
title="<?php /* @escapeNotVerified */ echo __('Notifications'); ?>"
24+
title="<?= /* @escapeNotVerified */ __('Notifications') ?>"
2525
data-toggle="dropdown">
2626
<span class="notifications-counter">
27-
<?php /* @escapeNotVerified */ echo ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount; ?>
27+
<?= /* @escapeNotVerified */ ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount ?>
2828
</span>
2929
</a>
3030
<ul
3131
class="admin__action-dropdown-menu"
32-
data-mark-as-read-url="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
32+
data-mark-as-read-url="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/ajaxMarkAsRead') ?>">
3333
<?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
3434
<?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
3535
<li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
36-
data-notification-id="<?php /* @escapeNotVerified */ echo $notification->getId(); ?>"
36+
data-notification-id="<?= /* @escapeNotVerified */ $notification->getId() ?>"
3737
data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
3838
<?php
3939
$notificationDescription = $block->escapeHtml($notification->getDescription());
4040
$notificationDescriptionLength = $block->getNotificationDescriptionLength();
4141
?>
4242
<strong class="notifications-entry-title">
43-
<?php echo $block->escapeHtml($notification->getTitle()); ?>
43+
<?= $block->escapeHtml($notification->getTitle()) ?>
4444
</strong>
4545
<?php if (strlen($notificationDescription) > $notificationDescriptionLength) : ?>
4646
<p class="notifications-entry-description _cutted">
4747
<span class="notifications-entry-description-start">
48-
<?php /* @escapeNotVerified */ echo substr($notificationDescription, 0, $notificationDescriptionLength); ?>
48+
<?= /* @escapeNotVerified */ substr($notificationDescription, 0, $notificationDescriptionLength) ?>
4949
</span>
5050
<span class="notifications-entry-description-end">
51-
<?php /* @escapeNotVerified */ echo substr($notificationDescription, $notificationDescriptionLength); ?>
51+
<?= /* @escapeNotVerified */ substr($notificationDescription, $notificationDescriptionLength) ?>
5252
</span>
5353
</p>
5454
<?php else : ?>
5555
<p class="notifications-entry-description">
56-
<?php /* @escapeNotVerified */ echo $notificationDescription; ?>
56+
<?= /* @escapeNotVerified */ $notificationDescription ?>
5757
</p>
5858
<?php endif; ?>
5959
<time class="notifications-entry-time">
60-
<?php /* @escapeNotVerified */ echo $block->formatNotificationDate($notification->getDateAdded()); ?>
60+
<?= /* @escapeNotVerified */ $block->formatNotificationDate($notification->getDateAdded()) ?>
6161
</time>
6262
<button
6363
type="button"
6464
class="notifications-close"
65-
title="<?php /* @escapeNotVerified */ echo __('Close'); ?>"
65+
title="<?= /* @escapeNotVerified */ __('Close') ?>"
6666
></button>
6767
</li>
6868
<?php endforeach; ?>
6969
<li class="notifications-entry notifications-entry-last">
7070
<a
71-
href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
71+
href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
7272
class="action-tertiary action-more">
73-
<?php /* @escapeNotVerified */ echo __('See All (') ?><span class="notifications-counter"><?php /* @escapeNotVerified */ echo $notificationCount ?></span><?php /* @escapeNotVerified */ echo __(' unread)'); ?>
73+
<?= /* @escapeNotVerified */ __('See All (') ?><span class="notifications-counter"><?= /* @escapeNotVerified */ $notificationCount ?></span><?= /* @escapeNotVerified */ __(' unread)') ?>
7474
</a>
7575
</li>
7676
</ul>
7777
<?php else : ?>
7878
<a
7979
class="notifications-action admin__action-dropdown"
80-
href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
81-
title="<?php /* @escapeNotVerified */ echo __('Notifications'); ?>">
80+
href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
81+
title="<?= /* @escapeNotVerified */ __('Notifications') ?>">
8282
</a>
8383
<?php endif; ?>
8484
</div>

‎app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@
99
<section class="dashboard-advanced-reports" data-index="dashboard-advanced-reports">
1010
<div class="dashboard-advanced-reports-description">
1111
<header class="dashboard-advanced-reports-title">
12-
<?php echo $block->escapeHtml(__('Advanced Reporting')) ?>
12+
<?= $block->escapeHtml(__('Advanced Reporting')) ?>
1313
</header>
1414
<div class="dashboard-advanced-reports-content">
15-
<?php echo $block->escapeHtml(__('Gain new insights and take command of your business\' performance,' .
15+
<?= $block->escapeHtml(__('Gain new insights and take command of your business\' performance,' .
1616
' using our dynamic product, order, and customer reports tailored to your customer data.')) ?>
17-
<a href="<?php echo $block->escapeUrl($block->getUrl('analytics/reports/show')); ?>"
17+
<a href="<?= $block->escapeUrl($block->getUrl('analytics/reports/show')) ?>"
1818
target="_blank"
1919
data-index="analytics-service-info-link">
20-
<?php echo $block->escapeHtml(__('View details')) ?>
20+
<?= $block->escapeHtml(__('View details')) ?>
2121
</a>
2222
</div>
2323
</div>
2424
<div class="dashboard-advanced-reports-actions">
25-
<a href="<?php echo $block->escapeUrl($block->getUrl('analytics/reports/show')); ?>"
25+
<a href="<?= $block->escapeUrl($block->getUrl('analytics/reports/show')) ?>"
2626
target="_blank"
2727
class="action action-advanced-reports"
2828
data-index="analytics-service-link"
29-
title="<?php echo $block->escapeHtmlAttr(__('Go to Advanced Reporting')) ?>">
30-
<span><?php echo $block->escapeHtml(__('Go to Advanced Reporting')) ?></span>
29+
title="<?= $block->escapeHtmlAttr(__('Go to Advanced Reporting')) ?>">
30+
<span><?= $block->escapeHtml(__('Go to Advanced Reporting')) ?></span>
3131
</a>
3232
</div>
3333
</section>

‎app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ $helper = $block->getHelper('adminhtml');
1616
<head>
1717
<script>
1818
<?php if (isset($params['redirect'])): ?>
19-
window.location="<?php echo $block->escapeUrl($params['redirect']); ?>";
19+
window.location="<?= $block->escapeUrl($params['redirect']) ?>";
2020
<?php endif; ?>
2121
<?php if (isset($params['redirect_parent'])): ?>
22-
window.top.location="<?php echo $block->escapeUrl($params['redirect_parent']); ?>";
22+
window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
2323
<?php endif; ?>
2424
<?php if (isset($params['error_msg'])): ?>
25-
window.top.directPostModel.showError(<?php /* @noEscape */ echo json_encode((array)$params['error_msg']); ?>);
25+
window.top.directPostModel.showError(<?= /* @noEscape */ json_encode((array)$params['error_msg']) ?>);
2626
<?php if (isset($params['x_invoice_num'])): ?>
27-
window.top.directPostModel.successUrl="<?php echo $block->escapeUrl($helper->getSuccessOrderUrl($params)); ?>";
27+
window.top.directPostModel.successUrl="<?= $block->escapeUrl($helper->getSuccessOrderUrl($params)) ?>";
2828
<?php endif; ?>
2929
<?php endif; ?>
3030
</script>

0 commit comments

Comments
 (0)