Merge branch 'PHP-8.4'

* PHP-8.4:
  Relax timezone_IDforWindowsID_basic2.phpt expectations
This commit is contained in:
Christoph M. Becker 2025-02-02 13:39:13 +01:00
commit 5f7a9ee97e
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6

View file

@ -25,7 +25,7 @@ foreach ($tzs as $tz => $regions) {
}
}
?>
--EXPECT--
--EXPECTF--
** Gnomeregan
bool(false)
Error: 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"