diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php index 4e8b95607de4b26a0bde1cbde918a93119ebdc4d..8a820fd5846e38bb3ed907fbf9020ccaf9dbd448 100644 --- a/app/code/Magento/CatalogRule/Model/Rule.php +++ b/app/code/Magento/CatalogRule/Model/Rule.php @@ -567,14 +567,8 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I $result = []; foreach ($array1 as $key => $value) { if (array_key_exists($key, $array2)) { - if (is_array($value)) { - if ($value != $array2[$key]) { - $result[$key] = true; - } - } else { - if ($value != $array2[$key]) { - $result[$key] = true; - } + if ($value != $array2[$key]) { + $result[$key] = true; } } else { $result[$key] = true; diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php index a0f988276fd792696d65dedd1ad7f5d55838b9e1..25b8900db8f48e257cdf0ad99267ec862d9fc494 100644 --- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php +++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php @@ -115,7 +115,7 @@ class Decimal extends AbstractFilter } $label = $this->renderRangeLabel( empty($from) ? 0 : $from, - empty($to) ? $to : $to + empty($to) ? 0 : $to ); $value = $from . '-' . $to; diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php index b2345a86bff4d6349035950373d1e7975076f513..d79d7747de8af69192f16f530a600cfe12dab355 100644 --- a/app/code/Magento/Usps/Model/Carrier.php +++ b/app/code/Magento/Usps/Model/Carrier.php @@ -1901,27 +1901,30 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C $response = $client->request()->getBody(); $response = $this->parseXml($response); - if ($response === false || $response->getName() == 'Error') { - $debugData['result'] = [ - 'error' => $response->Description, - 'code' => $response->Number, - 'xml' => $response->asXML(), - ]; - $this->_debug($debugData); - $result->setErrors($debugData['result']['error']); - } else { - if ($recipientUSCountry && $service == 'Priority Express') { - $labelContent = base64_decode((string)$response->EMLabel); - $trackingNumber = (string)$response->EMConfirmationNumber; - } elseif ($recipientUSCountry) { - $labelContent = base64_decode((string)$response->SignatureConfirmationLabel); - $trackingNumber = (string)$response->SignatureConfirmationNumber; + + if($response !== false) { + if ($response->getName() == 'Error') { + $debugData['result'] = [ + 'error' => $response->Description, + 'code' => $response->Number, + 'xml' => $response->asXML(), + ]; + $this->_debug($debugData); + $result->setErrors($debugData['result']['error']); } else { - $labelContent = base64_decode((string)$response->LabelImage); - $trackingNumber = (string)$response->BarcodeNumber; + if ($recipientUSCountry && $service == 'Priority Express') { + $labelContent = base64_decode((string)$response->EMLabel); + $trackingNumber = (string)$response->EMConfirmationNumber; + } elseif ($recipientUSCountry) { + $labelContent = base64_decode((string)$response->SignatureConfirmationLabel); + $trackingNumber = (string)$response->SignatureConfirmationNumber; + } else { + $labelContent = base64_decode((string)$response->LabelImage); + $trackingNumber = (string)$response->BarcodeNumber; + } + $result->setShippingLabelContent($labelContent); + $result->setTrackingNumber($trackingNumber); } - $result->setShippingLabelContent($labelContent); - $result->setTrackingNumber($trackingNumber); } $result->setGatewayResponse($response); diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php index d28c3161903a2e6e762988709a01e0af3c1029f5..10490b6565534001a451ffc2d997ae120a420adf 100644 --- a/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php +++ b/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php @@ -54,9 +54,19 @@ class Csv implements WriterInterface * Close file handler * * @return void + * + * @deprecated */ public function __destructor() { fclose($this->_fileHandler); } + + /** + * Destructor for closing file handler + */ + public function __destruct() + { + fclose($this->_fileHandler); + } }