Merge remote-tracking branch 'origin/MAGETWO-61004' into 2.1.8-develop-pr20

Author: zakdma

dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Source/Date.php

@@ -6,15 +6,13 @@
 
 namespace Magento\Backend\Test\Fixture\Source;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Mtf\Fixture\DataSource;
 
 /**
  * Class Date.
  *
  * Data keys:
  *  - pattern (Format a local time/date with delta, e.g. 'm/d/Y -3 days' = current day - 3 days)
- *  - apply_timezone (true if it is needed to apply timezone)
  */
 class Date extends DataSource
 {
@@ -37,17 +35,7 @@ public function __construct(array $params, $data = [])
             if (!$timestamp) {
                 throw new \Exception('Invalid date format for "' . $this->params['attribute_code'] . '" field');
             }
-            if (isset($data['apply_timezone']) && $data['apply_timezone'] === true) {
-
-                $timezone = ObjectManager::getInstance()
-                    ->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
-                $date = new \DateTime();
-                $date->setTimestamp($timestamp);
-                $date->setTimezone(new \DateTimeZone($timezone->getConfigTimezone()));
-                $date = $date->format(str_replace($delta, '', $data['pattern']));
-            } else {
-                $date = date(str_replace($delta, '', $data['pattern']), $timestamp);
-            }
+            $date = date(str_replace($delta, '', $data['pattern']), $timestamp);
             if (!$date) {
                 $date = date('m/d/Y');
             }