From c370ad8a2cab7ec920cece3113db54bace0d8fae Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Wed, 6 Aug 2025 21:34:17 +0100
Subject: [PATCH 1/2] ext/intl: better errors for
 IntlTimeZone::createTimeZoneIDEnumeration

And convert those to ValueErrors directly as they are bugs
---
 ...zone_createTimeZoneIDEnumeration_error.phpt | 18 +++++++++++++-----
 ext/intl/timezone/timezone_methods.cpp         | 14 +++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
index 2173c4a5cd12a..b8a07e34e93f9 100644
--- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
+++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
@@ -4,10 +4,18 @@ IntlTimeZone::createTimeZoneIDEnumeration(): errors
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
 
-var_dump(IntlTimeZone::createTimeZoneIDEnumeration(-1));
+try {
+	var_dump(IntlTimeZone::createTimeZoneIDEnumeration(-1));
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+	var_dump(IntlTimeZone::createTimeZoneIDEnumeration(IntlTimeZone::TYPE_ANY, '', PHP_INT_MAX));
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 ?>
---EXPECTF--
-Warning: IntlTimeZone::createTimeZoneIDEnumeration(): bad zone type in %s on line %d
-bool(false)
+--EXPECT--
+ValueError: IntlTimeZone::createTimeZoneIDEnumeration(): Argument #1 ($type) must be one of IntlTimeZone::TYPE_ANY, IntlTimeZone::TYPE_CANONICAL, or IntlTimeZone::TYPE_CANONICAL_LOCATION
+ValueError: IntlTimeZone::createTimeZoneIDEnumeration(): Argument #1 ($type) must be between -2147483648 and 2147483647
diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp
index d01bdadd743d5..3fdfbb9ac8074 100644
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@ -229,17 +229,17 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
 
 	if (zoneType != UCAL_ZONE_TYPE_ANY && zoneType != UCAL_ZONE_TYPE_CANONICAL
 			&& zoneType != UCAL_ZONE_TYPE_CANONICAL_LOCATION) {
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "bad zone type");
-		RETURN_FALSE;
+		zend_argument_value_error(1, "must be one of IntlTimeZone::TYPE_ANY,"
+			" IntlTimeZone::TYPE_CANONICAL, or IntlTimeZone::TYPE_CANONICAL_LOCATION");
+		RETURN_THROWS();
 	}
 
 	if (!arg3isnull) {
-		if (UNEXPECTED(offset_arg < (zend_long)INT32_MIN || offset_arg > (zend_long)INT32_MAX)) {
-			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-				"offset out of bounds");
-			RETURN_FALSE;
+		if (UNEXPECTED(ZEND_LONG_EXCEEDS_INT(offset_arg))) {
+			zend_argument_value_error(1, "must be between %d and %d", INT32_MIN, INT32_MAX);
+			RETURN_THROWS();
 		}
-		offset = (int32_t)offset_arg;
+		offset = static_cast<int32_t>(offset_arg);
 		offsetp = &offset;
 	} //else leave offsetp NULL
 

From ae0a0f5cbc14f001b0548f04fc44b9357e57caf8 Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Wed, 6 Aug 2025 22:33:54 +0100
Subject: [PATCH 2/2] 64 bit split

---
 ...ezone_createTimeZoneIDEnumeration_error.phpt |  9 ++-------
 ...createTimeZoneIDEnumeration_error_64bit.phpt | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 ext/intl/tests/timezone_createTimeZoneIDEnumeration_error_64bit.phpt

diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
index b8a07e34e93f9..0eb26b826a347 100644
--- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
+++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-IntlTimeZone::createTimeZoneIDEnumeration(): errors
+IntlTimeZone::createTimeZoneIDEnumeration() invalid zone type
 --EXTENSIONS--
 intl
 --FILE--
@@ -10,12 +10,7 @@ try {
 } catch (Throwable $e) {
 	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
-try {
-	var_dump(IntlTimeZone::createTimeZoneIDEnumeration(IntlTimeZone::TYPE_ANY, '', PHP_INT_MAX));
-} catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
-}
+
 ?>
 --EXPECT--
 ValueError: IntlTimeZone::createTimeZoneIDEnumeration(): Argument #1 ($type) must be one of IntlTimeZone::TYPE_ANY, IntlTimeZone::TYPE_CANONICAL, or IntlTimeZone::TYPE_CANONICAL_LOCATION
-ValueError: IntlTimeZone::createTimeZoneIDEnumeration(): Argument #1 ($type) must be between -2147483648 and 2147483647
diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error_64bit.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error_64bit.phpt
new file mode 100644
index 0000000000000..62e68938ae845
--- /dev/null
+++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error_64bit.phpt
@@ -0,0 +1,17 @@
+--TEST--
+IntlTimeZone::createTimeZoneIDEnumeration() offset out of range
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
+--FILE--
+<?php
+
+try {
+	var_dump(IntlTimeZone::createTimeZoneIDEnumeration(IntlTimeZone::TYPE_ANY, '', PHP_INT_MAX));
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+?>
+--EXPECT--
+ValueError: IntlTimeZone::createTimeZoneIDEnumeration(): Argument #1 ($type) must be between -2147483648 and 2147483647