Make notice in timezone_identifiers_list() into a ValueError

Author: Girgias

ext/date/php_date.c

@@ -4358,9 +4358,9 @@ PHP_FUNCTION(timezone_identifiers_list)
 
 	/* Extra validation */
 	if (what == PHP_DATE_TIMEZONE_PER_COUNTRY && option_len != 2) {
-		// Promoto to ValueError?
-		php_error_docref(NULL, E_NOTICE, "A two-letter ISO 3166-1 compatible country code is expected");
-		RETURN_FALSE;
+		zend_argument_value_error(2, "must be a two-letter ISO 3166-1 compatible country code "
+			"when argument #1 ($timezoneGroup) is DateTimeZone::PER_COUNTRY");
+		RETURN_THROWS();
 	}
 
 	tzdb = DATE_TIMEZONEDB;

ext/date/php_date.stub.php

@@ -88,7 +88,7 @@ function timezone_transitions_get(
 
 function timezone_location_get(DateTimeZone $object): array|false {}
 
-function timezone_identifiers_list(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array|false {}
+function timezone_identifiers_list(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array {}
 
 function timezone_abbreviations_list(): array {}
 

ext/date/php_date_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d334411c862c9140486ced1c7dffaebd8461a841 */
+ * Stub hash: 88ffa20bdb76b268afd12d1499fa13173045567e */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
@@ -184,7 +184,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_timezone_location_get, 0, 1, MAY
 	ZEND_ARG_OBJ_INFO(0, object, DateTimeZone, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_timezone_identifiers_list, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_timezone_identifiers_list, 0, 0, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timezoneGroup, IS_LONG, 0, "DateTimeZone::ALL")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, countryCode, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()

ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt

@@ -1,15 +1,24 @@
 --TEST--
-timezone_identifiers_list: Test that correct notice is given when timezone_identifiers_list is given 4096 as parameter
+timezone_identifiers_list: ValueError when timezoneGroup is DateTimeZone::PER_COUNTRY
 --CREDITS--
 Havard Eide <nucleuz@gmail.com>
 #PHPTestFest2009 Norway 2009-06-09 \o/
 --INI--
-error_reporting=E_ALL
 date.timezone=UTC
 --FILE--
 <?php
-print_r(timezone_identifiers_list(4096));
+try {
+    var_dump(timezone_identifiers_list(DateTimeZone::PER_COUNTRY));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+try {
+    var_dump(timezone_identifiers_list(DateTimeZone::PER_COUNTRY, 'A'));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 ?>
 --EXPECTF--
-Notice: timezone_identifiers_list(): A two-letter ISO 3166-1 compatible country code is expected in %s on line %d
+timezone_identifiers_list(): Argument #2 ($countryCode) must be a two-letter ISO 3166-1 compatible country code when argument #1 ($timezoneGroup) is DateTimeZone::PER_COUNTRY
+timezone_identifiers_list(): Argument #2 ($countryCode) must be a two-letter ISO 3166-1 compatible country code when argument #1 ($timezoneGroup) is DateTimeZone::PER_COUNTRY