Skip to content

Commit 25399c7

Browse files
committed
MC-13732: Mainline test failure Magento\Reports\Test\TestCase\SalesOrderReportEntityTest
1 parent 85f74ab commit 25399c7

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

app/code/Magento/Reports/Helper/Data.php

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,17 @@ public function getIntervals($from, $to, $period = self::REPORT_PERIOD_TYPE_DAY)
6363
$dateEnd = new \DateTime($to);
6464
$dateFormat = 'Y-m-d';
6565
$dateInterval = new \DateInterval('P1D');
66+
switch ($period) {
67+
case self::REPORT_PERIOD_TYPE_MONTH:
68+
$dateFormat = 'Y-m';
69+
$dateInterval = new \DateInterval('P1M');
70+
break;
71+
case self::REPORT_PERIOD_TYPE_YEAR:
72+
$dateFormat = 'Y';
73+
$dateInterval = new \DateInterval('P1Y');
74+
break;
75+
}
6676
while ($dateStart->diff($dateEnd)->invert == 0) {
67-
switch ($period) {
68-
case self::REPORT_PERIOD_TYPE_DAY:
69-
break;
70-
case self::REPORT_PERIOD_TYPE_MONTH:
71-
$dateFormat = 'Y-m';
72-
$dateInterval = new \DateInterval('P1M');
73-
break;
74-
case self::REPORT_PERIOD_TYPE_YEAR:
75-
$dateFormat = 'Y';
76-
$dateInterval = new \DateInterval('P1Y');
77-
break;
78-
}
7977
$intervals[] = $dateStart->format($dateFormat);
8078
$dateStart->add($dateInterval);
8179
}

0 commit comments

Comments
 (0)