Skip to content

Commit d5ad9dd

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #17406: [Forwardport] fix: add missing data-th selector for tables (by @DanielRuf) - #17348: chore: remove support for IE 9 and IE 10 (by @DanielRuf) - #17401: Remove dead code (by @shochdoerfer) - #17343: fix: fix Less linter warnings in adminhtml (by @DanielRuf) - #17204: [Forwardport] GoogleAnalytics: Added unit test for order success observer (by @torhoehn) - #17312: [Forwardport] Added missing exception cause for better error handling (by @mage2pratik) - #17256: Removed unreachable code (by @sreichel) - #17372: [Braintree] Removed unnecessary unsets from models (by @rogyar) - #17359: [Forwardport] fix #17193 Error with translation of confirmation modal buttons (by @torhoehn) - #17315: [Forwardport] admin checkout agreement controllers refactor (by @mage2pratik) - #17313: [Forwardport] Don't force enable "Use system value" checkboxes (by @mage2pratik) - #16694: [Forwardport 2.3] allowed countries get countries for default scope (by @swnsma) - #16771: [Forwardport] Added translation function for Magento_Braintree module's template file. (by @sanganinamrata) - #17423: [Forwardport] Replace sort callbacks to spaceship operator (by @mage2pratik) - #17421: [Forwardport] Resolved special character issue for sidebar (by @mage2pratik) - #17420: [Forwardport] Update CMS Page Index (by @mage2pratik) - #17418: [Forwardport] Fixed "Shop By" button disabling broken on the search page #13445 (by @mage2pratik) Fixed GitHub Issues: - #17193: Error with translation of confirmation modal buttons (reported by @delyriand) has been fixed in #17359 by @torhoehn in 2.3-develop branch Related commits: 1. 76b1481 - #13445: "Shop By" button disabling broken on the search page (reported by @JanisE) has been fixed in #17418 by @mage2pratik in 2.3-develop branch Related commits: 1. 5c310fc
2 parents e981850 + a1032e5 commit d5ad9dd

File tree

69 files changed

+600
-794
lines changed

Some content is hidden

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

69 files changed

+600
-794
lines changed

