1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  intl: Fix tests for icu update
This commit is contained in:
Niels Dossche
2025-12-02 20:59:41 +01:00
2 changed files with 6 additions and 6 deletions

View File

@@ -29,5 +29,5 @@ echo "msgf2: ", $msgf->format(array($time, 'date')), " ",
*/
?>
--EXPECT--
quinta-feira, 17 de maio de 2012 5:35:36 da tarde ptlis
--EXPECTF--
quinta-feira, 17 de maio de 2012 5:35:36 %r(da tarde|p.m.)%r ptlis

View File

@@ -23,12 +23,12 @@ var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT_COMMONLY_USED))
var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_GENERIC_LOCATION));
?>
--EXPECT--
string(3) "GMT"
--EXPECTF--
string(%d) "%r(GMT|GMT\+0)%r"
string(30) "Western European Standard Time"
string(13) "Portugal Time"
string(21) "Western European Time"
string(5) "+0000"
string(3) "GMT"
string(3) "GMT"
string(%d) "%r(GMT|GMT\+00:00)%r"
string(%d) "%r(GMT|GMT\+0)%r"
string(13) "Portugal Time"