Skip to content

Commit 3525596

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-65736' into MAGETWO-65736
2 parents 44919a2 + 0c8e157 commit 3525596

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -143,38 +143,38 @@ public function intervalsDataProvider()
143143
return [
144144
[
145145
'_period' => 'day',
146-
'_from' => new \DateTime('-3 day'),
147-
'_to' => new \DateTime('+3 day'),
146+
'_from' => new \DateTime('-3 day', new \DateTimeZone('UTC')),
147+
'_to' => new \DateTime('+3 day', new \DateTimeZone('UTC')),
148148
'size' => 7
149149
],
150150
[
151151
'_period' => 'month',
152-
'_from' => new \DateTime('2015-01-15 11:11:11'),
153-
'_to' => new \DateTime('2015-01-25 11:11:11'),
152+
'_from' => new \DateTime('2015-01-15 11:11:11', new \DateTimeZone('UTC')),
153+
'_to' => new \DateTime('2015-01-25 11:11:11', new \DateTimeZone('UTC')),
154154
'size' => 1
155155
],
156156
[
157157
'_period' => 'month',
158-
'_from' => new \DateTime('2015-01-15 11:11:11'),
159-
'_to' => new \DateTime('2015-02-25 11:11:11'),
158+
'_from' => new \DateTime('2015-01-15 11:11:11', new \DateTimeZone('UTC')),
159+
'_to' => new \DateTime('2015-02-25 11:11:11', new \DateTimeZone('UTC')),
160160
'size' => 2
161161
],
162162
[
163163
'_period' => 'year',
164-
'_from' => new \DateTime('2015-01-15 11:11:11'),
165-
'_to' => new \DateTime('2015-01-25 11:11:11'),
164+
'_from' => new \DateTime('2015-01-15 11:11:11', new \DateTimeZone('UTC')),
165+
'_to' => new \DateTime('2015-01-25 11:11:11', new \DateTimeZone('UTC')),
166166
'size' => 1
167167
],
168168
[
169169
'_period' => 'year',
170-
'_from' => new \DateTime('2014-01-15 11:11:11'),
171-
'_to' => new \DateTime('2015-01-25 11:11:11'),
170+
'_from' => new \DateTime('2014-01-15 11:11:11', new \DateTimeZone('UTC')),
171+
'_to' => new \DateTime('2015-01-25 11:11:11', new \DateTimeZone('UTC')),
172172
'size' => 2
173173
],
174174
[
175175
'_period' => null,
176-
'_from' => new \DateTime('-3 day'),
177-
'_to' => new \DateTime('+3 day'),
176+
'_from' => new \DateTime('-3 day', new \DateTimeZone('UTC')),
177+
'_to' => new \DateTime('+3 day', new \DateTimeZone('UTC')),
178178
'size' => 0
179179
]
180180
];
@@ -183,9 +183,6 @@ public function intervalsDataProvider()
183183
/**
184184
* Format datetime.
185185
*
186-
* Force Standard Time to eliminate DateTime "Daylight Saving Time problem"
187-
* https://bugs.php.net/bug.php?id=71913&edit=1
188-
*
189186
* @return string
190187
*/
191188
public function formatDateTime()
@@ -201,6 +198,6 @@ public function formatDateTime()
201198
new \DateTimeZone('America/Los_Angeles')
202199
);
203200

204-
return $formatter->format($dateStart) . ' ST';
201+
return $formatter->format($dateStart);
205202
}
206203
}

0 commit comments

Comments
 (0)