File tree Expand file tree Collapse file tree 2 files changed +6
-10
lines changed Expand file tree Collapse file tree 2 files changed +6
-10
lines changed Original file line number Diff line number Diff line change @@ -1731,19 +1731,15 @@ private function parseDate($timestamp)
1731
1731
return false ;
1732
1732
}
1733
1733
$ formats = [\DateTime::ATOM , 'Y-m-d\TH:i:s ' ];
1734
- $ tz = date_default_timezone_get ();
1735
-
1736
1734
foreach ($ formats as $ format ) {
1737
1735
// set UTC timezone for a case if timestamp does not contain any timezone
1738
- date_default_timezone_set ('UTC ' );
1739
- $ dateTime = \DateTime::createFromFormat ($ format , $ timestamp );
1736
+ $ utcTimezone = new \ DateTimeZone ('UTC ' );
1737
+ $ dateTime = \DateTime::createFromFormat ($ format , $ timestamp, $ utcTimezone );
1740
1738
if ($ dateTime !== false ) {
1741
- date_default_timezone_set ($ tz );
1742
1739
return $ dateTime ;
1743
1740
}
1744
1741
}
1745
1742
1746
- date_default_timezone_set ($ tz );
1747
1743
return false ;
1748
1744
}
1749
1745
}
Original file line number Diff line number Diff line change @@ -393,9 +393,9 @@ public function testGetTrackingErrorResponse()
393
393
394
394
/**
395
395
* @covers \Magento\Fedex\Model\Carrier::getTracking
396
- * @param string $shipTimestamp
397
- * @param string $expectedDate
396
+ * @param string $shipTimeStamp
398
397
* @param string $expectedDate
398
+ * @param string $expectedTime
399
399
* @dataProvider shipDateDataProvider
400
400
*/
401
401
public function testGetTracking ($ shipTimeStamp , $ expectedDate , $ expectedTime )
@@ -480,9 +480,9 @@ public function shipDateDataProvider()
480
480
481
481
/**
482
482
* @covers \Magento\Fedex\Model\Carrier::getTracking
483
- * @param string $shipTimestamp
484
- * @param string $expectedDate
483
+ * @param string $shipTimeStamp
485
484
* @param string $expectedDate
485
+ * @param string $expectedTime
486
486
* @dataProvider shipDateDataProvider
487
487
*/
488
488
public function testGetTrackingWithEvents ($ shipTimeStamp , $ expectedDate , $ expectedTime )
You can’t perform that action at this time.
0 commit comments