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

 - Added more validation for shipTimestamp

Author: YevSent

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

@@ -1561,8 +1561,9 @@ private function processTrackingDetails(\stdClass $trackInfo)
             'progressdetail' => [],
         ];
 
-        if (!empty($trackInfo->ShipTimestamp)) {
-            $datetime = \DateTime::createFromFormat(\DateTime::ISO8601, $trackInfo->ShipTimestamp);
+        if (!empty($trackInfo->ShipTimestamp) &&
+            ($datetime = \DateTime::createFromFormat(\DateTime::ISO8601, $trackInfo->ShipTimestamp)) !== false
+        ) {
             $result['shippeddate'] = $datetime->format('Y-m-d');
         }
 

app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php

@@ -363,8 +363,11 @@ public function testGetTrackingErrorResponse()
 
     /**
      * @covers \Magento\Fedex\Model\Carrier::getTracking
+     * @param string $shipTimestamp
+     * @param string $expectedDate
+     * @dataProvider shipDateDataProvider
      */
-    public function testGetTracking()
+    public function testGetTracking($shipTimestamp, $expectedDate)
     {
         $tracking = '123456789012';
 
@@ -374,7 +377,7 @@ public function testGetTracking()
         $response->CompletedTrackDetails = new \stdClass();
 
         $trackDetails = new \stdClass();
-        $trackDetails->ShipTimestamp = '2016-08-05T14:06:35+00:00';
+        $trackDetails->ShipTimestamp = $shipTimestamp;
         $trackDetails->DeliverySignatureName = 'signature';
 
         $trackDetails->StatusDetail = new \stdClass();
@@ -414,7 +417,6 @@ public function testGetTracking()
             'signedby',
             'status',
             'service',
-            'shippeddate',
             'deliverydate',
             'deliverytime',
             'deliverylocation',
@@ -426,7 +428,23 @@ public function testGetTracking()
 
         static::assertEquals('2016-08-10', $current['deliverydate']);
         static::assertEquals('10:20:26', $current['deliverytime']);
-        static::assertEquals('2016-08-05', $current['shippeddate']);
+        static::assertEquals($expectedDate, $current['shippeddate']);
+    }
+
+    /**
+     * Get list of variations for testing ship date
+     * @return array
+     */
+    public function shipDateDataProvider()
+    {
+        return [
+            ['shipTimestamp' => '2016-08-05T14:06:35+00:00', 'expectedDate' => '2016-08-05'],
+            ['shipTimestamp' => '2016-08-05T14:06:35', 'expectedDate' => null],
+            ['shipTimestamp' => '2016-08-05 14:06:35', 'expectedDate' => null],
+            ['shipTimestamp' => '2016-08-05 14:06:35+00:00', 'expectedDate' => null],
+            ['shipTimestamp' => '2016-08-05', 'expectedDate' => null],
+            ['shipTimestamp' => '2016/08/05', 'expectedDate' => null],
+        ];
     }
 
     /**