Skip to content

Commit b325b3b

Browse files
dvoskoboinikovdvoskoboinikov
committed
Merge branch '2.2-develop' into 2.2.10-develop
# Conflicts: # app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml # app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php # composer.lock
2 parents c721eef + f724bb2 commit b325b3b

File tree

946 files changed

+8613
-4617
lines changed

Some content is hidden

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

946 files changed

+8613
-4617
lines changed

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.0.13|~7.1.0|~7.2.0",
5+
"php": "~7.1.0|~7.2.0",
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-media-storage": "100.2.*",

‎app/code/Magento/AdvancedPricingImportExport/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-advanced-pricing-import-export",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.0.13|~7.1.0|~7.2.0",
5+
"php": "~7.1.0|~7.2.0",
66
"magento/module-catalog": "102.0.*",
77
"magento/module-catalog-inventory": "100.2.*",
88
"magento/module-eav": "101.0.*",

‎app/code/Magento/Analytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-analytics",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.0.13|~7.1.0|~7.2.0",
5+
"php": "~7.1.0|~7.2.0",
66
"magento/module-backend": "100.2.*",
77
"magento/module-config": "101.0.*",
88
"magento/module-integration": "100.2.*",

‎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/Authorization/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
5-
"php": "~7.0.13|~7.1.0|~7.2.0",
5+
"php": "~7.1.0|~7.2.0",
66
"magento/module-backend": "100.2.*",
77
"magento/framework": "101.0.*"
88
},

‎app/code/Magento/Authorizenet/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorizenet",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.0.13|~7.1.0|~7.2.0",
5+
"php": "~7.1.0|~7.2.0",
66
"magento/module-sales": "101.0.*",
77
"magento/module-store": "100.2.*",
88
"magento/module-quote": "101.0.*",

‎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/Request/StubDataBuilder.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\AuthorizenetAcceptjs\Gateway\Request;
10+
11+
use Magento\Payment\Gateway\Request\BuilderInterface;
12+
13+
/**
14+
* Stub data builder.
15+
*
16+
* Since the order of params is matters for Authorize.net request,
17+
* this builder is used to reserve a place in builders sequence.
18+
*/
19+
class StubDataBuilder implements BuilderInterface
20+
{
21+
/**
22+
* @inheritdoc
23+
*/
24+
public function build(array $buildSubject): array
25+
{
26+
return [];
27+
}
28+
}

0 commit comments

Comments
 (0)