Merge branch 'PHP-8.3' into PHP-8.4

cmb69 · cmb69 · commit 54ae770cd6bc · 2024-11-15T18:57:12.000+01:00
* PHP-8.3:
  Adapt ext/intl tests for ICU 75.1 and 76.1
diff --git a/ext/intl/tests/timezone_IDforWindowsID_basic_icu76_1.phpt b/ext/intl/tests/timezone_IDforWindowsID_basic_icu76_1.phpt
@@ -24,10 +24,10 @@ foreach ($tzs as $tz => $regions) {
   }
 }
 ?>
---EXPECT--
+--EXPECTF--
 ** Gnomeregan
 bool(false)
-Error: unknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR
+Error: %snknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR
 ** India Standard Time
 string(13) "Asia/Calcutta"
 ** Pacific Standard Time

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@ foreach ($tzs as $tz => $regions) {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`?>`
`27`		`---EXPECT--`
	`27`	`+--EXPECTF--`
`28`	`28`	`** Gnomeregan`
`29`	`29`	`bool(false)`
`30`		`-Error: unknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR`
	`30`	`+Error: %snknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR`
`31`	`31`	`** India Standard Time`
`32`	`32`	`string(13) "Asia/Calcutta"`
`33`	`33`	`** Pacific Standard Time`