Merge remote-tracking branch 'troll/MAGETWO-70327' into PRS

slavvka · slavvka · commit 9c1568ebe6df · 2017-07-06T12:35:00.000+03:00
diff --git a/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php b/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php
@@ -69,18 +69,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->dataProviderMock = $this->getMockForAbstractClass(DataProviderInterface::class);
-
         $this->contextMock->expects($this->any())
             ->method('getNamespace')
             ->willReturn(DateRange::NAME);
         $this->contextMock->expects($this->any())
             ->method('addComponentDefinition')
             ->with(DateRange::NAME, ['extends' => DateRange::NAME]);
 
-        $this->contextMock->expects($this->any())
-            ->method('getDataProvider')
-            ->willReturn($this->dataProviderMock);
+        $this->dataProviderMock = $this->getMockForAbstractClass(DataProviderInterface::class);
     }
 
     /**
@@ -95,16 +91,21 @@ protected function setUp()
      */
     public function testPrepare($name, $filterData, $expectedCondition)
     {
-        $this->contextMock->expects($this->any())
-            ->method('getFiltersParams')
-            ->willReturn($filterData);
-
+        /** @var FormDate PHPUnit_Framework_MockObject_MockObject|$uiComponent */
         $uiComponent = $this->getMockBuilder(FormDate::class)->disableOriginalConstructor()->getMock();
 
         $uiComponent->expects($this->any())
             ->method('getContext')
             ->willReturn($this->contextMock);
 
+        $this->contextMock->expects($this->any())
+            ->method('getFiltersParams')
+            ->willReturn($filterData);
+
+        $this->contextMock->expects($this->any())
+            ->method('getDataProvider')
+            ->willReturn($this->dataProviderMock);
+
         if ($expectedCondition !== null) {
             if (is_string($filterData[$name])) {
                 $uiComponent->expects(static::once())
@@ -115,11 +116,11 @@ public function testPrepare($name, $filterData, $expectedCondition)
                 $uiComponent->method('convertDate')
                     ->willReturnMap([
                         [
-                            $filterData[$name]['from'],
+                            $filterData[$name]['from'], 0, 0, 0, true,
                             new \DateTime($filterData[$name]['from'], new \DateTimeZone('UTC'))
                         ],
                         [
-                            $filterData[$name]['to'],
+                            $filterData[$name]['to'], 23, 59, 59, true,
                             new \DateTime($filterData[$name]['to'] . ' 23:59:00', new \DateTimeZone('UTC'))
                         ],
                     ]);
@@ -158,23 +159,6 @@ public function testPrepare($name, $filterData, $expectedCondition)
                         ->with($filterMock);
                     break;
             }
-        } else {
-            $uiComponent->method('convertDate')
-                ->willReturnMap([
-                    [
-                        $filterData[$name]['from'],
-                        new \DateTime($filterData[$name]['from'], new \DateTimeZone('UTC'))
-                    ],
-                    [
-                        $filterData[$name]['to'],
-                        new \DateTime($filterData[$name]['to'] . ' 23:59:00', new \DateTimeZone('UTC'))
-                    ],
-                ]);
-
-            $filterMock = $this->getFilterMockWithoutExpectedCondition();
-            $this->dataProviderMock->expects(static::exactly(2))
-                ->method('addFilter')
-                ->with($filterMock);
         }
 
         $this->uiComponentFactory->expects($this->any())
@@ -226,31 +210,6 @@ private function getFilterMock($name, $expectedType, $expectedDate, &$i)
         return $filterMock;
     }
 
-    /**
-     * Gets Filter mock without expected condition
-     *
-     * @return Filter|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private function getFilterMockWithoutExpectedCondition()
-    {
-        $this->filterBuilderMock->expects(static::exactly(2))
-            ->method('setConditionType')
-            ->willReturnSelf();
-        $this->filterBuilderMock->expects(static::exactly(2))
-            ->method('setField')
-            ->willReturnSelf();
-        $this->filterBuilderMock->expects(static::exactly(2))
-            ->method('setValue')
-            ->willReturnSelf();
-
-        $filterMock = $this->getMock(Filter::class);
-        $this->filterBuilderMock->expects(static::exactly(2))
-            ->method('create')
-            ->willReturn($filterMock);
-
-        return $filterMock;
-    }
-
     /**
      * @return array
      */
diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
@@ -230,7 +230,7 @@
             <settings>
                 <timezone>false</timezone>
                 <dateFormat>MMM d, y</dateFormat>