‎app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ class TransactionRefund extends AbstractTransaction
1717
protected function process(array $data)
1818
{
1919
$storeId = $data['store_id'] ?? null;
20-
// sending store id and other additional keys are restricted by Braintree API
21-
unset($data['store_id']);
2220

2321
return $this->adapterFactory->create($storeId)
2422
->refund($data['transaction_id'], $data[PaymentDataBuilder::AMOUNT]);

‎app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ class TransactionSubmitForSettlement extends AbstractTransaction
1919
protected function process(array $data)
2020
{
2121
$storeId = $data['store_id'] ?? null;
22-
// sending store id and other additional keys are restricted by Braintree API
23-
unset($data['store_id']);
2422

2523
return $this->adapterFactory->create($storeId)
2624
->submitForSettlement($data[CaptureDataBuilder::TRANSACTION_ID], $data[PaymentDataBuilder::AMOUNT]);

‎app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ class TransactionVoid extends AbstractTransaction
1515
protected function process(array $data)
1616
{
1717
$storeId = $data['store_id'] ?? null;
18-
// sending store id and other additional keys are restricted by Braintree API
19-
unset($data['store_id']);
2018

2119
return $this->adapterFactory->create($storeId)->void($data['transaction_id']);
2220
}

‎app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ $config = [
2929
class="action-braintree-paypal-logo" disabled>
3030
<img class="braintree-paypal-button-hidden"
3131
src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
32-
alt="Pay with PayPal"/>
32+
alt="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"
33+
title="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"/>
3334
</button>
3435
</div>

‎app/code/Magento/CatalogSearch/Block/Advanced/Form.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,19 +177,11 @@ public function getCurrencyCount()
177177
*
178178
* @param AbstractAttribute $attribute
179179
* @return string
180+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
180181
*/
181182
public function getCurrency($attribute)
182183
{
183184
return $this->_storeManager->getStore()->getCurrentCurrencyCode();
184-
185-
$baseCurrency = $this->_storeManager->getStore()->getBaseCurrency()->getCurrencyCode();
186-
return $this->getAttributeValue(
187-
$attribute,
188-
'currency'
189-
) ? $this->getAttributeValue(
190-
$attribute,
191-
'currency'
192-
) : $baseCurrency;
193185
}
194186

195187
/**

‎app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<div class="product-item-inner">
1414
<div class="product-item-name-block">
15-
<strong class="product-item-name" data-bind="text: $parent.name"></strong>
15+
<strong class="product-item-name" data-bind="html: $parent.name"></strong>
1616
<div class="details-qty">
1717
<span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
1818
<span class="value" data-bind="text: $parent.qty"></span>

‎app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
*/
66
namespace Magento\CheckoutAgreements\Controller\Adminhtml;
77

8-
abstract class Agreement extends \Magento\Backend\App\Action
8+
use Magento\Backend\App\Action;
9+
use Magento\Backend\App\Action\Context;
10+
use Magento\Framework\Registry;
11+
12+
abstract class Agreement extends Action
913
{
1014
/**
1115
* Authorization level of a basic admin session
@@ -22,12 +26,14 @@ abstract class Agreement extends \Magento\Backend\App\Action
2226
protected $_coreRegistry = null;
2327

2428
/**
25-
* @param \Magento\Backend\App\Action\Context $context
26-
* @param \Magento\Framework\Registry $coreRegistry
29+
* @param Context $context
30+
* @param Registry $coreRegistry
2731
* @codeCoverageIgnore
2832
*/
29-
public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
30-
{
33+
public function __construct(
34+
Context $context,
35+
Registry $coreRegistry
36+
) {
3137
$this->_coreRegistry = $coreRegistry;
3238
parent::__construct($context);
3339
}

‎app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,53 @@
66
*/
77
namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
88

9-
class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
9+
use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
10+
use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
11+
use Magento\Backend\App\Action\Context;
12+
use Magento\Framework\Registry;
13+
use Magento\Framework\App\ObjectManager;
14+
use Magento\Framework\Exception\LocalizedException;
15+
16+
class Delete extends Agreement
1017
{
18+
/**
19+
* @var CheckoutAgreementsRepositoryInterface
20+
*/
21+
private $agreementRepository;
22+
23+
/**
24+
* @param Context $context
25+
* @param Registry $coreRegistry
26+
* @param CheckoutAgreementsRepositoryInterface $agreementRepository
27+
*/
28+
public function __construct(
29+
Context $context,
30+
Registry $coreRegistry,
31+
CheckoutAgreementsRepositoryInterface $agreementRepository = null
32+
) {
33+
$this->agreementRepository = $agreementRepository ?:
34+
ObjectManager::getInstance()->get(CheckoutAgreementsRepositoryInterface::class);
35+
parent::__construct($context, $coreRegistry);
36+
}
1137
/**
1238
* @return void
1339
*/
1440
public function execute()
1541
{
1642
$id = (int)$this->getRequest()->getParam('id');
17-
$model = $this->_objectManager->get(\Magento\CheckoutAgreements\Model\Agreement::class)->load($id);
18-
if (!$model->getId()) {
43+
$agreement = $this->agreementRepository->get($id);
44+
if (!$agreement->getAgreementId()) {
1945
$this->messageManager->addError(__('This condition no longer exists.'));
2046
$this->_redirect('checkout/*/');
2147
return;
2248
}
2349

2450
try {
25-
$model->delete();
51+
$this->agreementRepository->delete($agreement);
2652
$this->messageManager->addSuccess(__('You deleted the condition.'));
2753
$this->_redirect('checkout/*/');
2854
return;
29-
} catch (\Magento\Framework\Exception\LocalizedException $e) {
55+
} catch (LocalizedException $e) {
3056
$this->messageManager->addError($e->getMessage());
3157
} catch (\Exception $e) {
3258
$this->messageManager->addError(__('Something went wrong while deleting this condition.'));

‎app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,42 @@
66
*/
77
namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
88

9-
class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
9+
use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
10+
use Magento\CheckoutAgreements\Model\AgreementFactory;
11+
use Magento\Backend\App\Action\Context;
12+
use Magento\Framework\Registry;
13+
use Magento\Framework\App\ObjectManager;
14+
use Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit as BlockEdit;
15+
16+
class Edit extends Agreement
1017
{
18+
/**
19+
* @var AgreementFactory
20+
*/
21+
private $agreementFactory;
22+
23+
/**
24+
* @param Context $context
25+
* @param Registry $coreRegistry
26+
* @param AgreementFactory $agreementFactory
27+
*/
28+
public function __construct(
29+
Context $context,
30+
Registry $coreRegistry,
31+
AgreementFactory $agreementFactory = null
32+
) {
33+
$this->agreementFactory = $agreementFactory ?:
34+
ObjectManager::getInstance()->get(AgreementFactory::class);
35+
parent::__construct($context, $coreRegistry);
36+
}
1137
/**
1238
* @return void
1339
* @SuppressWarnings(PHPMD.NPathComplexity)
1440
*/
1541
public function execute()
1642
{
1743
$id = $this->getRequest()->getParam('id');
18-
$agreementModel = $this->_objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
44+
$agreementModel = $this->agreementFactory->create();
1945

2046
if ($id) {
2147
$agreementModel->load($id);
@@ -26,7 +52,7 @@ public function execute()
2652
}
2753
}
2854

29-
$data = $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getAgreementData(true);
55+
$data = $this->_session->getAgreementData(true);
3056
if (!empty($data)) {
3157
$agreementModel->setData($data);
3258
}
@@ -38,7 +64,7 @@ public function execute()
3864
$id ? __('Edit Condition') : __('New Condition')
3965
)->_addContent(
4066
$this->_view->getLayout()->createBlock(
41-
\Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit::class
67+
BlockEdit::class
4268
)->setData(
4369
'action',
4470
$this->getUrl('checkout/*/save')

‎app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,47 @@
66
*/
77
namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
88

9-
class Save extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
9+
use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
10+
use Magento\CheckoutAgreements\Model\AgreementFactory;
11+
use Magento\Backend\App\Action\Context;
12+
use Magento\Framework\Registry;
13+
use Magento\Framework\App\ObjectManager;
14+
use Magento\Framework\DataObject;
15+
use Magento\Framework\Exception\LocalizedException;
16+
17+
class Save extends Agreement
1018
{
19+
/**
20+
* @var AgreementFactory
21+
*/
22+
private $agreementFactory;
23+
24+
/**
25+
* @param Context $context
26+
* @param Registry $coreRegistry
27+
* @param AgreementFactory $agreementFactory
28+
*/
29+
public function __construct(
30+
Context $context,
31+
Registry $coreRegistry,
32+
AgreementFactory $agreementFactory = null
33+
) {
34+
$this->agreementFactory = $agreementFactory ?:
35+
ObjectManager::getInstance()->get(AgreementFactory::class);
36+
parent::__construct($context, $coreRegistry);
37+
}
1138
/**
1239
* @return void
1340
*/
1441
public function execute()
1542
{
1643
$postData = $this->getRequest()->getPostValue();
1744
if ($postData) {
18-
$model = $this->_objectManager->get(\Magento\CheckoutAgreements\Model\Agreement::class);
45+
$model = $this->agreementFactory->create();
1946
$model->setData($postData);
2047

2148
try {
22-
$validationResult = $model->validateData(new \Magento\Framework\DataObject($postData));
49+
$validationResult = $model->validateData(new DataObject($postData));
2350
if ($validationResult !== true) {
2451
foreach ($validationResult as $message) {
2552
$this->messageManager->addError($message);
@@ -30,13 +57,13 @@ public function execute()
3057
$this->_redirect('checkout/*/');
3158
return;
3259
}
33-
} catch (\Magento\Framework\Exception\LocalizedException $e) {
60+
} catch (LocalizedException $e) {
3461
$this->messageManager->addError($e->getMessage());
3562
} catch (\Exception $e) {
3663
$this->messageManager->addError(__('Something went wrong while saving this condition.'));
3764
}
3865

39-
$this->_objectManager->get(\Magento\Backend\Model\Session::class)->setAgreementData($postData);
66+
$this->_session->setAgreementData($postData);
4067
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
4168
}
4269
}

‎app/code/Magento/Cms/Controller/Index/Index.php

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,73 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Index;
87

8+
use Magento\Framework\App\Action\Context;
9+
use Magento\Framework\App\Config\ScopeConfigInterface;
10+
use Magento\Framework\App\ObjectManager;
11+
use Magento\Framework\App\ResponseInterface;
12+
use Magento\Framework\Controller\ResultInterface;
13+
use Magento\Framework\Controller\Result\Forward;
14+
use Magento\Framework\Controller\Result\ForwardFactory;
15+
use Magento\Framework\View\Result\Page as ResultPage;
16+
use Magento\Cms\Helper\Page;
17+
use Magento\Store\Model\ScopeInterface;
18+
919
class Index extends \Magento\Framework\App\Action\Action
1020
{
1121
/**
12-
* @var \Magento\Framework\Controller\Result\ForwardFactory
22+
* @var ForwardFactory
1323
*/
1424
protected $resultForwardFactory;
1525

1626
/**
17-
* @param \Magento\Framework\App\Action\Context $context
18-
* @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
27+
* @var ScopeConfigInterface
28+
*/
29+
private $scopeConfig;
30+
31+
/**
32+
* @var Page
33+
*/
34+
private $page;
35+
36+
/**
37+
* Index constructor.
38+
*
39+
* @param Context $context
40+
* @param ForwardFactory $resultForwardFactory
41+
* @param ScopeConfigInterface|null $scopeConfig
42+
* @param Page|null $page
1943
*/
2044
public function __construct(
21-
\Magento\Framework\App\Action\Context $context,
22-
\Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
45+
Context $context,
46+
ForwardFactory $resultForwardFactory,
47+
ScopeConfigInterface $scopeConfig = null,
48+
Page $page = null
2349
) {
2450
$this->resultForwardFactory = $resultForwardFactory;
51+
$this->scopeConfig = $scopeConfig ? : ObjectManager::getInstance()->get(ScopeConfigInterface::class);
52+
$this->page = $page ? : ObjectManager::getInstance()->get(Page::class);
2553
parent::__construct($context);
2654
}
2755

2856
/**
2957
* Renders CMS Home page
3058
*
3159
* @param string|null $coreRoute
32-
* @return \Magento\Framework\Controller\Result\Forward
60+
*
61+
* @return bool|ResponseInterface|Forward|ResultInterface|ResultPage
62+
*
3363
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
3464
*/
3565
public function execute($coreRoute = null)
3666
{
37-
$pageId = $this->_objectManager->get(
38-
\Magento\Framework\App\Config\ScopeConfigInterface::class
39-
)->getValue(
40-
\Magento\Cms\Helper\Page::XML_PATH_HOME_PAGE,
41-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
42-
);
43-
$resultPage = $this->_objectManager->get(\Magento\Cms\Helper\Page::class)->prepareResultPage($this, $pageId);
67+
$pageId = $this->scopeConfig->getValue(Page::XML_PATH_HOME_PAGE, ScopeInterface::SCOPE_STORE);
68+
$resultPage = $this->page->prepareResultPage($this, $pageId);
4469
if (!$resultPage) {
45-
/** @var \Magento\Framework\Controller\Result\Forward $resultForward */
70+
/** @var Forward $resultForward */
4671
$resultForward = $this->resultForwardFactory->create();
4772
$resultForward->forward('defaultIndex');
4873
return $resultForward;

‎app/code/Magento/Cms/Helper/Page.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function __construct(
116116
* Return result CMS page
117117
*
118118
* @param Action $action
119-
* @param null $pageId
119+
* @param int $pageId
120120
* @return \Magento\Framework\View\Result\Page|bool
121121
*/
122122
public function prepareResultPage(Action $action, $pageId = null)
@@ -189,9 +189,7 @@ public function getPageUrl($pageId = null)
189189
$page = $this->_pageFactory->create();
190190
if ($pageId !== null && $pageId !== $page->getId()) {
191191
$page->setStoreId($this->_storeManager->getStore()->getId());
192-
if (!$page->load($pageId)) {
193-
return null;
194-
}
192+
$page->load($pageId);
195193
}
196194

197195
if (!$page->getId()) {

0 commit comments

Comments
 (0)