Skip to content

Commit ac2c2ec

Browse files
vrannvrann
committed
Merge remote-tracking branch 'mainline/2.2-develop' into bulk_api_backport
2 parents dedd910 + c8b7ea9 commit ac2c2ec

File tree

251 files changed

+3637
-791
lines changed

Some content is hidden

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

251 files changed

+3637
-791
lines changed

‎app/code/Magento/Authorizenet/Model/Directpost/Request.php‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -112,50 +112,50 @@ public function setDataFromOrder(
112112
sprintf('%.2F', $order->getBaseShippingAmount())
113113
);
114114

115-
//need to use strval() because NULL values IE6-8 decodes as "null" in JSON in JavaScript,
115+
//need to use (string) because NULL values IE6-8 decodes as "null" in JSON in JavaScript,
116116
//but we need "" for null values.
117117
$billing = $order->getBillingAddress();
118118
if (!empty($billing)) {
119-
$this->setXFirstName(strval($billing->getFirstname()))
120-
->setXLastName(strval($billing->getLastname()))
121-
->setXCompany(strval($billing->getCompany()))
122-
->setXAddress(strval($billing->getStreetLine(1)))
123-
->setXCity(strval($billing->getCity()))
124-
->setXState(strval($billing->getRegion()))
125-
->setXZip(strval($billing->getPostcode()))
126-
->setXCountry(strval($billing->getCountryId()))
127-
->setXPhone(strval($billing->getTelephone()))
128-
->setXFax(strval($billing->getFax()))
129-
->setXCustId(strval($billing->getCustomerId()))
130-
->setXCustomerIp(strval($order->getRemoteIp()))
131-
->setXCustomerTaxId(strval($billing->getTaxId()))
132-
->setXEmail(strval($order->getCustomerEmail()))
133-
->setXEmailCustomer(strval($paymentMethod->getConfigData('email_customer')))
134-
->setXMerchantEmail(strval($paymentMethod->getConfigData('merchant_email')));
119+
$this->setXFirstName((string)$billing->getFirstname())
120+
->setXLastName((string)$billing->getLastname())
121+
->setXCompany((string)$billing->getCompany())
122+
->setXAddress((string)$billing->getStreetLine(1))
123+
->setXCity((string)$billing->getCity())
124+
->setXState((string)$billing->getRegion())
125+
->setXZip((string)$billing->getPostcode())
126+
->setXCountry((string)$billing->getCountryId())
127+
->setXPhone((string)$billing->getTelephone())
128+
->setXFax((string)$billing->getFax())
129+
->setXCustId((string)$billing->getCustomerId())
130+
->setXCustomerIp((string)$order->getRemoteIp())
131+
->setXCustomerTaxId((string)$billing->getTaxId())
132+
->setXEmail((string)$order->getCustomerEmail())
133+
->setXEmailCustomer((string)$paymentMethod->getConfigData('email_customer'))
134+
->setXMerchantEmail((string)$paymentMethod->getConfigData('merchant_email'));
135135
}
136136

137137
$shipping = $order->getShippingAddress();
138138
if (!empty($shipping)) {
139139
$this->setXShipToFirstName(
140-
strval($shipping->getFirstname())
140+
(string)$shipping->getFirstname()
141141
)->setXShipToLastName(
142-
strval($shipping->getLastname())
142+
(string)$shipping->getLastname()
143143
)->setXShipToCompany(
144-
strval($shipping->getCompany())
144+
(string)$shipping->getCompany()
145145
)->setXShipToAddress(
146-
strval($shipping->getStreetLine(1))
146+
(string)$shipping->getStreetLine(1)
147147
)->setXShipToCity(
148-
strval($shipping->getCity())
148+
(string)$shipping->getCity()
149149
)->setXShipToState(
150-
strval($shipping->getRegion())
150+
(string)$shipping->getRegion()
151151
)->setXShipToZip(
152-
strval($shipping->getPostcode())
152+
(string)$shipping->getPostcode()
153153
)->setXShipToCountry(
154-
strval($shipping->getCountryId())
154+
(string)$shipping->getCountryId()
155155
);
156156
}
157157

158-
$this->setXPoNum(strval($payment->getPoNumber()));
158+
$this->setXPoNum((string)$payment->getPoNumber());
159159

160160
return $this;
161161
}

