Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 92a24a5fd108 · 2021-05-27T14:28:50.000+02:00
* 5.2:
  [VarDumper] fix tests
  [Intl] fix bad merge
diff --git a/DateFormatter/IntlDateFormatter.php b/DateFormatter/IntlDateFormatter.php
@@ -587,7 +587,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
`@@ -587,7 +587,7 @@ public function setTimeZone($timeZone)`
`587`	`587`	`*`
`588`	`588`	`* @return \DateTime`
`589`	`589`	`*/`
`590`		`- protected function createDateTime(int $timestamp)`
	`590`	`+ protected function createDateTime(string $timestamp)`
`591`	`591`	`{`
`592`	`592`	`$dateTime = \DateTime::createFromFormat('U', $timestamp);`
`593`	`593`	`$dateTime->setTimezone($this->dateTimeZone);`