From b2016027c55a3508b8f0f7fa35c70626533987fa Mon Sep 17 00:00:00 2001
From: vzabaznov <vzabaznov@magento.com>
Date: Thu, 15 Dec 2016 10:55:14 +0200
Subject: [PATCH] MAGETWO-62187: [GITHUB] Few weaknesses in the code #6715
#7776
---
app/code/Magento/CatalogRule/Model/Rule.php | 10 +----
.../Model/Layer/Filter/Decimal.php | 2 +-
app/code/Magento/Usps/Model/Carrier.php | 41 ++++++++++---------
3 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index 4e8b95607de..8a820fd5846 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 a0f988276fd..25b8900db8f 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 b2345a86bff..d79d7747de8 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);
--
GitLab