Skip to content

Commit cfe8f4e

Browse files
author
Bohdan Korablov
committed
MAGETWO-94196: [2.1] The fix of incorrect date format was lost since 2.1.13
1 parent 3dc4200 commit cfe8f4e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

dev/tests/integration/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected function setUp()
2626
}
2727

2828
/**
29-
* @magentoDbIsolation disabled
29+
* @magentoDbIsolation enabled
3030
* @magentoDataFixture Magento/Customer/_files/date_attribute.php
3131
* @magentoDataFixture Magento/Customer/_files/customer_date_attribute.php
3232
*/

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
192192
* @param bool $includeTime
193193
* @return string
194194
*/
195-
private function prepareDate(string $date, string $locale, string $timezone, bool $includeTime) : string
195+
private function prepareDate(string $date, string $locale, string $timezone, bool $includeTime)
196196
{
197197
$timeType = $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE;
198198
$formatter = new \IntlDateFormatter(
@@ -360,11 +360,11 @@ public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
360360
* @param string $date
361361
* @return string
362362
*/
363-
private function appendTimeIfNeeded(string $date) : string
363+
private function appendTimeIfNeeded(string $date)
364364
{
365365
if (!preg_match('/\d{1,2}:\d{2}/', $date)) {
366366
$date .= " 00:00";
367367
}
368368
return $date;
369369
}
370-
}
370+
}

0 commit comments

Comments
 (0)