Skip to content

Commit d6bf60e

Browse files
vzabaznovvzabaznov
committed
Merge remote-tracking branch 'origin/2.2-develop' into MC-18726-and-18727
2 parents 576fe20 + 6e21efb commit d6bf60e

File tree

713 files changed

+4791
-4301
lines changed

Some content is hidden

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

713 files changed

+4791
-4301
lines changed

‎app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
// @codingStandardsIgnoreFile
76
?>
87

98
<section class="dashboard-advanced-reports" data-index="dashboard-advanced-reports">

‎app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
/**
108
* @var $block \Magento\Authorizenet\Block\Transparent\Iframe
119
*/
@@ -15,15 +13,15 @@ $helper = $block->getHelper('adminhtml');
1513
<html>
1614
<head>
1715
<script>
18-
<?php if (isset($params['redirect'])): ?>
16+
<?php if (isset($params['redirect'])) : ?>
1917
window.location="<?= $block->escapeUrl($params['redirect']) ?>";
2018
<?php endif; ?>
21-
<?php if (isset($params['redirect_parent'])): ?>
19+
<?php if (isset($params['redirect_parent'])) : ?>
2220
window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
2321
<?php endif; ?>
24-
<?php if (isset($params['error_msg'])): ?>
22+
<?php if (isset($params['error_msg'])) : ?>
2523
window.top.directPostModel.showError(<?= /* @noEscape */ json_encode((array)$params['error_msg']) ?>);
26-
<?php if (isset($params['x_invoice_num'])): ?>
24+
<?php if (isset($params['x_invoice_num'])) : ?>
2725
window.top.directPostModel.successUrl="<?= $block->escapeUrl($helper->getSuccessOrderUrl($params)) ?>";
2826
<?php endif; ?>
2927
<?php endif; ?>

‎app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
87
/**
98
* @var \Magento\Authorizenet\Block\Transparent\Iframe $block
109
* @see \Magento\Authorizenet\Block\Transparent\Iframe
1110
*/
1211
$code = $block->escapeHtml($block->getMethodCode());
1312
$method = $block->getMethod();
1413
$controller = $block->escapeHtml($block->getRequest()->getControllerName());
15-
$orderUrl = $block->escapeUrl($this->helper('Magento\Authorizenet\Helper\Backend\Data')->getPlaceOrderAdminUrl());
14+
$orderUrl = $block->escapeUrl($block->getHelper('adminhtml')->getPlaceOrderAdminUrl());
1615
$ccType = $block->getInfoData('cc_type');
1716
$ccExpMonth = $block->getInfoData('cc_exp_month');
1817
$ccExpYear = $block->getInfoData('cc_exp_year');
@@ -41,9 +40,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
4140
'validate-cc-type-select':'#<?= /* @noEscape */ $code ?>_cc_number'
4241
}">
4342
<option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
44-
<?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
43+
<?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
4544
<option value="<?= $block->escapeHtml($typeCode) ?>"
46-
<?php if ($typeCode == $ccType): ?>selected="selected"<?php endif; ?>>
45+
<?php if ($typeCode == $ccType) : ?>selected="selected"<?php endif; ?>>
4746
<?= $block->escapeHtml($typeName) ?>
4847
</option>
4948
<?php endforeach; ?>
@@ -81,9 +80,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
8180
'required':true,
8281
'validate-cc-exp':'#<?= /* @noEscape */ $code ?>_expiration_yr'
8382
}">
84-
<?php foreach ($block->getCcMonths() as $k => $v): ?>
83+
<?php foreach ($block->getCcMonths() as $k => $v) : ?>
8584
<option value="<?= $block->escapeHtml($k) ?>"
86-
<?php if ($k == $ccExpMonth): ?>selected="selected"<?php endif; ?>>
85+
<?php if ($k == $ccExpMonth) : ?>selected="selected"<?php endif; ?>>
8786
<?= $block->escapeHtml($v) ?>
8887
</option>
8988
<?php endforeach; ?>
@@ -93,17 +92,17 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
9392
class="admin__control-select admin__control-select-year"
9493
data-container="<?= /* @noEscape */ $code ?>-cc-year"
9594
data-validate="{required:true}">
96-
<?php foreach ($block->getCcYears() as $k => $v): ?>
95+
<?php foreach ($block->getCcYears() as $k => $v) : ?>
9796
<option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
98-
<?php if ($k == $ccExpYear): ?>selected="selected"<?php endif; ?>>
97+
<?php if ($k == $ccExpYear) : ?>selected="selected"<?php endif; ?>>
9998
<?= $block->escapeHtml($v) ?>
10099
</option>
101100
<?php endforeach; ?>
102101
</select>
103102
</div>
104103
</div>
105104

