mirror of
https://github.com/php/php-src.git
synced 2025-08-15 13:38:49 +02:00
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Relax timezone_IDforWindowsID_basic2.phpt expectations
This commit is contained in:
commit
59ed63732f
1 changed files with 2 additions and 2 deletions
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue