Use the original MACRO but add comment

Author: LamentXU123

ext/intl/calendar/calendar_methods.cpp

@@ -427,18 +427,10 @@ U_CFUNC PHP_METHOD(IntlCalendar, setDate)
 		RETURN_THROWS();
 	}
 
-	if (UNEXPECTED(year < INT32_MIN || year > INT32_MAX)) {
-		zend_argument_value_error(1, "must be between %d and %d", INT32_MIN, INT32_MAX);
-		RETURN_THROWS();
-	}
-	if (UNEXPECTED(month < INT32_MIN || month > INT32_MAX)) {
-		zend_argument_value_error(2, "must be between %d and %d", INT32_MIN, INT32_MAX);
-		RETURN_THROWS();
-	}
-	if (UNEXPECTED(day < INT32_MIN || day > INT32_MAX)) {
-		zend_argument_value_error(3, "must be between %d and %d", INT32_MIN, INT32_MAX);
-		RETURN_THROWS();
-	}
+	/* These method-only APIs parse the object first, so the API argument positions are offset by +1. */
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(year, 2);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(month, 3);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(day, 4);
 
 	CALENDAR_METHOD_FETCH_OBJECT;
 
@@ -459,36 +451,19 @@ U_CFUNC PHP_METHOD(IntlCalendar, setDateTime)
 		RETURN_THROWS();
 	}
 
-	if (UNEXPECTED(year < INT32_MIN || year > INT32_MAX)) {
-		zend_argument_value_error(1, "must be between %d and %d", INT32_MIN, INT32_MAX);
-		RETURN_THROWS();
-	}
-	if (UNEXPECTED(month < INT32_MIN || month > INT32_MAX)) {
-		zend_argument_value_error(2, "must be between %d and %d", INT32_MIN, INT32_MAX);
-		RETURN_THROWS();
-	}
-	if (UNEXPECTED(day < INT32_MIN || day > INT32_MAX)) {
-		zend_argument_value_error(3, "must be between %d and %d", INT32_MIN, INT32_MAX);
-		RETURN_THROWS();
-	}
-	if (UNEXPECTED(hour < INT32_MIN || hour > INT32_MAX)) {
-		zend_argument_value_error(4, "must be between %d and %d", INT32_MIN, INT32_MAX);
-		RETURN_THROWS();
-	}
-	if (UNEXPECTED(minute < INT32_MIN || minute > INT32_MAX)) {
-		zend_argument_value_error(5, "must be between %d and %d", INT32_MIN, INT32_MAX);
-		RETURN_THROWS();
-	}
+	/* These method-only APIs parse the object first, so the API argument positions are offset by +1. */
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(year, 2);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(month, 3);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(day, 4);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(hour, 5);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(minute, 6);
 
 	CALENDAR_METHOD_FETCH_OBJECT;
 
 	if (second_is_null) {
 		co->ucal->set((int32_t) year, (int32_t) month, (int32_t) day, (int32_t) hour, (int32_t) minute);
 	} else {
-		if (UNEXPECTED(second < INT32_MIN || second > INT32_MAX)) {
-			zend_argument_value_error(6, "must be between %d and %d", INT32_MIN, INT32_MAX);
-			RETURN_THROWS();
-		}
+		ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(second, 7);
 		co->ucal->set((int32_t) year, (int32_t) month, (int32_t) day, (int32_t) hour, (int32_t) minute, (int32_t) second);
 	}
 }