Skip to content

Commit f8b1e47

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #15537: [Forwardport] Updated font-size variable and standardize #ToDo UI (by @vgelani) - #15578: [Forwardport] #12820 - Wrong annotation in _toOptionArray - magento/framework/Data/� (by @osrecio) - #15595: [Forwardport] [fix] dynamical assigned property in webapi (by @mzeis) - #15575: [Forwardport] [fix] typo in method name _exportAddress[s]es (by @osrecio) - #15574: [Forwardport] Fix typo in Image::open exception message (by @osrecio)
2 parents 0522c09 + f7e78ae commit f8b1e47

File tree

5 files changed

+23
-8
lines changed

5 files changed

+23
-8
lines changed

app/code/Magento/Paypal/Model/Api/Nvp.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ public function callGetExpressCheckoutDetails()
844844
$request = $this->_exportToRequest($this->_getExpressCheckoutDetailsRequest);
845845
$response = $this->call(self::GET_EXPRESS_CHECKOUT_DETAILS, $request);
846846
$this->_importFromResponse($this->_paymentInformationResponse, $response);
847-
$this->_exportAddressses($response);
847+
$this->_exportAddresses($response);
848848
}
849849

850850
/**
@@ -1461,8 +1461,21 @@ protected function _exportLineItems(array &$request, $i = 0)
14611461
*
14621462
* @param array $data
14631463
* @return void
1464+
* @deprecated 100.2.2 typo in method name
1465+
* @see _exportAddresses
14641466
*/
14651467
protected function _exportAddressses($data)
1468+
{
1469+
$this->_exportAddresses($data);
1470+
}
1471+
1472+
/**
1473+
* Create billing and shipping addresses basing on response data
1474+
*
1475+
* @param array $data
1476+
* @return void
1477+
*/
1478+
protected function _exportAddresses($data)
14661479
{
14671480
$address = new \Magento\Framework\DataObject();
14681481
\Magento\Framework\DataObject\Mapper::accumulateByMap($data, $address, $this->_billingAddressMap);

app/code/Magento/Webapi/Model/Soap/Fault.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ class Fault
3939
const NODE_DETAIL_WRAPPER = 'GenericFault';
4040
/**#@-*/
4141

42-
/**#@-*/
42+
/**
43+
* @var string
44+
*/
4345
protected $_soapFaultCode;
4446

4547
/**
@@ -114,7 +116,7 @@ public function __construct(
114116
\Magento\Framework\Locale\ResolverInterface $localeResolver,
115117
State $appState
116118
) {
117-
$this->_soapCode = $exception->getOriginator();
119+
$this->_soapFaultCode = $exception->getOriginator();
118120
$this->_parameters = $exception->getDetails();
119121
$this->_wrappedErrors = $exception->getErrors();
120122
$this->stackTrace = $exception->getStackTrace() ?: $exception->getTraceAsString();
@@ -194,7 +196,7 @@ public function getDetails()
194196
*/
195197
public function getSoapCode()
196198
{
197-
return $this->_soapCode;
199+
return $this->_soapFaultCode;
198200
}
199201

200202
/**

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
background-color: transparent;
100100
border: none;
101101
color: @link__color;
102-
font-family: @btn__base__font-size;
103-
font-size: 1.5rem; // ToDo UI: Check font-size and standardize
102+
font-family: @font-family__base;
103+
font-size: @base__font-size;
104104

105105
&:hover,
106106
&:active,

lib/internal/Magento/Framework/Data/Collection/AbstractDb.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ public function fetchItem()
630630
/**
631631
* Overridden to use _idFieldName by default.
632632
*
633-
* @param null $valueField
633+
* @param string|null $valueField
634634
* @param string $labelField
635635
* @param array $additional
636636
* @return array

lib/internal/Magento/Framework/Image.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function open()
4949
$this->_adapter->checkDependencies();
5050

5151
if (!file_exists($this->_fileName)) {
52-
throw new \Exception("File '{$this->_fileName}' does not exists.");
52+
throw new \Exception("File '{$this->_fileName}' does not exist.");
5353
}
5454

5555
$this->_adapter->open($this->_fileName);

0 commit comments

Comments
 (0)