archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Relax timezone_IDforWindowsID_basic2.phpt expectations
This commit is contained in:
Christoph M. Becker 2025-02-02 13:38:36 +01:00
commit 59ed63732f
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
View file

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