Merge remote-tracking branch 'origin/MAGETWO-35230' into BUGS

Author: Maxim Medinskiy

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

@@ -205,7 +205,8 @@ protected function _convertDate($date)
             \IntlDateFormatter::NONE,
             $adminTimeZone
         );
-        $simpleRes = new \DateTime('@' . $formatter->parse($date), $adminTimeZone);
+        $simpleRes = new \DateTime(null, $adminTimeZone);
+        $simpleRes->setTimestamp($formatter->parse($date));
         $simpleRes->setTime(0, 0, 0);
         $simpleRes->setTimezone(new \DateTimeZone('UTC'));
         return $simpleRes;

app/code/Magento/Backup/Model/Backup.php

@@ -152,7 +152,7 @@ public function load($fileName, $filePath)
                 'extension' => $this->_helper->getExtensionByType($backupData->getType()),
                 'display_name' => $this->_helper->nameToDisplayName($backupData->getName()),
                 'name' => $backupData->getName(),
-                'date_object' => new \DateTime('@' . $backupData->getTime()),
+                'date_object' => (new \DateTime())->setTimestamp($backupData->getTime()),
             ]
         );
 

app/code/Magento/Catalog/Model/Product/Option/Type/Date.php

@@ -165,7 +165,7 @@ public function prepareForCart()
                 $timestamp += 60 * 60 * $value['hour'] + 60 * $value['minute'];
             }
 
-            $date = new \DateTime('@' . $timestamp);
+            $date = (new \DateTime())->setTimestamp($timestamp);
             $result = $date->format('Y-m-d H:i:s');
 
             // Save date in internal format to avoid locale date bugs
@@ -188,19 +188,22 @@ public function getFormattedOptionValue($optionValue)
     {
         if ($this->_formattedOptionValue === null) {
             if ($this->getOption()->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE) {
-                $format = $this->_localeDate->getDateFormat(
-                    \IntlDateFormatter::MEDIUM
+                $result = $this->_localeDate->formatDateTime(
+                    new \DateTime($optionValue),
+                    \IntlDateFormatter::MEDIUM,
+                    \IntlDateFormatter::NONE
                 );
-                $result = \IntlDateFormatter::formatObject(new \DateTime($optionValue), $format);
             } elseif ($this->getOption()->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME) {
-                $format = $this->_localeDate->getDateTimeFormat(
+                $result = $this->_localeDate->formatDateTime(
+                    new \DateTime($optionValue),
+                    \IntlDateFormatter::SHORT,
                     \IntlDateFormatter::SHORT
                 );
-                $result = \IntlDateFormatter::formatObject(new \DateTime($optionValue), $format);
             } elseif ($this->getOption()->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_TIME) {
-                $result = \IntlDateFormatter::formatObject(
+                $result = $this->_localeDate->formatDateTime(
                     new \DateTime($optionValue),
-                    $this->is24hTimeFormat() ? 'H:i' : 'h:i a'
+                    \IntlDateFormatter::NONE,
+                    \IntlDateFormatter::SHORT
                 );
             } else {
                 $result = $optionValue;

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1086,7 +1086,7 @@ protected function _saveProducts()
                     $storeIds = [0];
 
                     if ('datetime' == $attribute->getBackendType() && strtotime($attrValue)) {
-                        $attrValue = new \DateTime('@' . strtotime($attrValue));
+                        $attrValue = (new \DateTime())->setTimestamp(strtotime($attrValue));
                         $attrValue = $attrValue->format(DateTime::DATETIME_PHP_FORMAT);
                     } elseif ($backModel) {
                         $attribute->getBackend()->beforeSave($product);

app/code/Magento/CatalogRule/Model/Observer.php

@@ -267,7 +267,7 @@ public function prepareCatalogProductCollectionPrices(EventObserver $observer)
         if ($observer->getEvent()->hasDate()) {
             $date = new \DateTime($observer->getEvent()->getDate());
         } else {
-            $date = new \DateTime('@' . $this->_localeDate->scopeTimeStamp($store));
+            $date = (new \DateTime())->setTimestamp($this->_localeDate->scopeTimeStamp($store));
         }
 
         $productIds = [];

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -473,7 +473,7 @@ protected function _prepareDataForUpdate(array $rowData)
                 if ('select' == $attributeParams['type']) {
                     $value = $attributeParams['options'][strtolower($rowData[$attributeAlias])];
                 } elseif ('datetime' == $attributeParams['type']) {
-                    $value = new \DateTime('@' . strtotime($rowData[$attributeAlias]));
+                    $value = (new \DateTime())->setTimestamp(strtotime($rowData[$attributeAlias]));
                     $value = $value->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
                 } else {
                     $value = $rowData[$attributeAlias];

app/code/Magento/CustomerImportExport/Model/Import/Customer.php

@@ -292,11 +292,11 @@ protected function _prepareDataForUpdate(array $rowData)
         $attributesToSave = [];
 
         // entity table data
-        $now = new \DateTime('@' . time());
+        $now = new \DateTime();
         if (empty($rowData['created_at'])) {
             $createdAt = $now;
         } else {
-            $createdAt = new \DateTime('@' . strtotime($rowData['created_at']));
+            $createdAt = (new \DateTime())->setTimestamp(strtotime($rowData['created_at']));
         }
         $entityRow = [
             'group_id' => empty($rowData['group_id']) ? self::DEFAULT_GROUP_ID : $rowData['group_id'],
@@ -333,7 +333,7 @@ protected function _prepareDataForUpdate(array $rowData)
                 if ('select' == $attributeParameters['type']) {
                     $value = $attributeParameters['options'][strtolower($value)];
                 } elseif ('datetime' == $attributeParameters['type']) {
-                    $value = new \DateTime('@' . strtotime($value));
+                    $value = (new \DateTime())->setTimestamp(strtotime($value));
                     $value = $value->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
                 } elseif ($backendModel) {
                     $attribute->getBackend()->beforeSave($this->_customerModel->setData($attributeCode, $value));

app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php

@@ -71,7 +71,7 @@ public function formatDate($date)
         }
         // unix timestamp given - simply instantiate date object
         if (is_scalar($date) && preg_match('/^[0-9]+$/', $date)) {
-            $date = new \DateTime('@' . $date);
+            $date = (new \DateTime())->setTimestamp($date);
             // international format
         } elseif (!($date instanceof \DateTime)) {
             $date = new \DateTime($date);

app/code/Magento/Reports/Block/Adminhtml/Grid.php

@@ -92,7 +92,7 @@ protected function _prepareCollection()
 
             if (!isset($data['report_from'])) {
                 // getting all reports from 2001 year
-                $date = new \DateTime('@' . mktime(0, 0, 0, 1, 1, 2001));
+                $date = (new \DateTime())->setTimestamp(mktime(0, 0, 0, 1, 1, 2001));
                 $data['report_from'] = $this->_localeDate->formatDateTime(
                     $date,
                     \IntlDateFormatter::SHORT,