Skip to content

Commit c6fa5b1

Browse files
committed
MC-16626: Fix Unrelated Static Test Failures
- fix static failures
1 parent 7fed82e commit c6fa5b1

File tree

6 files changed

+16
-14
lines changed

6 files changed

+16
-14
lines changed

app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
*/
1010
?>
1111
<fieldset class="admin__fieldset form-inline entry-edit">
12-
<?php if ($block->isTreeEmpty()): ?>
12+
<?php if ($block->isTreeEmpty()) : ?>
1313
<p class="empty"><?= $block->escapeHtml(__('No permissions requested')) ?></p>
14-
<?php else: ?>
14+
<?php else : ?>
1515
<div class="field" data-role="tree-resources-container">
1616
<div class="control">
1717
<div id="resource-tree" class="tree x-tree" data-role="resource-tree"></div>
1818
</div>
1919
</div>
2020
<?php endif ?>
2121
</fieldset>
22-
<?php if (!$block->isTreeEmpty()): ?>
22+
<?php if (!$block->isTreeEmpty()) : ?>
2323
<script>
2424
require(["jquery", "Magento_User/js/roles-tree"], function($){
2525
$.widget('mage.rolesTree', $.mage.rolesTree, {

app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
</div>
2626
</div>
2727

28-
<div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
28+
<div class="field<?php if ($block->isEverythingAllowed()) : ?> no-display<?php endif?>" data-role="tree-resources-container">
2929
<label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
3030

3131
<div class="control">
32-
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
33-
echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
32+
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
33+
$block->escapeHtml($this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
3434
'rolesTree' => [
3535
"treeInitData" => $block->getTree(),
3636
"treeInitSelectedData" => $block->getSelectedResources(),

app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@
6969
{
7070
"*": {
7171
"Magento_Marketplace/default": {
72-
"url": "<?= $block->escapeUrl($block->getUrl('marketplace/partners/index',
73-
['_current' => true, 'block' => '', 'period' => ''])) ?>"
72+
"url": "<?= $block->escapeUrl($block->getUrl(
73+
'marketplace/partners/index',
74+
['_current' => true, 'block' => '', 'period' => '']
75+
)) ?>"
7476
}
7577
}
7678
}

app/code/Magento/User/view/adminhtml/templates/role/edit.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
</div>
2828
</div>
2929

30-
<div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
30+
<div class="field<?php if ($block->isEverythingAllowed()) : ?> no-display<?php endif?>" data-role="tree-resources-container">
3131
<label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
3232

3333
<div class="control">
34-
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
35-
echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
34+
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
35+
$block->escapeHtml($this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
3636
'rolesTree' => [
3737
"treeInitData" => $block->getTree(),
3838
"treeInitSelectedData" => $block->getSelectedResources(),

app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require([
1414
], function(jQuery, confirm, _){
1515
<!--
1616
<?php $myBlock = $block->getLayout()->getBlock('roleUsersGrid'); ?>
17-
<?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
17+
<?php if (is_object($myBlock) && $myBlock->getJsObjectName()) : ?>
1818
var checkBoxes = $H(<?= /* @noEscape */ $myBlock->getUsers(true) ?>);
1919
var warning = false;
2020
if (checkBoxes.size() > 0) {

app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require([
1111
], function(){
1212

1313
<?php $myBlock = $block->getLayout()->getBlock('user.roles.grid'); ?>
14-
<?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
14+
<?php if (is_object($myBlock) && $myBlock->getJsObjectName()) : ?>
1515
var radioBoxes = $H({});
1616
var warning = false;
1717
var userRoles = $H(<?= /* @noEscape */ $myBlock->getSelectedRoles(true) ?>);
@@ -70,7 +70,7 @@ require([
7070
</script>
7171

7272
<?php $editBlock = $block->getLayout()->getBlock('adminhtml.user.edit'); ?>
73-
<?php if (is_object($editBlock)): ?>
73+
<?php if (is_object($editBlock)) : ?>
7474
<script type="text/x-magento-init">
7575
{
7676
"[data-role=delete-user]" : {

0 commit comments

Comments
 (0)