Skip to content

Commit e4e4600

Browse files
author
Hwashiang Yu
committed
MAGETWO-55808: Eliminate @escapeNotVerified in Product Modules
- Resolved static test failures
1 parent 7f47630 commit e4e4600

File tree

1 file changed

+15
-45
lines changed
  • app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps

1 file changed

+15
-45
lines changed

‎app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml

Lines changed: 15 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
value="single"
2929
data-bind="checked:type">
3030
<label for="apply-single-set-radio" class="admin__field-label">
31-
<span><?= $block->escapeHtml(
32-
__('Apply single set of images to all SKUs')
33-
); ?></span>
31+
<span><?= $block->escapeHtml(__('Apply single set of images to all SKUs')); ?></span>
3432
</label>
3533
</div>
3634
</li>
@@ -67,10 +65,7 @@
6765
<div data-role="gallery"
6866
class="gallery"
6967
data-images="[]"
70-
data-types="<?= $block->escapeHtml(
71-
$this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())
72-
) ?>"
73-
>
68+
data-types="<?= $block->escapeHtml($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())) ?>">
7469
<div class="image image-placeholder">
7570
<div data-role="uploader" class="uploader">
7671
<div class="image-browse">
@@ -88,15 +83,12 @@
8883
</div>
8984
</div>
9085

91-
<?php foreach ($block->getImageTypes() as $typeData) :
92-
?>
86+
<?php foreach ($block->getImageTypes() as $typeData) : ?>
9387
<input name="<?= $block->escapeHtml($typeData['name']) ?>"
9488
class="image-<?= $block->escapeHtml($typeData['code']) ?>"
9589
type="hidden"
9690
value="<?= $block->escapeHtml($typeData['value']) ?>"/>
97-
<?php
98-
endforeach;
99-
?>
91+
<?php endforeach; ?>
10092

10193
<script data-template="uploader" type="text/x-magento-template">
10294
<div id="<%- data.id %>" class="file-row">
@@ -151,16 +143,12 @@
151143
</div>
152144
</div>
153145
<ul class="item-roles" data-role="roles-labels">
154-
<?php
155-
foreach ($block->getMediaAttributes() as $attribute) :
156-
?>
146+
<?php foreach ($block->getMediaAttributes() as $attribute) :?>
157147
<li data-role-code="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
158148
class="item-role item-role-<?= $block->escapeHtml($attribute->getAttributeCode()) ?>">
159149
<?= /* @noEscape */ $attribute->getFrontendLabel() ?>
160150
</li>
161-
<?php
162-
endforeach;
163-
?>
151+
<?php endforeach; ?>
164152
</ul>
165153
</div>
166154
</script>
@@ -239,9 +227,7 @@
239227
<?= $block->escapeHtml($attribute->getFrontendLabel()); ?>
240228
</label>
241229
</li>
242-
<?php
243-
endforeach;
244-
?>
230+
<?php endforeach; ?>
245231
</ul>
246232
</div>
247233
</div>
@@ -314,10 +300,7 @@
314300
<div data-role="gallery"
315301
class="gallery"
316302
data-images="[]"
317-
data-types="<?= $block->escapeHtml(
318-
$this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())
319-
) ?>"
320-
>
303+
data-types="<?= $block->escapeHtml($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())) ?>">
321304
<div class="image image-placeholder">
322305
<div data-role="uploader" class="uploader">
323306
<div class="image-browse">
@@ -335,15 +318,12 @@
335318
</div>
336319
</div>
337320

338-
<?php foreach ($block->getImageTypes() as $typeData) :
339-
?>
321+
<?php foreach ($block->getImageTypes() as $typeData) :?>
340322
<input name="<?= $block->escapeHtml($typeData['name']) ?>"
341323
class="image-<?= $block->escapeHtml($typeData['code']) ?>"
342324
type="hidden"
343325
value="<?= $block->escapeHtml($typeData['value']) ?>"/>
344-
<?php
345-
endforeach;
346-
?>
326+
<?php endforeach; ?>
347327

348328
<script data-template="uploader" type="text/x-magento-template">
349329
<div id="<%- data.id %>" class="file-row">
@@ -400,16 +380,12 @@
400380
</div>
401381
</div>
402382
<ul class="item-roles" data-role="roles-labels">
403-
<?php
404-
foreach ($block->getMediaAttributes() as $attribute) :
405-
?>
383+
<?php foreach ($block->getMediaAttributes() as $attribute) :?>
406384
<li data-role-code="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
407385
class="item-role item-role-<?= $block->escapeHtml($attribute->getAttributeCode()) ?>">
408386
<?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
409387
</li>
410-
<?php
411-
endforeach;
412-
?>
388+
<?php endforeach; ?>
413389
</ul>
414390
</div>
415391
</script>
@@ -472,9 +448,7 @@
472448
</label>
473449
<div class="admin__field-control">
474450
<ul class="multiselect-alt">
475-
<?php
476-
foreach ($block->getMediaAttributes() as $attribute) :
477-
?>
451+
<?php foreach ($block->getMediaAttributes() as $attribute) :?>
478452
<li class="item">
479453
<label>
480454
<input class="image-type"
@@ -485,9 +459,7 @@
485459
<?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
486460
</label>
487461
</li>
488-
<?php
489-
endforeach;
490-
?>
462+
<?php endforeach; ?>
491463
</ul>
492464
</div>
493465
</div>
@@ -518,9 +490,7 @@
518490
<% if (data.disabled == 1) { %>checked="checked"<% } %> />
519491

520492
<label for="hide-from-product-page" class="admin__field-label">
521-
<?= $block->escapeHtml(
522-
__('Hide from Product Page')
523-
); ?>
493+
<?= $block->escapeHtml(__('Hide from Product Page')); ?>
524494
</label>
525495
</div>
526496
</div>

0 commit comments

Comments
 (0)