Skip to content

Commit c3350cf

Browse files
Merge remote-tracking branch 'origin/master'
2 parents 1559c7d + 184d998 commit c3350cf

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
--- Stdlib/DateTime/Timezone.php 2020-01-10 06:20:44.000000000 +0300
2+
+++ Stdlib/DateTime/Timezone.php 2020-04-24 16:15:48.463605858 +0300
3+
@@ -206,25 +206,9 @@
4+
case ($date instanceof \DateTimeImmutable):
5+
$date = $date->setTimezone($timezone);
6+
break;
7+
- case (!is_numeric($date)):
8+
- $timeType = $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE;
9+
- $formatter = new \IntlDateFormatter(
10+
- $this->_localeResolver->getLocale(),
11+
- \IntlDateFormatter::SHORT,
12+
- $timeType,
13+
- $timezone
14+
- );
15+
- $timestamp = $formatter->parse($date);
16+
- $date = $timestamp
17+
- ? (new \DateTime('@' . $timestamp))->setTimezone($timezone)
18+
- : new \DateTime($date, $timezone);
19+
- break;
20+
- case (is_numeric($date)):
21+
- $date = new \DateTime('@' . $date);
22+
- $date = $date->setTimezone($timezone);
23+
- break;
24+
default:
25+
- $date = new \DateTime($date, $timezone);
26+
+ $date = new \DateTime(is_numeric($date) ? '@' . $date : $date);
27+
+ $date->setTimezone($timezone);
28+
break;
29+
}

0 commit comments

Comments
 (0)