Skip to content

Commit ff15af8

Browse files
author
Vadim Zubovich
committed
Merge branch 'develop' into pr2
2 parents 00cb786 + 5a0cc81 commit ff15af8

File tree

4 files changed

+35
-28
lines changed

4 files changed

+35
-28
lines changed

app/code/Magento/CatalogRule/Model/Rule.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -567,14 +567,8 @@ protected function dataDiff($array1, $array2)
567567
$result = [];
568568
foreach ($array1 as $key => $value) {
569569
if (array_key_exists($key, $array2)) {
570-
if (is_array($value)) {
571-
if ($value != $array2[$key]) {
572-
$result[$key] = true;
573-
}
574-
} else {
575-
if ($value != $array2[$key]) {
576-
$result[$key] = true;
577-
}
570+
if ($value != $array2[$key]) {
571+
$result[$key] = true;
578572
}
579573
} else {
580574
$result[$key] = true;

app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ protected function _getItemsData()
115115
}
116116
$label = $this->renderRangeLabel(
117117
empty($from) ? 0 : $from,
118-
empty($to) ? $to : $to
118+
empty($to) ? 0 : $to
119119
);
120120
$value = $from . '-' . $to;
121121

app/code/Magento/Usps/Model/Carrier.php

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,27 +1901,30 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
19011901
$response = $client->request()->getBody();
19021902

19031903
$response = $this->parseXml($response);
1904-
if ($response === false || $response->getName() == 'Error') {
1905-
$debugData['result'] = [
1906-
'error' => $response->Description,
1907-
'code' => $response->Number,
1908-
'xml' => $response->asXML(),
1909-
];
1910-
$this->_debug($debugData);
1911-
$result->setErrors($debugData['result']['error']);
1912-
} else {
1913-
if ($recipientUSCountry && $service == 'Priority Express') {
1914-
$labelContent = base64_decode((string)$response->EMLabel);
1915-
$trackingNumber = (string)$response->EMConfirmationNumber;
1916-
} elseif ($recipientUSCountry) {
1917-
$labelContent = base64_decode((string)$response->SignatureConfirmationLabel);
1918-
$trackingNumber = (string)$response->SignatureConfirmationNumber;
1904+
1905+
if($response !== false) {
1906+
if ($response->getName() == 'Error') {
1907+
$debugData['result'] = [
1908+
'error' => $response->Description,
1909+
'code' => $response->Number,
1910+
'xml' => $response->asXML(),
1911+
];
1912+
$this->_debug($debugData);
1913+
$result->setErrors($debugData['result']['error']);
19191914
} else {
1920-
$labelContent = base64_decode((string)$response->LabelImage);
1921-
$trackingNumber = (string)$response->BarcodeNumber;
1915+
if ($recipientUSCountry && $service == 'Priority Express') {
1916+
$labelContent = base64_decode((string)$response->EMLabel);
1917+
$trackingNumber = (string)$response->EMConfirmationNumber;
1918+
} elseif ($recipientUSCountry) {
1919+
$labelContent = base64_decode((string)$response->SignatureConfirmationLabel);
1920+
$trackingNumber = (string)$response->SignatureConfirmationNumber;
1921+
} else {
1922+
$labelContent = base64_decode((string)$response->LabelImage);
1923+
$trackingNumber = (string)$response->BarcodeNumber;
1924+
}
1925+
$result->setShippingLabelContent($labelContent);
1926+
$result->setTrackingNumber($trackingNumber);
19221927
}
1923-
$result->setShippingLabelContent($labelContent);
1924-
$result->setTrackingNumber($trackingNumber);
19251928
}
19261929

19271930
$result->setGatewayResponse($response);

setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,19 @@ public function write(Phrase $phrase)
5454
* Close file handler
5555
*
5656
* @return void
57+
*
58+
* @deprecated
5759
*/
5860
public function __destructor()
5961
{
6062
fclose($this->_fileHandler);
6163
}
64+
65+
/**
66+
* Destructor for closing file handler
67+
*/
68+
public function __destruct()
69+
{
70+
fclose($this->_fileHandler);
71+
}
6272
}

0 commit comments

Comments
 (0)