Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  intl: Fix tests for icu update

Author: ndossche

ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt

@@ -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

ext/intl/tests/timezone_getDisplayName_variant4.phpt

@@ -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"