Skip to content

Commit 6eb70f0

Browse files
Franciscof-SerfeFranciscof-Serfe
committed
Update coding standard issues
1 parent 98ff183 commit 6eb70f0

File tree

4 files changed

+45
-23
lines changed

4 files changed

+45
-23
lines changed

‎app/code/Magento/Customer/Block/Address/Edit.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@ public function getBackUrl()
240240
/**
241241
* Return the Url for saving.
242242
*
243+
* @param int $defaultShipping Default shipping flag
244+
* @param int $defaultBilling Default billing flag
243245
* @return string
244246
*/
245247
public function getSaveUrl($defaultShipping = 0, $defaultBilling = 0)

‎app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,46 @@
88
?>
99
<div class="block block-dashboard-addresses">
1010
<div class="block-title">
11-
<strong><?= $block->escapeHtml(__('Address Book')) ?></strong>
12-
<a class="action edit" href="<?= $block->escapeUrl($block->getAddressBookUrl()) ?>"><span><?= $block->escapeHtml(__('Manage Addresses')) ?></span></a>
11+
<strong><?= $escaper->escapeHtml(__('Address Book')) ?></strong>
12+
<a class="action edit" href="<?= $escaper->escapeUrl($block->getAddressBookUrl()) ?>">
13+
<span><?= $escaper->escapeHtml(__('Manage Addresses')) ?></span>
14+
</a>
1315
</div>
1416
<div class="block-content">
1517
<div class="box box-billing-address">
1618
<strong class="box-title">
17-
<span><?= $block->escapeHtml(__('Default Billing Address')) ?></span>
19+
<span><?= $escaper->escapeHtml(__('Default Billing Address')) ?></span>
1820
</strong>
1921
<div class="box-content">
2022
<address>
2123
<?= $block->getPrimaryBillingAddressHtml() ?>
2224
</address>
2325
</div>
2426
<div class="box-actions">
25-
<a class="action edit" href="<?= $block->escapeUrl($block->getPrimaryBillingAddressEditUrl() . '?billingAddress') ?>" data-ui-id="default-billing-edit-link"><span><?= $block->escapeHtml(__('Edit Billing Address')) ?></span></a>
27+
<a
28+
class="action edit"
29+
href="<?= $escaper->escapeUrl($block->getPrimaryBillingAddressEditUrl() . '?billingAddress') ?>"
30+
data-ui-id="default-billing-edit-link">
31+
<span><?= $escaper->escapeHtml(__('Edit Billing Address')) ?></span>
32+
</a>
2633
</div>
2734
</div>
2835
<div class="box box-shipping-address">
2936
<strong class="box-title">
30-
<span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span>
37+
<span><?= $escaper->escapeHtml(__('Default Shipping Address')) ?></span>
3138
</strong>
3239
<div class="box-content">
3340
<address>
3441
<?= $block->getPrimaryShippingAddressHtml() ?>
3542
</address>
3643
</div>
3744
<div class="box-actions">
38-
<a class="action edit" href="<?= $block->escapeUrl($block->getPrimaryShippingAddressEditUrl() . '?shippingAddress') ?>" data-ui-id="default-shipping-edit-link"><span><?= $block->escapeHtml(__('Edit Shipping Address')) ?></span></a>
45+
<a
46+
class="action edit"
47+
href="<?= $escaper->escapeUrl($block->getPrimaryShippingAddressEditUrl() . '?shippingAddress') ?>"
48+
data-ui-id="default-shipping-edit-link">
49+
<span><?= $escaper->escapeHtml(__('Edit Shipping Address')) ?></span>
50+
</a>
3951
</div>
4052
</div>
4153
</div>

