MAGETWO-57460: [Backport] - Exception occurs when tracking shipment with invalid FedEx tracking number - for 2.1.x

 - Fixed doc block

Author: YevSent

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

@@ -9,10 +9,11 @@
 namespace Magento\Fedex\Model;
 
 use Magento\Framework\Module\Dir;
+use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
 use Magento\Shipping\Model\Rate\Result;
-use Magento\Framework\Xml\Security;
+use Magento\Shipping\Model\Tracking\Result as TrackingResult;
 
 /**
  * Fedex shipping implementation
@@ -77,7 +78,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
     /**
      * Rate result data
      *
-     * @var Result|null
+     * @var Result|TrackingResult
      */
     protected $_result = null;
 
@@ -379,12 +380,12 @@ public function setRequest(RateRequest $request)
     /**
      * Get result of request
      *
-     * @return Result|null
+     * @return Result|TrackingResult
      */
     public function getResult()
     {
         if (!$this->_result) {
-            $this->_result = $this->_trackFactory->create();
+            $this->_result = $this->_rateFactory->create();
         }
         return $this->_result;
     }
@@ -1038,6 +1039,7 @@ protected function setTrackingReqeust()
      */
     protected function _getXMLTracking($tracking)
     {
+        $this->_result = $this->_trackFactory->create();
         $trackRequest = [
             'WebAuthenticationDetail' => [
                 'UserCredential' => [
@@ -1094,10 +1096,10 @@ protected function _parseTrackingResponse($trackingValue, $response)
         if (!is_object($response) || empty($response->HighestSeverity)) {
             $this->appendTrackingError($trackingValue, __('Invalid response from carrier'));
             return;
-        } else if (in_array($response->HighestSeverity, self::$trackingErrors)) {
+        } elseif (in_array($response->HighestSeverity, self::$trackingErrors)) {
             $this->appendTrackingError($trackingValue, (string) $response->Notifications->Message);
             return;
-        } else if (empty($response->CompletedTrackDetails) || empty($response->CompletedTrackDetails->TrackDetails)) {
+        } elseif (empty($response->CompletedTrackDetails) || empty($response->CompletedTrackDetails->TrackDetails)) {
             $this->appendTrackingError($trackingValue, __('No available tracking items'));
             return;
         }
@@ -1644,7 +1646,7 @@ private function getDeliveryDateTime(\stdClass $trackInfo)
      * Return City, State, Country Code
      *
      * @param \stdClass $address
-     * @return \Magento\Framework\Phrase|string
+     * @return string
      */
     private function getDeliveryAddress(\stdClass $address)
     {
@@ -1705,11 +1707,12 @@ private function processTrackDetailsEvents(array $events)
      * Append error message to rate result instance
      * @param string $trackingValue
      * @param string $errorMessage
+     * @return void
      */
     private function appendTrackingError($trackingValue, $errorMessage)
     {
         $error = $this->_trackErrorFactory->create();
-        $error->setCarrier('fedex');
+        $error->setCarrier(self::CODE);
         $error->setCarrierTitle($this->getConfigData('title'));
         $error->setTracking($trackingValue);
         $error->setErrorMessage($errorMessage);

app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml

@@ -40,4 +40,4 @@ $track = $block->getData('track');
         <?php endforeach; ?>
         </tbody>
     </table>
-</div>
+</div>