106-
<?php if ($block->hasVerification()): ?>
105+
<?php if ($block->hasVerification()) : ?>
107106
<div class="admin__field _required field-cvv">
108107
<label class="admin__field-label"
109108
for="<?= /* @noEscape */ $code ?>_cc_cid"

‎app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,48 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
87
/**
98
* @var \Magento\Authorizenet\Block\Adminhtml\Order\View\Info\FraudDetails $block
109
*/
1110
$payment = $block->getPayment();
1211
$fraudDetails = $payment->getAdditionalInformation('fraud_details');
1312
?>
1413

15-
<?php if (!empty($fraudDetails)): ?>
14+
<?php if (!empty($fraudDetails)) : ?>
1615
<div class="admin__page-section-item-title">
1716
<span class="title"><?= $block->escapeHtml(__('Fraud Detection ')) ?></span>
1817
</div>
1918

2019
<div class="admin__page-section-item-content">
2120
<div class="order-payment-additional">
22-
<?php if(!empty($fraudDetails['fds_filter_action'])): ?>
21+
<?php if (!empty($fraudDetails['fds_filter_action'])) : ?>
2322
<?= $block->escapeHtml(__('FDS Filter Action')) ?>:
2423
<?= $block->escapeHtml($fraudDetails['fds_filter_action']) ?>
2524
</br>
2625
<?php endif; ?>
2726

28-
<?php if(!empty($fraudDetails['avs_response'])): ?>
27+
<?php if (!empty($fraudDetails['avs_response'])) : ?>
2928
<?= $block->escapeHtml(__('AVS Response')) ?>:
3029
<?= $block->escapeHtml($fraudDetails['avs_response']) ?>
3130
</br>
3231
<?php endif; ?>
3332

34-
<?php if(!empty($fraudDetails['card_code_response'])): ?>
33+
<?php if (!empty($fraudDetails['card_code_response'])) : ?>
3534
<?= $block->escapeHtml(__('Card Code Response')) ?>:
3635
<?= $block->escapeHtml($fraudDetails['card_code_response']) ?>
3736
</br>
3837
<?php endif; ?>
3938

40-
<?php if(!empty($fraudDetails['cavv_response']) || ($fraudDetails['cavv_response'] === 0)): ?>
39+
<?php if (!empty($fraudDetails['cavv_response']) || ($fraudDetails['cavv_response'] === 0)) : ?>
4140
<?= $block->escapeHtml(__('CAVV Response')) ?>:
4241
<?= $block->escapeHtml($fraudDetails['cavv_response']) ?>
4342
</br>
4443
<?php endif; ?>
4544

46-
<?php if(!empty($fraudDetails['fraud_filters'])): ?>
45+
<?php if (!empty($fraudDetails['fraud_filters'])) : ?>
4746
<strong><?= $block->escapeHtml(__('Fraud Filters')) ?>:
4847
</strong></br>
49-
<?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
48+
<?php foreach ($fraudDetails['fraud_filters'] as $filter) : ?>
5049
<?= $block->escapeHtml($filter['name']) ?>:
5150
<?= $block->escapeHtml($filter['action']) ?>
5251
</br>

‎app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,19 @@ class CloseTransactionHandler implements HandlerInterface
2222
*/
2323
private $subjectReader;
2424

25+
/**
26+
* @var bool
27+
*/
28+
private $closeTransaction;
29+
2530
/**
2631
* @param SubjectReader $subjectReader
32+
* @param bool $closeTransaction
2733
*/
28-
public function __construct(SubjectReader $subjectReader)
34+
public function __construct(SubjectReader $subjectReader, bool $closeTransaction = true)
2935
{
3036
$this->subjectReader = $subjectReader;
37+
$this->closeTransaction = $closeTransaction;
3138
}
3239