-                <skipTime>true</skipTime>
+                <skipTimeZoneConversion>true</skipTimeZoneConversion>
                 <filter>dateRange</filter>
                 <dataType>date</dataType>
                 <label translate="true">Date of Birth</label>
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Date.php b/app/code/Magento/Ui/Component/Filters/Type/Date.php
@@ -79,26 +79,30 @@ protected function applyFilter()
             }
 
             if (is_array($value)) {
-                $dateFrom = null;
-                $dateTo = null;
-
                 if (isset($value['from'])) {
-                    $dateFrom = $this->wrappedComponent->convertDate($value['from']);
-                    if ($this->getData('config/skipTime')) {
-                        $dateFrom->setTime(0, 0, 0);
-                    }
-                    $this->applyFilterByType('gteq', $dateFrom);
+                    $this->applyFilterByType(
+                        'gteq',
+                        $this->wrappedComponent->convertDate(
+                            $value['from'],
+                            0,
+                            0,
+                            0,
+                            !$this->getData('config/skipTimeZoneConversion')
+                        )
+                    );
                 }
 
                 if (isset($value['to'])) {
-                    $dateTo = $this->wrappedComponent->convertDate($value['to']);
-                    if ($this->getData('config/skipTime')) {
-                        $dateTo->setTime(0, 0, 0);
-                    }
-                    if ($dateFrom == $dateTo) {
-                        $dateTo->setTime(23, 59, 59);
-                    }
-                    $this->applyFilterByType('lteq', $dateTo);
+                    $this->applyFilterByType(
+                        'lteq',
+                        $this->wrappedComponent->convertDate(
+                            $value['to'],
+                            23,
+                            59,
+                            59,
+                            !$this->getData('config/skipTimeZoneConversion')
+                        )
+                    );
                 }
             } else {
                 $this->applyFilterByType('eq', $this->wrappedComponent->convertDate($value));
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
@@ -31,6 +31,11 @@ class Date extends AbstractDataType
      */
     protected $wrappedComponent;
 
+    /**
+     * @var TimezoneInterface
+     */
+    private $localeDate;
+
     /**
      * Constructor
      *
@@ -97,9 +102,13 @@ public function getComponentName()
      * Convert given date to default (UTC) timezone
      *
      * @param int $date
+     * @param int $hour
+     * @param int $minute
+     * @param int $second
+     * @param bool $setUtcTimeZone
      * @return \DateTime|null
      */
-    public function convertDate($date)
+    public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcTimeZone = true)
     {
         try {
             $dateObj = $this->localeDate->date(
@@ -110,8 +119,11 @@ public function convertDate($date)
                 $this->getLocale(),
                 true
             );
+            $dateObj->setTime($hour, $minute, $second);
             //convert store date to default date in UTC timezone without DST
-            $dateObj->setTimezone(new \DateTimeZone('UTC'));
+            if ($setUtcTimeZone) {
+                $dateObj->setTimezone(new \DateTimeZone('UTC'));
+            }
             return $dateObj;
         } catch (\Exception $e) {
             return null;
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php
@@ -126,30 +126,6 @@ public function testPrepare($name, $filterData, $expectedCondition)
 
         if ($expectedCondition !== null) {
             $this->processFilters($name, $filterData, $expectedCondition, $uiComponent);
-        } else {
-            $uiComponent->method('convertDate')
-                ->willReturnMap([
-                    [$filterData[$name]['from'], new \DateTime($filterData[$name]['from'])],
-                    [$filterData[$name]['to'], new \DateTime($filterData[$name]['to'] . ' 23:59:59')],
-                ]);
-
-            $this->filterBuilderMock->expects(static::exactly(2))
-                ->method('setConditionType')
-                ->willReturnSelf();
-            $this->filterBuilderMock->expects(static::exactly(2))
-                ->method('setField')
-                ->willReturnSelf();
-            $this->filterBuilderMock->expects(static::exactly(2))
-                ->method('setValue')
-                ->willReturnSelf();
-
-            $filterMock = $this->getMock(Filter::class);
-            $this->filterBuilderMock->expects(static::exactly(2))
-                ->method('create')
-                ->willReturn($filterMock);
-            $this->dataProviderMock->expects(static::exactly(2))
-                ->method('addFilter')
-                ->with($filterMock);
         }
 
         $this->uiComponentFactory->expects($this->any())
@@ -252,10 +228,12 @@ private function processFilters($name, $filterData, $expectedCondition, $uiCompo
                 ->with($filterData[$name])
                 ->willReturn(new \DateTime($filterData[$name]));
         } else {
+            $from = new \DateTime($filterData[$name]['from']);
+            $to = new \DateTime($filterData[$name]['to'] . ' 23:59:59');
             $uiComponent->method('convertDate')
                 ->willReturnMap([
-                    [$filterData[$name]['from'], new \DateTime($filterData[$name]['from'])],
-                    [$filterData[$name]['to'], new \DateTime($filterData[$name]['to'] . ' 23:59:59')],
+                    [$filterData[$name]['from'], 0, 0, 0, true, $from],
+                    [$filterData[$name]['to'], 23, 59, 59, true, $to],
                 ]);
         }
 
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
@@ -128,7 +128,7 @@
                     <item name="dateFormat" type="string" xsi:type="xpath">settings/dateFormat</item>
                     <item name="timeFormat" type="string" xsi:type="xpath">settings/timeFormat</item>
                     <item name="timezone" type="string" xsi:type="xpath">settings/timezone</item>
-                    <item name="skipTime" type="boolean" xsi:type="xpath">settings/skipTime</item>
+                    <item name="skipTimeZoneConversion" type="boolean" xsi:type="xpath">settings/skipTimeZoneConversion</item>
                     <item name="editor" xsi:type="array">
                         <item name="editorType" type="string" xsi:type="xpath">settings/editor/editorType</item>
                         <item name="validation" type="item" xsi:type="converter">settings/editor/validation</item>
@@ -240,7 +240,7 @@
                     <item name="showsTime" type="boolean" xsi:type="xpath">settings/showsTime</item>
                     <item name="dateFormat" type="string" xsi:type="xpath">settings/dateFormat</item>
                     <item name="timeFormat" type="string" xsi:type="xpath">settings/timeFormat</item>
-                    <item name="skipTime" type="string" xsi:type="xpath">settings/skipTime</item>
+                    <item name="skipTimeZoneConversion" type="string" xsi:type="xpath">settings/skipTimeZoneConversion</item>
                 </item>
             </argument>
         </schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/column.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/column.xsd
@@ -98,7 +98,7 @@
                 </xs:annotation>
             </xs:element>
             <xs:element name="timeFormat" type="xs:string"/>
-            <xs:element name="skipTime" type="xs:boolean">
+            <xs:element name="skipTimeZoneConversion" type="xs:boolean">
                 <xs:annotation>
                     <xs:documentation>
                         For the Date column: If time not important for filtering.
