Fix intlcal_roll

Author: kocsismate

Zend/tests/arginfo_zpp_mismatch.phpt

@@ -3,20 +3,14 @@ Test that there is no arginfo/zpp mismatch
 --FILE--
 <?php
 
-set_error_handler(
-    function (string $code, string $message) {
-        return true;
-    },
-    E_NOTICE | E_WARNING
-);
-
 foreach (get_defined_functions()["internal"] as $function) {
     try {
-        $function(null, null, null, null, null, null, null, null);
+        @$function(null, null, null, null, null, null, null, null);
     } catch (ArgumentCountError|Error) {
     }
 }
 
+// var_dump() and debug_zval_dump() print all arguments
 ?>
 --EXPECT--
 NULL

ext/intl/calendar/calendar_methods.cpp

@@ -427,57 +427,34 @@ U_CFUNC PHP_FUNCTION(intlcal_set)
 
 U_CFUNC PHP_FUNCTION(intlcal_roll)
 {
-	zend_long		field,
-				value;
-	zval		args_a[3]		 = {0},
-				*args			 = args_a;
-	zend_bool	bool_variant_val = (zend_bool)-1;
+	zval *zvalue;
+	zend_long field, value;
 	CALENDAR_METHOD_INIT_VARS;
 
-	object = getThis();
-
-	if (ZEND_NUM_ARGS() > (object ? 2 :3) ||
-			zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intlcal_set: too many arguments", 0);
-		RETURN_FALSE;
-	}
-	if (!object) {
-		args++;
-	}
-	if (!Z_ISUNDEF(args[1]) && (Z_TYPE(args[1]) == IS_TRUE || Z_TYPE(args[1]) == IS_FALSE)) {
-		if (zend_parse_method_parameters(ZEND_NUM_ARGS(), object,
-				"Olb", &object, Calendar_ce_ptr, &field, &bool_variant_val)
-				== FAILURE) {
-			RETURN_THROWS();
-		}
-		bool_variant_val = Z_TYPE(args[1]) == IS_TRUE? 1 : 0;
-	} else if (zend_parse_method_parameters(ZEND_NUM_ARGS(), object,
-			"Oll", &object, Calendar_ce_ptr, &field, &value) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Olz", &object, Calendar_ce_ptr, &field, &zvalue) == FAILURE) {
 		RETURN_THROWS();
 	}
 
+	CALENDAR_METHOD_FETCH_OBJECT;
+
 	if (field < 0 || field >= UCAL_FIELD_COUNT) {
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intlcal_roll: invalid field", 0);
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "intlcal_roll: invalid field", 0);
 		RETURN_FALSE;
 	}
-	if (bool_variant_val == (zend_bool)-1 &&
-			(value < INT32_MIN || value > INT32_MAX)) {
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"intlcal_roll: value out of bounds", 0);
-		RETURN_FALSE;
-	}
-
-	CALENDAR_METHOD_FETCH_OBJECT;
 
-	if (bool_variant_val != (zend_bool)-1) {
-		co->ucal->roll((UCalendarDateFields)field, (UBool)bool_variant_val,
-			CALENDAR_ERROR_CODE(co));
+	if (Z_TYPE_P(zvalue) == IS_FALSE || Z_TYPE_P(zvalue) == IS_TRUE) {
+		co->ucal->roll((UCalendarDateFields)field, (UBool) (Z_TYPE_P(zvalue) == IS_TRUE), CALENDAR_ERROR_CODE(co));
 	} else {
-		co->ucal->roll((UCalendarDateFields)field, (int32_t)value,
-			CALENDAR_ERROR_CODE(co));
+		value = zval_get_long(zvalue);
+
+		if (value < INT32_MIN || value > INT32_MAX) {
+			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "intlcal_roll: value out of bounds", 0);
+			RETURN_FALSE;
+		}
+
+		co->ucal->roll((UCalendarDateFields)field, (int32_t)value, CALENDAR_ERROR_CODE(co));
 	}
+
 	INTL_METHOD_CHECK_STATUS(co, "intlcal_roll: Error calling ICU Calendar::roll");
 
 	RETURN_TRUE;