Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Relax timezone_IDforWindowsID_basic2.phpt expectations

Author: cmb69

ext/intl/tests/timezone_IDforWindowsID_basic2.phpt

@@ -25,7 +25,7 @@ foreach ($tzs as $tz => $regions) {
   }
 }
 ?>
---EXPECT--
+--EXPECTF--
 ** Gnomeregan
 bool(false)
 Error: intltz_get_windows_id: Unknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR
@@ -36,7 +36,7 @@ string(19) "America/Los_Angeles"
 string(17) "America/Vancouver"
 string(19) "America/Los_Angeles"
 string(19) "America/Los_Angeles"
-string(7) "PST8PDT"
+string(%d) "%r(PST8PDT|America\/Los_Angeles)%r"
 ** Romance Standard Time
 string(12) "Europe/Paris"
 string(15) "Europe/Brussels"