Fix code review comments

Author: kocsismate

ext/intl/calendar/calendar.stub.php

@@ -6,7 +6,7 @@ private function __construct() {}
 
     /**
      * @param IntlTimeZone|DateTimeZone|string|null $timeZone
-     * @return IntlGregorianCalendar|null
+     * @return IntlCalendar|null
      */
     public static function createInstance($timeZone = null, ?string $locale = null) {}
 
@@ -175,7 +175,7 @@ public function isLeapYear(int $year) {}
 /** @param IntlTimeZone|DateTimeZone|string|null $timeZone */
 function intlcal_create_instance($timeZone = null, ?string $locale = null): IntlCalendar|null {}
 
-function intlcal_get_keyword_values_for_locale(string $key, string $locale, bool $commonlyUsed): Iterator|false {}
+function intlcal_get_keyword_values_for_locale(string $key, string $locale, bool $commonlyUsed): IntlIterator|false {}
 
 function intlcal_get_now(): float {}
 

ext/intl/calendar/calendar_arginfo.h

@@ -160,7 +160,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlcal_create_instance, 0, 0, In
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_intlcal_get_keyword_values_for_locale, 0, 3, Iterator, MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_intlcal_get_keyword_values_for_locale, 0, 3, IntlIterator, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, commonlyUsed, _IS_BOOL, 0)

ext/intl/calendar/calendar_methods.cpp

@@ -415,7 +415,7 @@ U_CFUNC PHP_FUNCTION(intlcal_set)
 		co->ucal->set((int32_t)args[0], (int32_t)args[1], (int32_t)args[2]);
 	} else if (arg_num == 4) {
 		zend_argument_count_error("No variant with 4 arguments");
-		return;
+		RETURN_THROWS();
 	} else if (arg_num == 5) {
 		co->ucal->set((int32_t)args[0], (int32_t)args[1], (int32_t)args[2], (int32_t)args[3], (int32_t)args[4]);
 	} else {

ext/intl/calendar/gregoriancalendar_methods.cpp

@@ -60,15 +60,15 @@ static void _php_intlgregcal_constructor_body(
 	if (ZEND_NUM_ARGS() > 6 ||
 			zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
 		zend_argument_count_error("Too many arguments");
-		return;
+		RETURN_THROWS();
 	}
 
 	for (variant = ZEND_NUM_ARGS();
 		variant > 0 && Z_TYPE(args[variant - 1]) == IS_NULL;
 		variant--) {}
 	if (variant == 4) {
 		zend_argument_count_error("No variant with 4 arguments (excluding trailing NULLs)");
-		return;
+		RETURN_THROWS();
 	}
 
 	// argument parsing