[Intl] fix bad merge

2021-05-27 08:39:45 +02:00 · 2021-05-27 08:39:45 +02:00 · 536266cea3
commit 536266cea3
parent fff1fdee1f
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
+++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
@ -585,7 +585,7 @@ abstract class IntlDateFormatter
     *
     * @return \DateTime
     */
-    protected function createDateTime(int $timestamp)
+    protected function createDateTime(string $timestamp)
    {
        $dateTime = \DateTime::createFromFormat('U', $timestamp);
        $dateTime->setTimezone($this->dateTimeZone);