From afe8e2cdff73fc92549381324151e9e7acdeba9b Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sun, 2 Feb 2025 11:21:45 +0100 Subject: [PATCH] Relax timezone_IDforWindowsID_basic2.phpt expectations Apparently, some ICU versions report "America/Los_Angeles" for the `ZZ` case, what matches the behavior of ICU 76.1 (on Windows). Possibly, there has been some bug fix backport on some systems. Anyhow, either seems fine, so we're not picky about that. Closes GH-17669. --- ext/intl/tests/timezone_IDforWindowsID_basic2.phpt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt index aeb9b168991..2b8f223dad8 100644 --- a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt +++ b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt @@ -24,7 +24,7 @@ foreach ($tzs as $tz => $regions) { } } ?> ---EXPECT-- +--EXPECTF-- ** Gnomeregan bool(false) Error: intltz_get_windows_id: Unknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR @@ -35,7 +35,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"