Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.3-develop
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
magento-engcom-team authored Jun 1, 2018
2 parents 0522c09 + f7e78ae commit f8b1e47
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 8 deletions.
15 changes: 14 additions & 1 deletion app/code/Magento/Paypal/Model/Api/Nvp.php
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ public function callGetExpressCheckoutDetails()
$request = $this->_exportToRequest($this->_getExpressCheckoutDetailsRequest);
$response = $this->call(self::GET_EXPRESS_CHECKOUT_DETAILS, $request);
$this->_importFromResponse($this->_paymentInformationResponse, $response);
$this->_exportAddressses($response);
$this->_exportAddresses($response);
}

/**
Expand Down Expand Up @@ -1461,8 +1461,21 @@ protected function _exportLineItems(array &$request, $i = 0)
*
* @param array $data
* @return void
* @deprecated 100.2.2 typo in method name
* @see _exportAddresses
*/
protected function _exportAddressses($data)
{
$this->_exportAddresses($data);
}

/**
* Create billing and shipping addresses basing on response data
*
* @param array $data
* @return void
*/
protected function _exportAddresses($data)
{
$address = new \Magento\Framework\DataObject();
\Magento\Framework\DataObject\Mapper::accumulateByMap($data, $address, $this->_billingAddressMap);
Expand Down
8 changes: 5 additions & 3 deletions app/code/Magento/Webapi/Model/Soap/Fault.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ class Fault
const NODE_DETAIL_WRAPPER = 'GenericFault';
/**#@-*/

/**#@-*/
/**
* @var string
*/
protected $_soapFaultCode;

/**
Expand Down Expand Up @@ -114,7 +116,7 @@ public function __construct(
\Magento\Framework\Locale\ResolverInterface $localeResolver,
State $appState
) {
$this->_soapCode = $exception->getOriginator();
$this->_soapFaultCode = $exception->getOriginator();
$this->_parameters = $exception->getDetails();
$this->_wrappedErrors = $exception->getErrors();
$this->stackTrace = $exception->getStackTrace() ?: $exception->getTraceAsString();
Expand Down Expand Up @@ -194,7 +196,7 @@ public function getDetails()
*/
public function getSoapCode()
{
return $this->_soapCode;
return $this->_soapFaultCode;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
background-color: transparent;
border: none;
color: @link__color;
font-family: @btn__base__font-size;
font-size: 1.5rem; // ToDo UI: Check font-size and standardize
font-family: @font-family__base;
font-size: @base__font-size;

&:hover,
&:active,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ public function fetchItem()
/**
* Overridden to use _idFieldName by default.
*
* @param null $valueField
* @param string|null $valueField
* @param string $labelField
* @param array $additional
* @return array
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/Image.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function open()
$this->_adapter->checkDependencies();

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

$this->_adapter->open($this->_fileName);
Expand Down

0 comments on commit f8b1e47

Please sign in to comment.