Merge pull request #175 from magento2/time_zone

[Extensibility] Timezone bug fixes

Author: He, Joan(johe)

app/bootstrap.php

@@ -41,6 +41,5 @@
         !empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
     );
 }
-if (ini_get('date.timezone') == '') {
-    date_default_timezone_set('UTC');
-}
+
+date_default_timezone_set('UTC');

app/code/Magento/AdminNotification/Model/Feed.php

@@ -141,10 +141,11 @@ public function checkUpdate()
 
         if ($feedXml && $feedXml->channel && $feedXml->channel->item) {
             foreach ($feedXml->channel->item as $item) {
-                if ($installDate <= strtotime((string)$item->pubDate)) {
+                $itemPublicationDate = strtotime((string)$item->pubDate);
+                if ($installDate <= $itemPublicationDate) {
                     $feedData[] = [
                         'severity' => (int)$item->severity,
-                        'date_added' => $this->getDate((string)$item->pubDate),
+                        'date_added' => date('Y-m-d H:i:s', $itemPublicationDate),
                         'title' => (string)$item->title,
                         'description' => (string)$item->description,
                         'url' => (string)$item->link,
@@ -161,17 +162,6 @@ public function checkUpdate()
         return $this;
     }
 
-    /**
-     * Retrieve DB date from RSS date
-     *
-     * @param string $rssDate
-     * @return string YYYY-MM-DD YY:HH:SS
-     */
-    public function getDate($rssDate)
-    {
-        return gmdate('Y-m-d H:i:s', strtotime($rssDate));
-    }
-
     /**
      * Retrieve Update Frequency
      *

app/code/Magento/AdminNotification/Observer/PredispathAdminActionControllerObserver.php renamed to app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php

@@ -12,7 +12,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class PredispathAdminActionControllerObserver implements ObserverInterface
+class PredispatchAdminActionControllerObserver implements ObserverInterface
 {
     /**
      * @var \Magento\AdminNotification\Model\FeedFactory

app/code/Magento/AdminNotification/etc/adminhtml/events.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="controller_action_predispatch">
-        <observer name="adminnotification" instance="Magento\AdminNotification\Observer\PredispathAdminActionControllerObserver" />
+        <observer name="adminnotification" instance="Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver" />
     </event>
 </config>

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -345,10 +345,10 @@ protected function getTierPrices(array $listSku, $table)
             if (isset($exportFilter) && !empty($exportFilter)) {
                 $date = $exportFilter[\Magento\Catalog\Model\Category::KEY_UPDATED_AT];
                 if (isset($date[0]) && !empty($date[0])) {
-                    $updatedAtFrom = date('Y-m-d H:i:s', strtotime($date[0]));
+                    $updatedAtFrom = $this->_localeDate->date($date[0], null, false)->format('Y-m-d H:i:s');
                 }
                 if (isset($date[1]) && !empty($date[1])) {
-                    $updatedAtTo = date('Y-m-d H:i:s', strtotime($date[1]));
+                    $updatedAtTo = $this->_localeDate->date($date[1], null, false)->format('Y-m-d H:i:s');
                 }
             }
             try {

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -143,9 +143,9 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
     protected $_catalogProductEntity;
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
      */
-    protected $_localeDate;
+    protected $dateTime;
 
     /**
      * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -157,7 +157,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * @param \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param ProcessingErrorAggregatorInterface $errorAggregator
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @param \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory
      * @param \Magento\Catalog\Model\Product $productModel
      * @param \Magento\Catalog\Helper\Data $catalogData
@@ -177,7 +177,7 @@ public function __construct(
         \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Stdlib\StringUtils $string,
         ProcessingErrorAggregatorInterface $errorAggregator,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
         \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory,
         \Magento\Catalog\Model\Product $productModel,
         \Magento\Catalog\Helper\Data $catalogData,
@@ -187,7 +187,7 @@ public function __construct(
         AdvancedPricing\Validator\Website $websiteValidator,
         AdvancedPricing\Validator\TierPrice $tierPriceValidator
     ) {
-        $this->_localeDate = $localeDate;
+        $this->dateTime = $dateTime;
         $this->jsonHelper = $jsonHelper;
         $this->_importExportData = $importExportData;
         $this->_resourceHelper = $resourceHelper;
@@ -470,11 +470,11 @@ protected function deleteProductTierPrices(array $listSku, $tableName)
      */
     protected function setUpdatedAt(array $listSku)
     {
-        $updatedAt = $this->_localeDate->date(null, null, false)->format('Y-m-d H:i:s');
+        $updatedAt = $this->dateTime->gmtDate('Y-m-d H:i:s');
         $this->_connection->update(
             $this->_catalogProductEntity,
             [\Magento\Catalog\Model\Category::KEY_UPDATED_AT => $updatedAt],
-            $this->_connection->quoteInto('sku IN (?)', $listSku)
+            $this->_connection->quoteInto('sku IN (?)', array_unique($listSku))
         );
         return $this;
     }

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -79,7 +79,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $localeDate;
+    protected $dateTime;
 
     /**
      * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
@@ -249,14 +249,14 @@ public function setUp()
             false
         );
         $this->errorAggregator = $this->getErrorAggregatorObject();
-        $this->localeDate = $this->getMock(
-            '\Magento\Framework\Stdlib\DateTime\Timezone',
+        $this->dateTime = $this->getMock(
+            '\Magento\Framework\Stdlib\DateTime\DateTime',
             ['date', 'format'],
             [],
             '',
             false
         );
-        $this->localeDate->expects($this->any())->method('date')->willReturnSelf();
+        $this->dateTime->expects($this->any())->method('date')->willReturnSelf();
 
         $this->advancedPricing = $this->getAdvancedPricingMock([
             'retrieveOldSkus',
@@ -783,7 +783,7 @@ private function getAdvancedPricingMock($methods = [])
                 $this->resourceHelper,
                 $this->stringObject,
                 $this->errorAggregator,
-                $this->localeDate,
+                $this->dateTime,
                 $this->resourceFactory,
                 $this->productModel,
                 $this->catalogData,

app/code/Magento/Authorization/Model/ResourceModel/Role.php

@@ -26,24 +26,16 @@ class Role extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $_cache;
 
-    /**
-     * @var \Magento\Framework\Stdlib\DateTime
-     */
-    protected $dateTime;
-
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\App\CacheInterface $cache
-     * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param string $connectionName
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\App\CacheInterface $cache,
-        \Magento\Framework\Stdlib\DateTime $dateTime,
         $connectionName = null
     ) {
-        $this->dateTime = $dateTime;
         parent::__construct($context, $connectionName);
         $this->_cache = $cache->getFrontend();
     }
@@ -67,11 +59,6 @@ protected function _construct()
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $role)
     {
-        if (!$role->getId()) {
-            $role->setCreated($this->dateTime->formatDate(true));
-        }
-        $role->setModified($this->dateTime->formatDate(true));
-
         if ($role->getId() == '') {
             if ($role->getIdFieldName()) {
                 $role->unsetData($role->getIdFieldName());

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -387,7 +387,7 @@ public function getChartUrl($directUrl = true)
                      */
                     foreach ($this->_axisLabels[$idx] as $_index => $_label) {
                         if ($_label != '') {
-                            $period = new \DateTime($_label);
+                            $period = new \DateTime($_label, new \DateTimeZone($timezoneLocal));
                             switch ($this->getDataHelper()->getParam('period')) {
                                 case '24h':
                                     $this->_axisLabels[$idx][$_index] = $this->_localeDate->formatDateTime(

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

@@ -447,7 +447,7 @@ public function setFilterType($type, $className)
      */
     protected function _getFilterByType()
     {
-        $type = strtolower($this->getType());
+        $type = $this->getFilterType() ? strtolower($this->getFilterType()) : strtolower($this->getType());
         $filterClass = isset($this->_filterTypes[$type]) ? $this->_filterTypes[$type] : $this->_filterTypes['default'];
 
         return $filterClass;