Implement IntlGregorianCalendar::createFromDate() and IntlGregorianCalendar::createFromDateTime()

kocsismate · kocsismate · commit 1486f52a12fc · 2023-07-18T12:59:21.000+02:00
diff --git a/ext/intl/calendar/calendar.stub.php b/ext/intl/calendar/calendar.stub.php
@@ -488,6 +488,10 @@ public function toDateTime(): DateTime|false {}
 /** @not-serializable */
 class IntlGregorianCalendar extends IntlCalendar
 {
+    public static function createFromDate(int $year, int $month, int $dayOfMonth): static {}
+
+    public static function createFromDateTime(int $year, int $month, int $dayOfMonth, int $hour, int $minute, ?int $second = null): static {}
+
     /**
      * @param DateTimeZone|IntlTimeZone|string|int|null $timezoneOrYear
      * @param string|int|null $localeOrMonth
diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -39,10 +39,45 @@ using icu::Locale;
 using icu::UnicodeString;
 using icu::StringPiece;
 
+#define ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(argument, zpp_arg_position) \
+	if (UNEXPECTED(argument < INT32_MIN || argument > INT32_MAX)) { \
+		zend_argument_value_error(zpp_arg_position, "must be between %d and %d", INT32_MIN, INT32_MAX); \
+		RETURN_THROWS(); \
+	}
+
 static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
 	return (GregorianCalendar*)co->ucal;
 }
 
+static bool set_gregorian_calendar_time_zone(GregorianCalendar *gcal, UErrorCode status)
+{
+	if (U_FAILURE(status)) {
+		intl_error_set(NULL, status,
+			"IntlGregorianCalendar: Error creating ICU GregorianCalendar from date",
+			0
+		);
+
+		return false;
+	}
+
+	timelib_tzinfo *tzinfo = get_timezone_info();
+	UnicodeString tzstr = UnicodeString::fromUTF8(StringPiece(tzinfo->name));
+	if (tzstr.isBogus()) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+		   "IntlGregorianCalendar: Could not create UTF-8 string "
+		   "from PHP's default timezone name (see date_default_timezone_get())",
+		   0
+		);
+
+		return false;
+	}
+
+	TimeZone *tz = TimeZone::createTimeZone(tzstr);
+	gcal->adoptTimeZone(tz);
+
+	return true;
+}
+
 static void _php_intlgregcal_constructor_body(
     INTERNAL_FUNCTION_PARAMETERS, bool is_constructor, zend_error_handling *error_handling, bool *error_handling_replaced)
 {
@@ -135,11 +170,7 @@ static void _php_intlgregcal_constructor_body(
 	} else {
 		// From date/time (3, 5 or 6 arguments)
 		for (int i = 0; i < variant; i++) {
-			if (UNEXPECTED(largs[i] < INT32_MIN || largs[i] > INT32_MAX)) {
-				zend_argument_value_error(getThis() ? (i-1) : i,
-					"must be between %d and %d", INT32_MIN, INT32_MAX);
-				RETURN_THROWS();
-			}
+			ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(largs[i], getThis() ? (i-1) : i);
 		}
 
 		if (variant == 3) {
@@ -152,37 +183,18 @@ static void _php_intlgregcal_constructor_body(
 			gcal = new GregorianCalendar((int32_t)largs[0], (int32_t)largs[1],
 				(int32_t)largs[2], (int32_t)largs[3], (int32_t)largs[4], (int32_t)largs[5],
 				status);
-		}
-		if (U_FAILURE(status)) {
-			intl_error_set(NULL, status, "intlgregcal_create_instance: error "
-				"creating ICU GregorianCalendar from date", 0);
-			if (gcal) {
-				delete gcal;
-			}
-			if (!is_constructor) {
-				zval_ptr_dtor(return_value);
-				RETVAL_NULL();
-			}
-			return;
+		} else {
+			ZEND_UNREACHABLE();
 		}
 
-		timelib_tzinfo *tzinfo = get_timezone_info();
-		UnicodeString tzstr = UnicodeString::fromUTF8(StringPiece(tzinfo->name));
-		if (tzstr.isBogus()) {
-			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-				"intlgregcal_create_instance: could not create UTF-8 string "
-				"from PHP's default timezone name (see date_default_timezone_get())",
-				0);
+		if (!set_gregorian_calendar_time_zone(gcal, status)) {
 			delete gcal;
 			if (!is_constructor) {
 				zval_ptr_dtor(return_value);
 				RETVAL_NULL();
 			}
 			return;
 		}
-
-		TimeZone *tz = TimeZone::createTimeZone(tzstr);
-		gcal->adoptTimeZone(tz);
 	}
 
 	co->ucal = gcal;
@@ -208,6 +220,82 @@ U_CFUNC PHP_METHOD(IntlGregorianCalendar, __construct)
 	}
 }
 
+U_CFUNC PHP_METHOD(IntlGregorianCalendar, createFromDate)
+{
+	zend_long year, month, day;
+	UErrorCode status = U_ZERO_ERROR;
+	zend_error_handling error_handling;
+	Calendar_object *co;
+	GregorianCalendar *gcal;
+
+	intl_error_reset(NULL);
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "lll", &year, &month, &day) == FAILURE) {
+		RETURN_THROWS();
+	}
+
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(year, 1);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(month, 2);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(day, 3);
+
+	zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &error_handling);
+
+	gcal = new GregorianCalendar((int32_t) year, (int32_t) month, (int32_t) day, status);
+	if (!set_gregorian_calendar_time_zone(gcal, status)) {
+		delete gcal;
+		goto cleanup;
+	}
+
+	object_init_ex(return_value, GregorianCalendar_ce_ptr);
+	co = Z_INTL_CALENDAR_P(return_value);
+	co->ucal = gcal;
+
+cleanup:
+	zend_restore_error_handling(&error_handling);
+}
+
+U_CFUNC PHP_METHOD(IntlGregorianCalendar, createFromDateTime)
+{
+	zend_long year, month, day, hour, minute, second;
+	bool second_is_null = 1;
+	UErrorCode status = U_ZERO_ERROR;
+	zend_error_handling error_handling;
+	Calendar_object *co;
+	GregorianCalendar *gcal;
+
+	intl_error_reset(NULL);
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "lllll|l!", &year, &month, &day, &hour, &minute, &second, &second_is_null) == FAILURE) {
+		RETURN_THROWS();
+	}
+
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(year, 1);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(month, 2);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(day, 3);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(hour, 4);
+	ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(minute, 5);
+
+	zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &error_handling);
+
+	if (second_is_null) {
+		gcal = new GregorianCalendar((int32_t) year, (int32_t) month, (int32_t) day, (int32_t) hour, (int32_t) minute, status);
+	} else {
+		ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(second, 6);
+		gcal = new GregorianCalendar((int32_t) year, (int32_t) month, (int32_t) day, (int32_t) hour, (int32_t) minute, (int32_t) second, status);
+	}
+	if (!set_gregorian_calendar_time_zone(gcal, status)) {
+		delete gcal;
+		goto cleanup;
+	}
+
+	object_init_ex(return_value, GregorianCalendar_ce_ptr);
+	co = Z_INTL_CALENDAR_P(return_value);
+	co->ucal = gcal;
+
+cleanup:
+	zend_restore_error_handling(&error_handling);
+}
+
 U_CFUNC PHP_FUNCTION(intlgregcal_set_gregorian_change)
 {
 	double date;
diff --git a/ext/intl/tests/calendar_equals_before_after_basic.phpt b/ext/intl/tests/calendar_equals_before_after_basic.phpt
@@ -9,9 +9,9 @@ intl
 ini_set("intl.error_level", E_WARNING);
 ini_set("intl.default_locale", "nl");
 
-$intlcal1 = new IntlGregorianCalendar(2012, 1, 29, 16, 59, 59);
+$intlcal1 = IntlGregorianCalendar::createFromDateTime(2012, 1, 29, 16, 59, 59);
 $intlcal2 = IntlCalendar::createInstance(null, '@calendar=japanese');
-$intlcal3 = new IntlGregorianCalendar(2012, 1, 29, 17, 00, 00);
+$intlcal3 = IntlGregorianCalendar::createFromDateTime(2012, 1, 29, 17, 00, 00);
 $intlcal2->setTime($intlcal1->getTime());
 
 var_dump($intlcal2->getType());
@@ -52,4 +52,4 @@ bool(false)
 string(10) "3 before 2"
 bool(false)
 string(9) "3 after 2"
-bool(true)
+bool(true)
diff --git a/ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt b/ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt
@@ -9,7 +9,7 @@ intl
 ini_set("intl.error_level", E_WARNING);
 ini_set("intl.default_locale", "nl");
 
-$intlcal = new IntlGregorianCalendar(2012, 1, 29);
+$intlcal = IntlGregorianCalendar::createFromDate(2012, 1, 29);
 var_dump(
         $intlcal->getErrorCode(),
         intlcal_get_error_code($intlcal),
diff --git a/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt b/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt
@@ -10,7 +10,7 @@ ini_set("intl.default_locale", "nl");
 date_default_timezone_set('Europe/Amsterdam');
 
 //28 October 2012, transition from DST
-$intlcal = new IntlGregorianCalendar(2012, 9, 28, 0, 0, 0);
+$intlcal = IntlGregorianCalendar::createFromDateTime(2012, 9, 28, 0, 0, 0);
 var_dump($intlcal->setRepeatedWallTimeOption(IntlCalendar::WALLTIME_LAST));
 var_dump($intlcal->getRepeatedWallTimeOption());
 $intlcal->set(IntlCalendar::FIELD_HOUR_OF_DAY, 2);
diff --git a/ext/intl/tests/calendar_set_date_time.phpt b/ext/intl/tests/calendar_set_date_time.phpt
@@ -5,6 +5,9 @@ intl
 --FILE--
 <?php
 
+$intlcal = IntlCalendar::createInstance('UTC');
+$intlcal->clear();
+
 //two minutes to midnight!
 $intlcal->setDateTime(2012, 1, 29, 23, 58);
 var_dump($intlcal->getTime(), strtotime('2012-02-29 23:58:00 +0000') * 1000.);
diff --git a/ext/intl/tests/gregoriancalendar_set_date_error.phpt b/ext/intl/tests/gregoriancalendar_set_date_error.phpt
@@ -0,0 +1,31 @@
+--TEST--
+IntlGregorianCalendar::setDate(): error cases
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 8) die("skip: 64-bit only"); ?>
+--FILE--
+<?php
+try {
+    var_dump(IntlGregorianCalendar::createFromDate(99999999999, 1, 1));
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+try {
+    var_dump(IntlGregorianCalendar::createFromDate(1, 99999999999, 1));
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+try {
+    var_dump(IntlGregorianCalendar::createFromDate(1, 1, 99999999999));
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+IntlGregorianCalendar::createFromDate(): Argument #1 ($year) must be between -2147483648 and 2147483647
+IntlGregorianCalendar::createFromDate(): Argument #2 ($month) must be between -2147483648 and 2147483647
+IntlGregorianCalendar::createFromDate(): Argument #3 ($dayOfMonth) must be between -2147483648 and 2147483647
diff --git a/ext/intl/tests/gregoriancalendar_set_date_time_error.phpt b/ext/intl/tests/gregoriancalendar_set_date_time_error.phpt
diff --git a/ext/intl/tests/msgfmt_format_intlcalendar.phpt b/ext/intl/tests/msgfmt_format_intlcalendar.phpt
