Merge branch 'PHP-8.0' into PHP-8.1

php · Apr 26, 2022 · 97ffd75 · 97ffd75
2 parents bc43e69 + b461c46
commit 97ffd75
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -1333,7 +1333,7 @@ PHP_FUNCTION(localtime)
 
 	tzi = get_timezone_info();
 	if (!tzi) {
-		return;
+		RETURN_THROWS();
 	}
 	ts = timelib_time_ctor();
 	ts->tz_info = tzi;
@@ -1387,7 +1387,7 @@ PHP_FUNCTION(getdate)
 
 	tzi = get_timezone_info();
 	if (!tzi) {
-		return;
+		RETURN_THROWS();
 	}
 	ts = timelib_time_ctor();
 	ts->tz_info = tzi;
@@ -4555,7 +4555,7 @@ PHP_FUNCTION(date_default_timezone_get)
 
 	default_tz = get_timezone_info();
 	if (!default_tz) {
-		return;
+		RETURN_THROWS();
 	}
 	RETVAL_STRING(default_tz->name);
 }
@@ -4614,7 +4614,7 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su
 	/* Initialize time struct */
 	tzi = get_timezone_info();
 	if (!tzi) {
-		return;
+		RETURN_THROWS();
 	}
 	t = timelib_time_ctor();
 	t->tz_info = tzi;
@@ -4688,7 +4688,7 @@ PHP_FUNCTION(date_sun_info)
 	/* Initialize time struct */
 	tzi = get_timezone_info();
 	if (!tzi) {
-		return;
+		RETURN_THROWS();
 	}
 	t = timelib_time_ctor();
 	t->tz_info = tzi;