Skip to content

Commit 9f413d6

Browse files
author
Dmytro Yushkin
committed
MAGETWO-55953: Exception occurs when tracking shipment with invalid FedEx tracking number
- Fixed type hinting
1 parent 75a44f6 commit 9f413d6

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,9 +1089,12 @@ protected function _getXMLTracking($tracking)
10891089
* @param \stdClass $response
10901090
* @return void
10911091
*/
1092-
protected function _parseTrackingResponse($trackingValue, \stdClass $response)
1092+
protected function _parseTrackingResponse($trackingValue, $response)
10931093
{
1094-
if (in_array($response->HighestSeverity, self::$trackingErrors)) {
1094+
if (!is_object($response) || empty($response->HighestSeverity)) {
1095+
$this->appendTrackingError($trackingValue, __('Invalid response from carrier'));
1096+
return;
1097+
} else if (in_array($response->HighestSeverity, self::$trackingErrors)) {
10951098
$this->appendTrackingError($trackingValue, (string) $response->Notifications->Message);
10961099
return;
10971100
} else if (empty($response->CompletedTrackDetails) || empty($response->CompletedTrackDetails->TrackDetails)) {

0 commit comments

Comments
 (0)