Skip to content

Commit 12a234a

Browse files
committed
#11680: Merge branch '2.3-develop' of github.com:magento/magento2 into 8022
2 parents 0f317bf + 4ee8196 commit 12a234a

File tree

322 files changed

+14171
-1443
lines changed

Some content is hidden

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

322 files changed

+14171
-1443
lines changed

.htaccess

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
############################################
3737
## adjust memory limit
3838

39-
php_value memory_limit 768M
39+
php_value memory_limit 756M
4040
php_value max_execution_time 18000
4141

4242
############################################
@@ -59,7 +59,7 @@
5959
############################################
6060
## adjust memory limit
6161

62-
php_value memory_limit 768M
62+
php_value memory_limit 756M
6363
php_value max_execution_time 18000
6464

6565
############################################

.htaccess.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
############################################
3636
## adjust memory limit
3737

38-
php_value memory_limit 768M
38+
php_value memory_limit 756M
3939
php_value max_execution_time 18000
4040

4141
############################################

.user.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
memory_limit = 768M
1+
memory_limit = 756M
22
max_execution_time = 18000
33
session.auto_start = off
44
suhosin.session.cryptua = off

app/code/Magento/Backend/Block/Dashboard/Graph.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,8 @@ public function getChartUrl($directUrl = true)
421421
$tmpstring = implode('|', $this->_axisLabels[$idx]);
422422

423423
$valueBuffer[] = $indexid . ":|" . $tmpstring;
424+
} elseif ($idx == 'y') {
425+
$valueBuffer[] = $indexid . ":|" . implode('|', $yLabels);
424426
}
425427
$indexid++;
426428
}

app/code/Magento/Backend/Block/Media/Uploader.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Backend\Block\Media;
77

8+
use Magento\Framework\App\ObjectManager;
9+
use Magento\Framework\Serialize\Serializer\Json;
10+
811
/**
912
* Adminhtml media library uploader
1013
* @api
@@ -27,17 +30,25 @@ class Uploader extends \Magento\Backend\Block\Widget
2730
*/
2831
protected $_fileSizeService;
2932

33+
/**
34+
* @var Json
35+
*/
36+
private $jsonEncoder;
37+
3038
/**
3139
* @param \Magento\Backend\Block\Template\Context $context
3240
* @param \Magento\Framework\File\Size $fileSize
3341
* @param array $data
42+
* @param Json $jsonEncoder
3443
*/
3544
public function __construct(
3645
\Magento\Backend\Block\Template\Context $context,
3746
\Magento\Framework\File\Size $fileSize,
38-
array $data = []
47+
array $data = [],
48+
Json $jsonEncoder = null
3949
) {
4050
$this->_fileSizeService = $fileSize;
51+
$this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
4152
parent::__construct($context, $data);
4253
}
4354

@@ -107,7 +118,7 @@ public function getJsObjectName()
107118
*/
108119
public function getConfigJson()
109120
{
110-
return $this->_coreData->jsonEncode($this->getConfig()->getData());
121+
return $this->jsonEncoder->encode($this->getConfig()->getData());
111122
}
112123

