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:
  Relax timezone_IDforWindowsID_basic2.phpt expectations
This commit is contained in:
Christoph M. Becker
2025-02-02 13:37:21 +01:00

View File

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