Merge remote-tracking branch 'tango/MC-18248' into PR-07-24-1

Author: dhorytskyi

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

@@ -172,9 +172,8 @@ protected function _prepareCollection()
                  * Validate from and to date
                  */
                 try {
-                    $from = $this->_localeDate->date($this->getFilter('report_from'), null, false, false);
-                    $to = $this->_localeDate->date($this->getFilter('report_to'), null, false, false);
-
+                    $from = $this->_localeDate->date($this->getFilter('report_from'), null, true, false);
+                    $to = $this->_localeDate->date($this->getFilter('report_to'), null, true, false);
                     $collection->setInterval($from, $to);
                 } catch (\Exception $e) {
                     $this->_errors[] = __('Invalid date specified');

app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php

@@ -20,14 +20,14 @@ class Collection extends \Magento\Framework\Data\Collection
     /**
      * From value
      *
-     * @var \DateTime
+     * @var \DateTimeInterface
      */
     protected $_from;
 
     /**
      * To value
      *
-     * @var \DateTime
+     * @var \DateTimeInterface
      */
     protected $_to;
 
@@ -121,8 +121,8 @@ public function setPeriod($period)
      */
     public function setInterval(\DateTimeInterface $fromDate, \DateTimeInterface $toDate)
     {
-        $this->_from = new \DateTime($fromDate->format('Y-m-d'), $fromDate->getTimezone());
-        $this->_to = new \DateTime($toDate->format('Y-m-d'), $toDate->getTimezone());
+        $this->_from = $fromDate;
+        $this->_to = $toDate;
 
         return $this;
     }
@@ -139,8 +139,8 @@ protected function _getIntervals()
             if (!$this->_from && !$this->_to) {
                 return $this->_intervals;
             }
-            $dateStart = $this->_from;
-            $dateEnd = $this->_to;
+            $dateStart = new \DateTime($this->_from->format('Y-m-d'), $this->_from->getTimezone());
+            $dateEnd = new \DateTime($this->_to->format('Y-m-d'), $this->_to->getTimezone());
 
             $firstInterval = true;
             while ($dateStart <= $dateEnd) {
@@ -175,11 +175,7 @@ protected function _getIntervals()
     protected function _getDayInterval(\DateTime $dateStart)
     {
         $interval = [
-            'period' => $this->_localeDate->formatDateTime(
-                $dateStart,
-                \IntlDateFormatter::SHORT,
-                \IntlDateFormatter::NONE
-            ),
+            'period' => $this->_localeDate->formatDate($dateStart, \IntlDateFormatter::SHORT),
             'start' => $this->_localeDate->convertConfigTimeToUtc($dateStart->format('Y-m-d 00:00:00')),
             'end' => $this->_localeDate->convertConfigTimeToUtc($dateStart->format('Y-m-d 23:59:59')),
         ];

app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/CollectionTest.php

@@ -6,49 +6,49 @@
 
 namespace Magento\Reports\Test\Unit\Model\ResourceModel\Report;
 
+use Magento\Framework\Data\Collection\EntityFactory;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Reports\Model\ResourceModel\Report\Collection;
+use Magento\Reports\Model\ResourceModel\Report\Collection\Factory as ReportCollectionFactory;
 
+/**
+ * Class CollectionTest
+ *
+ * @covers \Magento\Reports\Model\ResourceModel\Report\Collection
+ */
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Reports\Model\ResourceModel\Report\Collection
+     * @var Collection
      */
     protected $collection;
 
     /**
-     * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var EntityFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $entityFactoryMock;
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $timezoneMock;
 
     /**
-     * @var \Magento\Reports\Model\ResourceModel\Report\Collection\Factory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ReportCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $factoryMock;
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     protected function setUp()
     {
-        $this->entityFactoryMock = $this->getMockBuilder(\Magento\Framework\Data\Collection\EntityFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->timezoneMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
-            ->getMock();
-        $this->factoryMock = $this->getMockBuilder(
-            \Magento\Reports\Model\ResourceModel\Report\Collection\Factory::class
-        )->disableOriginalConstructor()
-            ->getMock();
-
-        $this->timezoneMock
-            ->expects($this->any())
-            ->method('formatDateTime')
-            ->will($this->returnCallback([$this, 'formatDateTime']));
+        $this->entityFactoryMock = $this->createMock(EntityFactory::class);
+        $this->timezoneMock = $this->createMock(TimezoneInterface::class);
+        $this->factoryMock = $this->createMock(ReportCollectionFactory::class);
+
+        $this->timezoneMock->method('formatDate')
+            ->will($this->returnCallback([$this, 'formatDate']));
 
         $this->collection = new Collection(
             $this->entityFactoryMock,
@@ -131,7 +131,7 @@ public function testGetReports($period, $fromDate, $toDate, $size)
     public function testLoadData()
     {
         $this->assertInstanceOf(
-            \Magento\Reports\Model\ResourceModel\Report\Collection::class,
+            Collection::class,
             $this->collection->loadData()
         );
     }
@@ -182,14 +182,11 @@ public function intervalsDataProvider()
     }
 
     /**
+     * @param \DateTimeInterface $dateStart
      * @return string
      */
-    public function formatDateTime()
+    public function formatDate(\DateTimeInterface $dateStart): string
     {
-        $args = func_get_args();
-
-        $dateStart = $args[0];
-
         $formatter = new \IntlDateFormatter(
             "en_US",
             \IntlDateFormatter::SHORT,