113124
/**
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Braintree\Model\InstantPurchase\CreditCard;
7+
8+
use Magento\Braintree\Gateway\Config\Config;
9+
use Magento\InstantPurchase\PaymentMethodIntegration\AvailabilityCheckerInterface;
10+
11+
/**
12+
* Availability of Braintree vaults for instant purchase.
13+
*/
14+
class AvailabilityChecker implements AvailabilityCheckerInterface
15+
{
16+
/**
17+
* @var Config
18+
*/
19+
private $config;
20+
21+
/**
22+
* AvailabilityChecker constructor.
23+
* @param Config $config
24+
*/
25+
public function __construct(Config $config)
26+
{
27+
$this->config = $config;
28+
}
29+
30+
/**
31+
* @inheritdoc
32+
*/
33+
public function isAvailable(): bool
34+
{
35+
if ($this->config->isVerify3DSecure()) {
36+
// Support of 3D secure not implemented for instant purchase yet.
37+
return false;
38+
}
39+
40+
return true;
41+
}
42+
}
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Braintree\Model\InstantPurchase\CreditCard;
7+
8+
use Magento\InstantPurchase\PaymentMethodIntegration\PaymentTokenFormatterInterface;
9+
use Magento\Vault\Api\Data\PaymentTokenInterface;
10+
11+
/**
12+
* Braintree stored credit card formatter.
13+
*/
14+
class TokenFormatter implements PaymentTokenFormatterInterface
15+
{
16+
/**
17+
* Most used credit card types
18+
* @var array
19+
*/
20+
public static $baseCardTypes = [
21+
'AE' => 'American Express',
22+
'VI' => 'Visa',
23+
'MC' => 'MasterCard',
24+
'DI' => 'Discover',
25+
'JBC' => 'JBC',
26+
'CUP' => 'China Union Pay',
27+
'MI' => 'Maestro',
28+
];
29+
30+
/**
31+
* @inheritdoc
32+
*/
33+
public function formatPaymentToken(PaymentTokenInterface $paymentToken): string
34+
{
35+
$details = json_decode($paymentToken->getTokenDetails() ?: '{}', true);
36+
if (!isset($details['type'], $details['maskedCC'], $details['expirationDate'])) {
37+
throw new \InvalidArgumentException('Invalid Braintree credit card token details.');
38+
}
39+
40+
if (isset(self::$baseCardTypes[$details['type']])) {
41+
$ccType = self::$baseCardTypes[$details['type']];
42+
} else {
43+
$ccType = $details['type'];
44+
}
45+
46+
$formatted = sprintf(
47+
'%s: %s, %s: %s (%s: %s)',
48+
__('Credit Card'),
49+
$ccType,
50+
__('ending'),
51+
$details['maskedCC'],
52+
__('expires'),
53+
$details['expirationDate']
54+
);
55+
56+
return $formatted;
57+
}
58+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Braintree\Model\InstantPurchase\PayPal;
7+
8+
use Magento\InstantPurchase\PaymentMethodIntegration\PaymentTokenFormatterInterface;
9+
use Magento\Vault\Api\Data\PaymentTokenInterface;
10+
11+
/**
12+
* Braintree PayPal token formatter.
13+
*/
14+
class TokenFormatter implements PaymentTokenFormatterInterface
15+
{
16+
/**
17+
* @inheritdoc
18+
*/
19+
public function formatPaymentToken(PaymentTokenInterface $paymentToken): string
20+
{
21+
$details = json_decode($paymentToken->getTokenDetails() ?: '{}', true);
22+
if (!isset($details['payerEmail'])) {
23+
throw new \InvalidArgumentException('Invalid Braintree PayPal token details.');
24+
}
25+
26+
$formatted = sprintf(
27+
'%s: %s',
28+
__('PayPal'),
29+
$details['payerEmail']
30+
);
31+
32+
return $formatted;
33+
}
34+
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Braintree\Model\InstantPurchase;
7+
8+
use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
9+
use Magento\InstantPurchase\PaymentMethodIntegration\PaymentAdditionalInformationProviderInterface;
10+
use Magento\Vault\Api\Data\PaymentTokenInterface;
11+
12+
/**
13+
* Provides Braintree specific payment additional information for instant purchase.
14+
*/
15+
class PaymentAdditionalInformationProvider implements PaymentAdditionalInformationProviderInterface
16+
{
17+
/**
18+
* @var GetPaymentNonceCommand
19+
*/
20+
private $getPaymentNonceCommand;
21+
22+
/**
23+
* PaymentAdditionalInformationProvider constructor.
24+
* @param GetPaymentNonceCommand $getPaymentNonceCommand
25+
*/
26+
public function __construct(GetPaymentNonceCommand $getPaymentNonceCommand)
27+
{
28+
$this->getPaymentNonceCommand = $getPaymentNonceCommand;
29+
}
30+
31+
/**
32+
* @inheritdoc
33+
*/
34+
public function getAdditionalInformation(PaymentTokenInterface $paymentToken): array
35+
{
36+
$paymentMethodNonce = $this->getPaymentNonceCommand->execute([
37+
PaymentTokenInterface::CUSTOMER_ID => $paymentToken->getCustomerId(),
38+
PaymentTokenInterface::PUBLIC_HASH => $paymentToken->getPublicHash(),
39+
])->get()['paymentMethodNonce'];
40+
41+
return [
42+
'payment_method_nonce' => $paymentMethodNonce,
43+
];
44+
}
45+
}

app/code/Magento/Braintree/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"magento/module-config": "100.3.*",
1616
"magento/module-customer": "100.3.*",
1717
"magento/module-directory": "100.3.*",
18+
"magento/module-instant-purchase": "100.3.*",
1819
"magento/module-payment": "100.3.*",
1920
"magento/module-paypal": "100.3.*",
2021
"magento/module-quote": "100.3.*",

app/code/Magento/Braintree/etc/config.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,21 @@
7171
<braintree_cc_vault>
7272
<model>BraintreeCreditCardVaultFacade</model>
7373
<title>Stored Cards (Braintree)</title>
74+
<instant_purchase>
75+
<available>Magento\Braintree\Model\InstantPurchase\CreditCard\AvailabilityChecker</available>
76+
<tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
77+
<additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
78+
</instant_purchase>
7479
</braintree_cc_vault>
7580
<braintree_paypal_vault>
7681
<model>BraintreePayPalVaultFacade</model>
7782
<title>Stored Accounts (Braintree PayPal)</title>
7883
<can_use_internal>1</can_use_internal>
84+
<instant_purchase>
85+
<available>Magento\Braintree\Model\InstantPurchase\CreditCard\AvailabilityChecker</available>
86+
<tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
87+
<additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
88+
</instant_purchase>
7989
</braintree_paypal_vault>
8090
</payment>
8191
</default>

app/code/Magento/Catalog/Model/ImageExtractor.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
*/
66
namespace Magento\Catalog\Model;
77

8-
use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
98
use Magento\Catalog\Helper\Image;
9+
use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
10+
use Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface;
1011

11-
class ImageExtractor implements \Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface
12+
class ImageExtractor implements TypeDataExtractorInterface
1213
{
1314
/**
1415
* Extract configuration data of images from the DOM structure
@@ -30,8 +31,11 @@ public function process(\DOMElement $mediaNode, $mediaParentTag)
3031
if ($attribute->nodeType != XML_ELEMENT_NODE) {
3132
continue;
3233
}
33-
if ($attribute->tagName == 'background') {
34+
$attributeTagName = $attribute->tagName;
35+
if ($attributeTagName === 'background') {
3436
$nodeValue = $this->processImageBackground($attribute->nodeValue);
37+
} elseif ($attributeTagName === 'width' || $attributeTagName === 'height') {
38+
$nodeValue = intval($attribute->nodeValue);
3539
} else {
3640
$nodeValue = $attribute->nodeValue;
3741
}
@@ -55,6 +59,7 @@ private function processImageBackground($backgroundString)
5559
$backgroundArray = [];
5660
if (preg_match($pattern, $backgroundString, $backgroundArray)) {
5761
array_shift($backgroundArray);
62+
$backgroundArray = array_map('intval', $backgroundArray);
5863
}
5964
return $backgroundArray;
6065
}

app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet)
6262
*/
6363
public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
6464
{
65+
$this->searchCriteriaBuilder->setFilterGroups((array)$searchCriteria->getFilterGroups());
6566
$this->searchCriteriaBuilder->addFilters(
6667
[
6768
$this->filterBuilder
@@ -71,9 +72,15 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
7172
->create(),
7273
]
7374
);
75+
76+
$this->searchCriteriaBuilder->setSortOrders((array)$searchCriteria->getSortOrders());
7477
$this->searchCriteriaBuilder->setCurrentPage($searchCriteria->getCurrentPage());
7578
$this->searchCriteriaBuilder->setPageSize($searchCriteria->getPageSize());
76-
return $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create());
79+
80+
$searchResult = $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create());
81+
$searchResult->setSearchCriteria($searchCriteria);
82+
83+
return $searchResult;
7784
}
7885

7986
/**

0 commit comments

Comments
 (0)