Skip to content

Commit 915589b

Browse files
abukatarabukatar
committed
ACP2E-2976: Re-implement solution from where object manager is used in a wrong place
1 parent 45cbf9b commit 915589b

File tree

9 files changed

+40
-66
lines changed

9 files changed

+40
-66
lines changed

‎app/code/Magento/Contact/view/frontend/templates/form.phtml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
// phpcs:disable Magento2.Templates.ThisInTemplate
88
// phpcs:disable Generic.Files.LineLength.TooLong
99

1010
/** @var \Magento\Contact\Block\ContactForm $block */
11-
if (!$block->getButtonLockManager()) {
12-
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
13-
$block->setButtonLockManager(
14-
$objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
15-
);
16-
}
11+
/** @var \Magento\Framework\View\Element\ButtonLockManager|null $buttonLockManager */
12+
$buttonLockManager = $block->getData('button_lock_manager');
1713
/** @var $escaper \Magento\Framework\Escaper */
1814
/** @var \Magento\Contact\ViewModel\UserDataProvider $viewModel */
1915

@@ -89,7 +85,7 @@ $viewModel = $block->getViewModel();
8985
<input type="hidden" name="hideit" id="hideit" value="" />
9086
<button type="submit" title="<?= $escaper->escapeHtmlAttr(__('Submit')) ?>" class="action submit primary"
9187
id="send2"
92-
<?php if ($block->getButtonLockManager()->isDisabled('contact_us_form_submit')): ?>
88+
<?php if ($buttonLockManager?->isDisabled('contact_us_form_submit')): ?>
9389
disabled="disabled"
9490
<?php endif; ?>>
9591
<span><?= $escaper->escapeHtml(__('Submit')) ?></span>

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
use Magento\Customer\Block\Widget\Name;
88