‎app/code/Magento/Authorizenet/view/frontend/requirejs-config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
var config = {
77
map: {
88
'*': {
9-
transparent: 'Magento_Payment/transparent'
9+
transparent: 'Magento_Payment/js/transparent',
10+
'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
1011
}
1112
}
1213
};

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function render(\Magento\Framework\DataObject $row)
8282
{
8383
if ($data = (string)$this->_getValue($row)) {
8484
$currency_code = $this->_getCurrencyCode($row);
85-
$data = floatval($data) * $this->_getRate($row);
85+
$data = (float)$data * $this->_getRate($row);
8686
$sign = (bool)(int)$this->getColumn()->getShowNumberSign() && $data > 0 ? '+' : '';
8787
$data = sprintf("%f", $data);
8888
$data = $this->_localeCurrency->getCurrency($currency_code)->toCurrency($data);
@@ -118,10 +118,10 @@ protected function _getCurrencyCode($row)
118118
protected function _getRate($row)
119119
{
120120
if ($rate = $this->getColumn()->getRate()) {
121-
return floatval($rate);
121+
return (float)$rate;
122122
}
123123
if ($rate = $row->getData($this->getColumn()->getRateField())) {
124-
return floatval($rate);
124+
return (float)$rate;
125125
}
126126
return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
127127
}

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
6060
return $data;
6161
}
6262

63-
$data = floatval($data) * $this->_getRate($row);
63+
$data = (float)$data * $this->_getRate($row);
6464
$data = sprintf("%f", $data);
6565
$data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
6666
return $data;
@@ -94,10 +94,10 @@ protected function _getCurrencyCode($row)
9494
protected function _getRate($row)
9595
{
9696
if ($rate = $this->getColumn()->getRate()) {
97-
return floatval($rate);
97+
return (float)$rate;
9898
}
9999
if ($rate = $row->getData($this->getColumn()->getRateField())) {
100-
return floatval($rate);
100+
return (float)$rate;
101101
}
102102
return 1;
103103
}

‎app/code/Magento/Backend/Helper/Dashboard/Order.php‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* @api
1414
* @since 100.0.2
1515
*/
16-
class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
16+
class Order extends AbstractDashboard
1717
{
1818
/**
1919
* @var \Magento\Reports\Model\ResourceModel\Order\Collection
@@ -29,32 +29,25 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
2929
/**
3030
* @param \Magento\Framework\App\Helper\Context $context
3131
* @param \Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection
32+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3233
*/
3334
public function __construct(
3435
\Magento\Framework\App\Helper\Context $context,
35-
\Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection
36+
\Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection,
37+
\Magento\Store\Model\StoreManagerInterface $storeManager = null
3638
) {
3739
$this->_orderCollection = $orderCollection;
38-
parent::__construct($context);
39-
}
40+
$this->_storeManager = $storeManager ?: ObjectManager::getInstance()
41+
->get(\Magento\Store\Model\StoreManagerInterface::class);
4042

41-
/**
42-
* The getter function to get the new StoreManager dependency
43-
*
44-
* @return \Magento\Store\Model\StoreManagerInterface
45-
*
46-
* @deprecated 100.1.0
47-
*/
48-
private function getStoreManager()
49-
{
50-
if ($this->_storeManager === null) {
51-
$this->_storeManager = ObjectManager::getInstance()->get(\Magento\Store\Model\StoreManagerInterface::class);
52-
}
53-
return $this->_storeManager;
43+
parent::__construct($context);
5444
}
5545

5646
/**
5747
* @return void
48+
*
49+
* @throws \Magento\Framework\Exception\LocalizedException
50+
* @throws \Magento\Framework\Exception\NoSuchEntityException
5851
*/
5952
protected function _initCollection()
6053
{
@@ -65,15 +58,15 @@ protected function _initCollection()
6558
if ($this->getParam('store')) {
6659
$this->_collection->addFieldToFilter('store_id', $this->getParam('store'));
6760
} elseif ($this->getParam('website')) {
68-
$storeIds = $this->getStoreManager()->getWebsite($this->getParam('website'))->getStoreIds();
61+
$storeIds = $this->_storeManager->getWebsite($this->getParam('website'))->getStoreIds();
6962
$this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
7063
} elseif ($this->getParam('group')) {
71-
$storeIds = $this->getStoreManager()->getGroup($this->getParam('group'))->getStoreIds();
64+
$storeIds = $this->_storeManager->getGroup($this->getParam('group'))->getStoreIds();
7265
$this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
7366
} elseif (!$this->_collection->isLive()) {
7467
$this->_collection->addFieldToFilter(
7568
'store_id',
76-
['eq' => $this->getStoreManager()->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
69+
['eq' => $this->_storeManager->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
7770
);
7871
}
7972
$this->_collection->load();

‎app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Braintree\Test\Unit\Gateway\Http\Client;
9+
10+
use Braintree\Result\Successful;
11+
use Magento\Braintree\Gateway\Http\Client\TransactionRefund;
12+
use Magento\Braintree\Model\Adapter\BraintreeAdapter;
13+
use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
14+
use Magento\Payment\Gateway\Http\ClientException;
15+
use Magento\Payment\Gateway\Http\ConverterException;
16+
use Magento\Payment\Gateway\Http\TransferInterface;
17+
use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
18+
use Magento\Payment\Model\Method\Logger;
19+
use PHPUnit_Framework_MockObject_MockObject as MockObject;
20+
use Psr\Log\LoggerInterface;
21+
22+
/**
23+
* Class TransactionRefundTest
24+
*/
25+
class TransactionRefundTest extends \PHPUnit\Framework\TestCase
26+
{
27+
/**
28+
* @var TransactionRefund
29+
*/
30+
private $transactionRefundModel;
31+
32+
/**
33+
* @var BraintreeAdapter|\PHPUnit_Framework_MockObject_MockObject
34+
*/
35+
private $adapterMock;
36+
37+
/**
38+
* @inheritdoc
39+
*/
40+
protected function setUp()
41+
{
42+
/** @var LoggerInterface|MockObject $criticalLoggerMock */
43+
$criticalLoggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
44+
/** @var Logger|\PHPUnit_Framework_MockObject_MockObject $loggerMock */
45+
$loggerMock = $this->getMockBuilder(Logger::class)
46+
->disableOriginalConstructor()
47+
->getMock();
48+
$this->adapterMock = $this->getMockBuilder(BraintreeAdapter::class)
49+
->disableOriginalConstructor()
50+
->getMock();
51+
/** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
52+
$adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
53+
->disableOriginalConstructor()
54+
->getMock();
55+
$adapterFactoryMock->method('create')
56+
->willReturn($this->adapterMock);
57+
58+
$this->transactionRefundModel = new TransactionRefund($criticalLoggerMock, $loggerMock, $adapterFactoryMock);
59+
}
60+
61+
/**
62+
* @throws ClientException
63+
* @throws ConverterException
64+
*/
65+
public function testRefundRequestWithStoreId()
66+
{
67+
$transactionId = '11223344';
68+
$refundAmount = 10;
69+
$data = [
70+
'store_id' => 0,
71+
'transaction_id' => $transactionId,
72+
PaymentDataBuilder::AMOUNT => $refundAmount
73+
];
74+
$successfulResponse = new Successful();
75+
76+
/** @var TransferInterface|\PHPUnit_Framework_MockObject_MockObject $transferObjectMock */
77+
$transferObjectMock = $this->createMock(TransferInterface::class);
78+
$transferObjectMock->method('getBody')
79+
->willReturn($data);
80+
$this->adapterMock->expects($this->once())
81+
->method('refund')
82+
->with($transactionId, $refundAmount)
83+
->willReturn($successfulResponse);
84+
85+
$response = $this->transactionRefundModel->placeRequest($transferObjectMock);
86+
87+
self::assertEquals($successfulResponse, $response['object']);
88+
}
89+
}

‎app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionVoidTest.php‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Braintree\Test\Unit\Gateway\Http\Client;
9+
10+
use Braintree\Result\Successful;
11+
use Magento\Braintree\Gateway\Http\Client\TransactionVoid;
12+
use Magento\Braintree\Model\Adapter\BraintreeAdapter;
13+
use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
14+
use Magento\Payment\Gateway\Http\ClientException;
15+
use Magento\Payment\Gateway\Http\ConverterException;
16+
use Magento\Payment\Gateway\Http\TransferInterface;
17+
use Magento\Payment\Model\Method\Logger;
18+
use PHPUnit_Framework_MockObject_MockObject as MockObject;
19+
use Psr\Log\LoggerInterface;
20+
21+
/**
22+
* Class TransactionVoidTest
23+
*/
24+
class TransactionVoidTest extends \PHPUnit\Framework\TestCase
25+
{
26+
/**
27+
* @var TransactionVoid
28+
*/
29+
private $transactionVoidModel;
30+
31+
/**
32+
* @var BraintreeAdapter|\PHPUnit_Framework_MockObject_MockObject
33+
*/
34+
private $adapterMock;
35+
36+
/**
37+
* @inheritdoc
38+
*/
39+
protected function setUp()
40+
{
41+
/** @var LoggerInterface|MockObject $criticalLoggerMock */
42+
$criticalLoggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
43+
/** @var Logger|\PHPUnit_Framework_MockObject_MockObject $loggerMock */
44+
$loggerMock = $this->getMockBuilder(Logger::class)
45+
->disableOriginalConstructor()
46+
->getMock();
47+
$this->adapterMock = $this->getMockBuilder(BraintreeAdapter::class)
48+
->disableOriginalConstructor()
49+
->getMock();
50+
/** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
51+
$adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
52+
->disableOriginalConstructor()
53+
->getMock();
54+
$adapterFactoryMock->method('create')
55+
->willReturn($this->adapterMock);
56+
57+
$this->transactionVoidModel = new TransactionVoid($criticalLoggerMock, $loggerMock, $adapterFactoryMock);
58+
}
59+
60+
/**
61+
* @throws ClientException
62+
* @throws ConverterException
63+
*/
64+
public function testVoidRequestWithStoreId()
65+
{
66+
$transactionId = '11223344';
67+
$data = [
68+
'store_id' => 0,
69+
'transaction_id' => $transactionId
70+
];
71+
$successfulResponse = new Successful();
72+
73+
/** @var TransferInterface|\PHPUnit_Framework_MockObject_MockObject $transferObjectMock */
74+
$transferObjectMock = $this->createMock(TransferInterface::class);
75+
$transferObjectMock->method('getBody')
76+
->willReturn($data);
77+
$this->adapterMock->expects($this->once())
78+
->method('void')
79+
->with($transactionId)
80+
->willReturn($successfulResponse);
81+
82+
$response = $this->transactionVoidModel->placeRequest($transferObjectMock);
83+
84+
self::assertEquals($successfulResponse, $response['object']);
85+
}
86+
}

0 commit comments

Comments
 (0)