Skip to content

Commit e62efe3

Browse files
committed
Merge branch '4.4' into 5.4
* 4.4: Fix global state pollution between tests run with ApplicationTester µcs fix [Intl] Fix the IntlDateFormatter::formatObject signature
2 parents b9e17d7 + 3528370 commit e62efe3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

DateFormatter/IntlDateFormatter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public function format($timestamp)
244244
*
245245
* @throws MethodNotImplementedException
246246
*/
247-
public function formatObject(object $object, $format = null, string $locale = null)
247+
public static function formatObject(object $object, $format = null, string $locale = null)
248248
{
249249
throw new MethodNotImplementedException(__METHOD__);
250250
}

0 commit comments

Comments
 (0)