Commit 78e3d05d7de for php.net
commit 78e3d05d7de3ed3ebcee07d7ca44dd34951c9ca2
Merge: 0d578407230 4b63315ad59
Author: Niels Dossche <7771979+ndossche@users.noreply.github.com>
Date: Tue Dec 2 21:00:13 2025 +0100
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
intl: Fix tests for icu update
diff --cc ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt
index e14d30337b7,f434985cd08..68ed3a45b51
--- a/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt
+++ b/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt
@@@ -30,5 -30,4 +30,5 @@@ echo "msgf2: ", $msgf->format(array($ti
?>
--EXPECTF--
+Deprecated: Calling IntlGregorianCalendar::__construct() with more than 2 arguments is deprecated, use either IntlGregorianCalendar::createFromDate() or IntlGregorianCalendar::createFromDateTime() instead in %s on line %d
- quinta-feira, 17 de maio de 2012 5:35:36 da tarde ptlis
+ quinta-feira, 17 de maio de 2012 5:35:36 %r(da tarde|p.m.)%r ptlis