Merge branch 'MAGETWO-44627' of https://github.corp.magento.com/magento-firedrakes/magento2ce into MAGETWO-44627

Author: Dmytro Voskoboinikov

app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php

@@ -34,7 +34,7 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
     ];
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
      */
     protected $_date;
 
@@ -43,7 +43,7 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $date
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      */
@@ -52,7 +52,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Stdlib\DateTime\DateTime $date,
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $date,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
     ) {
@@ -130,7 +130,7 @@ public function setValidationFilter($websiteId, $customerGroupId, $couponCode =
                     ),
                     $connection->quoteInto(
                         '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
-                        $this->_date->date('Y-m-d')
+                        $this->_date->date()->format('Y-m-d')
                     ),
                 ];
 
@@ -166,7 +166,7 @@ public function addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now = n
     {
         if (!$this->getFlag('website_group_date_filter')) {
             if (is_null($now)) {
-                $now = $this->_date->date('Y-m-d');
+                $now = $this->_date->date()->format('Y-m-d');
             }
 
             $this->addWebsiteFilter($websiteId);

dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php

@@ -6,6 +6,8 @@
 namespace Magento\SalesRule\Model\ResourceModel\Rule;
 
 /**
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
  * @magentoDataFixture Magento/SalesRule/_files/rules.php
  * @magentoDataFixture Magento/SalesRule/_files/coupons.php
  */
@@ -47,4 +49,71 @@ public function setValidationFilterDataProvider()
             'Check result with wrong code' => ['wrong_code', ['#5']]
         ];
     }
+
+    /**
+     * Test checks timezone when timezone is not changed
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/SalesRule/_files/rule_specific_date.php
+     * @magentoConfigFixture general/locale/timezone Europe/Kiev
+     */
+    public function testMultiRulesWithTimezone()
+    {
+        $this->setSpecificTimezone('Europe/Kiev');
+        $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\SalesRule\Model\ResourceModel\Rule\Collection'
+        );
+        $collection->addWebsiteGroupDateFilter(1, 0);
+        $items = array_values($collection->getItems());
+        $this->assertNotEmpty($items);
+    }
+
+    /**
+     * Test checks timezone when timezone is shifted to locale where current day already +1
+     * (e.g. existed rule: from day 2000-01-01 to day 2000-01-01, after changing timezone 2000-01-02)
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/SalesRule/_files/rule_specific_date.php
+     * @magentoConfigFixture general/locale/timezone Australia/Sydney
+     */
+    public function testMultiRulesWithDifferentTimezone()
+    {
+        $this->setSpecificTimezone('Australia/Sydney');
+        $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\SalesRule\Model\ResourceModel\Rule\Collection'
+        );
+        $collection->addWebsiteGroupDateFilter(1, 0);
+        $items = array_values($collection->getItems());
+        $this->assertEmpty($items);
+    }
+
+    protected function setSpecificTimezone($timezone)
+    {
+        $localeData = [
+            'section' => 'general',
+            'website' => null,
+            'store' => null,
+            'groups' => [
+                'locale' => [
+                    'fields' => [
+                        'timezone' => [
+                            'value' => $timezone
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Config\Model\Config\Factory')
+            ->create()
+            ->addData($localeData)
+            ->save();
+    }
+
+    public function tearDown()
+    {
+        // restore default timezone
+        $this->setSpecificTimezone('America/Los_Angeles');
+    }
 }

dev/tests/integration/testsuite/Magento/SalesRule/_files/rule_specific_date.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\SalesRule\Model\Rule $rule */
+$rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\SalesRule\Model\Rule');
+$rule->setName(
+    '#1'
+)->setIsActive(
+    1
+)->setStopRulesProcessing(
+    0
+)->setIsAdvanced(
+    1
+)->setCouponType(
+    Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
+)->setUseAutoGeneration(
+    0
+)->setWebsiteIds(
+    '1'
+)->setCustomerGroupIds(
+    '0'
+)->setFromDate(
+    date('Y-m-d')
+)->setToDate(
+    date('Y-m-d')
+)->save();