99
/** @var \Magento\Customer\Block\Form\Edit $block */
10-
if (!$block->getButtonLockManager()) {
11-
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
12-
$block->setButtonLockManager(
13-
$objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
14-
);
15-
}
10+
/** @var \Magento\Framework\View\Element\ButtonLockManager|null $buttonLockManager */
11+
$buttonLockManager = $block->getData('button_lock_manager');
1612
/** @var $escaper \Magento\Framework\Escaper */
1713
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
1814
?>
@@ -123,7 +119,7 @@ if (!$block->getButtonLockManager()) {
123119
<div class="actions-toolbar">
124120
<div class="primary">
125121
<button type="submit" class="action save primary" title="<?= $escaper->escapeHtmlAttr(__('Save')) ?>"
126-
<?php if ($block->getButtonLockManager()->isDisabled('customer_edit_form_submit')): ?>
122+
<?php if ($buttonLockManager?->isDisabled('customer_edit_form_submit')): ?>
127123
disabled="disabled"
128124
<?php endif; ?>>
129125
<span><?= $escaper->escapeHtml(__('Save')) ?></span>

‎app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@
99
// phpcs:disable Generic.Files.LineLength.TooLong
1010

1111
/** @var \Magento\Customer\Block\Account\Forgotpassword $block */
12-
if (!$block->getButtonLockManager()) {
13-
// phpcs:ignore
14-
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
15-
$block->setButtonLockManager(
16-
$objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
17-
);
18-
}
12+
/** @var \Magento\Framework\View\Element\ButtonLockManager|null $buttonLockManager */
13+
$buttonLockManager = $block->getData('button_lock_manager');
1914
/** @var $escaper \Magento\Framework\Escaper */
2015
?>
2116
<form class="form password forget"
@@ -35,7 +30,7 @@ if (!$block->getButtonLockManager()) {
3530
</fieldset>
3631
<div class="actions-toolbar">
3732
<div class="primary">
38-
<button type="submit" class="action submit primary" id="send2" <?php if ($block->getButtonLockManager()->isDisabled('customer_forgot_password_form_submit')): ?> disabled="disabled" <?php endif; ?>><span><?= $escaper->escapeHtml(__('Reset My Password')) ?></span></button>
33+
<button type="submit" class="action submit primary" id="send2" <?php if ($buttonLockManager?->isDisabled('customer_forgot_password_form_submit')): ?> disabled="disabled" <?php endif; ?>><span><?= $escaper->escapeHtml(__('Reset My Password')) ?></span></button>
3934
</div>
4035
<div class="secondary">
4136
<a class="action back" href="<?= $escaper->escapeUrl($block->getLoginUrl()) ?>"><span><?= $escaper->escapeHtml(__('Go back')) ?></span></a>

‎app/code/Magento/Customer/view/frontend/templates/form/login.phtml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@
77
// phpcs:disable Generic.Files.LineLength.TooLong
88

99
/** @var \Magento\Customer\Block\Form\Login $block */
10-
if (!$block->getButtonLockManager()) {
11-
// phpcs:ignore
12-
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
13-
$block->setButtonLockManager(
14-
$objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
15-
);
16-
}
10+
/** @var \Magento\Framework\View\Element\ButtonLockManager|null $buttonLockManager */
11+
$buttonLockManager = $block->getData('button_lock_manager');
1712
/** @var $escaper \Magento\Framework\Escaper */
1813
?>
1914
<div class="block block-customer-login">
@@ -55,7 +50,7 @@ if (!$block->getButtonLockManager()) {
5550
<?= $block->getChildHtml('form_additional_info') ?>
5651
<div class="actions-toolbar">
5752
<div class="primary">
58-
<button type="submit" class="action login primary" name="send" id="send2" <?php if ($block->getButtonLockManager()->isDisabled('customer_login_form_submit')): ?> disabled="disabled" <?php endif; ?>>
53+
<button type="submit" class="action login primary" name="send" id="send2" <?php if ($buttonLockManager?->isDisabled('customer_login_form_submit')): ?> disabled="disabled" <?php endif; ?>>
5954
<span><?= $escaper->escapeHtml(__('Sign In')) ?></span>
6055
</button>
6156
</div>

‎app/code/Magento/Customer/view/frontend/templates/form/register.phtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use Magento\Customer\Helper\Address;
1010
/** @var \Magento\Framework\Escaper $escaper */
1111
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
1212
/** @var \Magento\Framework\View\Element\ButtonLockManager|null $buttonLockManager */
13-
$buttonLockManager = $block->getButtonLockManager();
13+
$buttonLockManager = $block->getData('button_lock_manager');
1414

1515
/** @var Magento\Customer\Helper\Address $addressHelper */
1616
$addressHelper = $block->getData('addressHelper');
@@ -297,7 +297,7 @@ $formData = $block->getFormData();
297297
class="action submit primary"
298298
title="<?= $escaper->escapeHtmlAttr(__('Create an Account')) ?>"
299299
id="send2"
300-
<?php if ($buttonLockManager && $buttonLockManager->isDisabled('customer_create_form_submit')): ?>
300+
<?php if ($buttonLockManager?->isDisabled('customer_create_form_submit')): ?>
301301
disabled="disabled"
302302
<?php endif; ?>>
303303
<span><?= $escaper->escapeHtml(__('Create an Account')) ?></span>

‎app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/** @var \Magento\Newsletter\Block\Subscribe $block */
8-
if (!$block->getButtonLockManager()) {
9-
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
10-
$block->setButtonLockManager(
11-
$objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
12-
);
13-
}
8+
/** @var \Magento\Framework\View\Element\ButtonLockManager|null $buttonLockManager */
9+
$buttonLockManager = $block->getData('button_lock_manager');
1410
/** @var $escaper \Magento\Framework\Escaper */
1511
?>
1612
<div class="block newsletter">
@@ -41,7 +37,7 @@ if (!$block->getButtonLockManager()) {
4137
title="<?= $escaper->escapeHtmlAttr(__('Subscribe')) ?>"
4238
type="submit"
4339
aria-label="Subscribe"
44-
<?php if ($block->getButtonLockManager()->isDisabled('newsletter_form_submit')): ?>
40+
<?php if ($buttonLockManager?->isDisabled('newsletter_form_submit')): ?>
4541
disabled="disabled"
4642
<?php endif; ?>>
4743
<span><?= $escaper->escapeHtml(__('Subscribe')) ?></span>

‎app/code/Magento/Review/view/frontend/templates/form.phtml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/** @var \Magento\Review\Block\Form $block */
8-
if (!$block->getButtonLockManager()) {
9-
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
10-
$block->setButtonLockManager(
11-
$objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
12-
);
13-
}
8+
/** @var \Magento\Framework\View\Element\ButtonLockManager|null $buttonLockManager */
9+
$buttonLockManager = $block->getData('button_lock_manager');
1410
/** @var $escaper \Magento\Framework\Escaper */
1511
//phpcs:disable Generic.Files.LineLength
1612
?>
@@ -85,7 +81,7 @@ if (!$block->getButtonLockManager()) {
8581
<div class="actions-toolbar review-form-actions">
8682
<div class="primary actions-primary">
8783
<button type="submit" class="action submit primary"
88-
<?php if ($block->getButtonLockManager()->isDisabled('review_form_submit')): ?>
84+
<?php if ($buttonLockManager?->isDisabled('review_form_submit')): ?>
8985
disabled="disabled"
9086
<?php endif; ?>>
9187
<span><?= $escaper->escapeHtml(__('Submit Review')) ?></span>

‎app/code/Magento/SendFriend/view/frontend/templates/send.phtml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Send to friend form
99
*/
1010
/** @var \Magento\SendFriend\Block\Send $block */
11-
if (!$block->getButtonLockManager()) {
12-
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
13-
$block->setButtonLockManager(
14-
$objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
15-
);
16-
}
11+
/** @var \Magento\Framework\View\Element\ButtonLockManager|null $buttonLockManager */
12+
$buttonLockManager = $block->getData('button_lock_manager');
1713
/** @var $escaper \Magento\Framework\Escaper */
1814
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
1915
// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
@@ -134,7 +130,7 @@ if (!$block->getButtonLockManager()) {
134130
<button type="submit"
135131
class="action submit primary"
136132
<?php if (!$block->canSend() ||
137-
$block->getButtonLockManager()->isDisabled('sendfriend_form_submit')): ?>
133+
($buttonLockManager?->isDisabled('sendfriend_form_submit'))): ?>
138134
disabled="disabled"
139135
<?php endif ?>>
140136
<span><?= $escaper->escapeHtml(__('Send Email')) ?></span></button>

‎dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* Copyright © Magento, Inc. All rights reserved.
3-
* See COPYING.txt for license details.
2+
* Copyright 2020 Adobe
3+
* All Rights Reserved.
44
*/
55

66
define([
@@ -65,14 +65,18 @@ define([
6565
});
6666

6767
it('prepare message to be rendered as HTML', function () {
68-
var escapedMessage = 'escaped message';
68+
var escapedMessage = 'escaped message',
69+
originalEscapeHtml = escaperInstance.escapeHtml;
6970

7071
// eslint-disable-next-line max-nested-callbacks
7172
escaperInstance.escapeHtml = jasmine.createSpy().and.callFake(function () {
7273
return escapedMessage;
7374
});
7475

7576
expect(messagesInstance.prepareMessageUnsanitizedHtml(messageText)).toEqual(escapedMessage);
77+
78+
// Restore original function to avoid test interference
79+
escaperInstance.escapeHtml = originalEscapeHtml;
7680
});
7781
});
7882
});

0 commit comments

Comments
 (0)