‎app/code/Magento/Customer/view/frontend/templates/address/book.phtml

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,54 +7,62 @@
77
/** @var \Magento\Customer\Block\Address\Book $block */
88
?>
99
<div class="block block-addresses-default">
10-
<div class="block-title"><strong><?= $block->escapeHtml(__('Default Addresses')) ?></strong></div>
10+
<div class="block-title"><strong><?= $escaper->escapeHtml(__('Default Addresses')) ?></strong></div>
1111
<div class="block-content">
12-
<?php if ($_pAddsses = $block->getDefaultBilling()) : ?>
12+
<?php if ($_pAddsses = $block->getDefaultBilling()): ?>
1313
<div class="box box-address-billing">
1414
<strong class="box-title">
15-
<span><?= $block->escapeHtml(__('Default Billing Address')) ?></span>
15+
<span><?= $escaper->escapeHtml(__('Default Billing Address')) ?></span>
1616
</strong>
1717
<div class="box-content">
1818
<address>
1919
<?= $block->getAddressHtml($block->getAddressById($_pAddsses)) ?>
2020
</address>
2121
</div>
2222
<div class="box-actions">
23-
<a class="action edit" href="<?= $block->escapeUrl($block->getAddressEditUrl($_pAddsses) . '?billingAddress')?>">
24-
<span><?= $block->escapeHtml(__('Change Billing Address')) ?></span>
23+
<a
24+
class="action edit"
25+
href="<?= $escaper->escapeUrl($block->getAddressEditUrl($_pAddsses) . '?billingAddress')?>">
26+
<span><?= $escaper->escapeHtml(__('Change Billing Address')) ?></span>
2527
</a>
2628
</div>
2729
</div>
28-
<?php else : ?>
30+
<?php else: ?>
2931
<div class="box box-billing-address">
30-
<strong class="box-title"><span><?= $block->escapeHtml(__('Default Billing Address')) ?></span></strong>
32+
<strong class="box-title">
33+
<span><?= $escaper->escapeHtml(__('Default Billing Address')) ?></span>
34+
</strong>
3135
<div class="box-content">
32-
<p><?= $block->escapeHtml(__('You have no default billing address in your address book.')) ?></p>
36+
<p><?= $escaper->escapeHtml(__('You have no default billing address in your address book.')) ?></p>
3337
</div>
3438
</div>
3539
<?php endif ?>
3640

37-
<?php if ($_pAddsses = $block->getDefaultShipping()) : ?>
41+
<?php if ($_pAddsses = $block->getDefaultShipping()): ?>
3842
<div class="box box-address-shipping">
3943
<strong class="box-title">
40-
<span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span>
44+
<span><?= $escaper->escapeHtml(__('Default Shipping Address')) ?></span>
4145
</strong>
4246
<div class="box-content">
4347
<address>
4448
<?= $block->getAddressHtml($block->getAddressById($_pAddsses)) ?>
4549
</address>
4650
</div>
4751
<div class="box-actions">
48-
<a class="action edit" href="<?= $block->escapeUrl($block->getAddressEditUrl($_pAddsses) . '?shippingAddress') ?>">
49-
<span><?= $block->escapeHtml(__('Change Shipping Address')) ?></span>
52+
<a
53+
class="action edit"
54+
href="<?= $escaper->escapeUrl($block->getAddressEditUrl($_pAddsses) . '?shippingAddress') ?>">
55+
<span><?= $escaper->escapeHtml(__('Change Shipping Address')) ?></span>
5056
</a>
5157
</div>
5258
</div>
53-
<?php else : ?>
59+
<?php else: ?>
5460
<div class="box box-shipping-address">
55-
<strong class="box-title"><span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span></strong>
61+
<strong class="box-title">
62+
<span><?= $escaper->escapeHtml(__('Default Shipping Address')) ?></span>
63+
</strong>
5664
<div class="box-content">
57-
<p><?= $block->escapeHtml(__('You have no default shipping address in your address book.')) ?></p>
65+
<p><?= $escaper->escapeHtml(__('You have no default shipping address in your address book.')) ?></p>
5866
</div>
5967
</div>
6068
<?php endif ?>

‎app/code/Magento/Customer/view/frontend/templates/address/edit.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
$viewModel = $block->getViewModel();
1313
$regionProvider = $block->getRegionProvider();
1414
?>
15-
<?php $shippingParam = isset($_GET['shippingAddress']); ?>
16-
<?php $billingParam = isset($_GET['billingAddress']); ?>
15+
<?php $shippingParam = $block->getRequest()->getParam('shippingAddress') !== null; ?>
16+
<?php $billingParam = $block->getRequest()->getParam('billingAddress') !== null; ?>
1717
<?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
1818
<?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
1919
<?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>

0 commit comments

Comments
 (0)