[Intl] fix bad merge

nicolas-grekas · nicolas-grekas · commit cf40e74a9547 · 2021-05-27T08:39:54.000+02:00
diff --git a/DateFormatter/IntlDateFormatter.php b/DateFormatter/IntlDateFormatter.php
@@ -585,7 +585,7 @@ public function setTimeZone($timeZone)
      *
      * @return \DateTime
      */
-    protected function createDateTime(int $timestamp)
+    protected function createDateTime(string $timestamp)
     {
         $dateTime = \DateTime::createFromFormat('U', $timestamp);
         $dateTime->setTimezone($this->dateTimeZone);

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ public function setTimeZone($timeZone)`
`585`	`585`	`*`
`586`	`586`	`* @return \DateTime`
`587`	`587`	`*/`
`588`		`- protected function createDateTime(int $timestamp)`
	`588`	`+ protected function createDateTime(string $timestamp)`
`589`	`589`	`{`
`590`	`590`	`$dateTime = \DateTime::createFromFormat('U', $timestamp);`
`591`	`591`	`$dateTime->setTimezone($this->dateTimeZone);`