3340
/**
@@ -39,7 +46,7 @@ public function handle(array $handlingSubject, array $response)
3946
$payment = $paymentDO->getPayment();
4047

4148
if ($payment instanceof Payment) {
42-
$payment->setIsTransactionClosed(true);
49+
$payment->setIsTransactionClosed($this->closeTransaction);
4350
$payment->setShouldCloseParentTransaction(true);
4451
}
4552
}

‎app/code/Magento/AuthorizenetAcceptjs/etc/di.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,15 @@
190190
</argument>
191191
</arguments>
192192
</virtualType>
193+
<virtualType name="CloseCaptureTransactionHandler" type="Magento\AuthorizenetAcceptjs\Gateway\Response\CloseTransactionHandler">
194+
<arguments>
195+
<argument name="closeTransaction" xsi:type="boolean">false</argument>
196+
</arguments>
197+
</virtualType>
193198
<virtualType name="AuthorizenetAcceptjsCaptureTransactionHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
194199
<arguments>
195200
<argument name="handlers" xsi:type="array">
196-
<item name="close_parent_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\CloseParentTransactionHandler</item>
201+
<item name="close_transaction" xsi:type="string">CloseCaptureTransactionHandler</item>
197202
</argument>
198203
</arguments>
199204
</virtualType>

‎app/code/Magento/Backend/Block/Menu.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Backend\Block;
108

119
/**

‎app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminSystemAccountSection">
12-
<element name="interfaceLocale" type="text" selector="#interface_locale"/>
12+
<element name="interfaceLocale" type="select" selector="#interface_locale"/>
1313
<element name="currentPassword" type="text" selector="#current_password"/>
1414
</section>
1515
</sections>

‎app/code/Magento/Backend/Test/Unit/Model/UrlTest.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
use Magento\Framework\Serialize\Serializer\Json;
99
use Magento\Framework\Url\HostChecker;
10+
use Magento\Framework\Url\RouteParamsResolverFactory;
1011

1112
/**
1213
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
13-
* @codingStandardsIgnoreFile
1414
*/
1515
class UrlTest extends \PHPUnit\Framework\TestCase
1616
{
@@ -81,7 +81,14 @@ class UrlTest extends \PHPUnit\Framework\TestCase
8181
protected function setUp()
8282
{
8383
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
84-
$this->_menuMock = $this->createPartialMock(\Magento\Backend\Model\Menu::class, ['getFirstAvailableChild', 'get', 'getFirstAvailable']);
84+
$this->_menuMock = $this->createPartialMock(
85+
\Magento\Backend\Model\Menu::class,
86+
[
87+
'getFirstAvailableChild',
88+
'get',
89+
'getFirstAvailable',
90+
]
91+
);
8592

8693
$this->_menuConfigMock = $this->createMock(\Magento\Backend\Model\Menu\Config::class);
8794
$this->_menuConfigMock->expects($this->any())->method('getMenu')->will($this->returnValue($this->_menuMock));
@@ -136,7 +143,7 @@ protected function setUp()
136143
->method('getHash')
137144
->willReturnArgument(0);
138145
$routeParamsResolver = $this->createMock(\Magento\Framework\Url\RouteParamsResolver::class);
139-
$this->routeParamsResolverFactoryMock = $this->createMock(\Magento\Framework\Url\RouteParamsResolverFactory::class);
146+
$this->routeParamsResolverFactoryMock = $this->createMock(RouteParamsResolverFactory::class);
140147
$this->routeParamsResolverFactoryMock->expects($this->any())
141148
->method('create')
142149
->willReturn($routeParamsResolver);

‎app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
// @codingStandardsIgnoreFile
8-
96
?>
107
<?= $block->getChildHtml('grid') ?>
118
<?= $block->getGridHtml() ?>
129
<?= $block->getDialogsHtml() ?>
10+
<?php

0 commit comments

Comments
 (0)