Skip to content

Commit 1663ed6

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Add missing return for DatePeriod::__unserialize
2 parents be85896 + 6cab769 commit 1663ed6

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

ext/date/php_date.c

+8
Original file line numberDiff line numberDiff line change
@@ -2933,6 +2933,7 @@ PHP_METHOD(DateTime, __wakeup)
29332933

29342934
if (!php_date_initialize_from_hash(&dateobj, myht)) {
29352935
zend_throw_error(NULL, "Invalid serialization data for DateTime object");
2936+
RETURN_THROWS();
29362937
}
29372938
}
29382939
/* }}} */
@@ -2952,6 +2953,7 @@ PHP_METHOD(DateTimeImmutable, __wakeup)
29522953

29532954
if (!php_date_initialize_from_hash(&dateobj, myht)) {
29542955
zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object");
2956+
RETURN_THROWS();
29552957
}
29562958
}
29572959
/* }}} */
@@ -3911,6 +3913,7 @@ PHP_METHOD(DateTimeZone, __set_state)
39113913
tzobj = Z_PHPTIMEZONE_P(return_value);
39123914
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
39133915
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
3916+
RETURN_THROWS();
39143917
}
39153918
}
39163919
/* }}} */
@@ -3930,6 +3933,7 @@ PHP_METHOD(DateTimeZone, __wakeup)
39303933

39313934
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
39323935
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
3936+
RETURN_THROWS();
39333937
}
39343938
}
39353939
/* }}} */
@@ -3995,6 +3999,7 @@ PHP_METHOD(DateTimeZone, __unserialize)
39953999

39964000
if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) {
39974001
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
4002+
RETURN_THROWS();
39984003
}
39994004

40004005
restore_custom_datetimezone_properties(object, myht);
@@ -5617,6 +5622,7 @@ PHP_METHOD(DatePeriod, __set_state)
56175622
period_obj = Z_PHPPERIOD_P(return_value);
56185623
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
56195624
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
5625+
RETURN_THROWS();
56205626
}
56215627
}
56225628
/* }}} */
@@ -5692,6 +5698,7 @@ PHP_METHOD(DatePeriod, __unserialize)
56925698

56935699
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
56945700
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
5701+
RETURN_THROWS();
56955702
}
56965703
restore_custom_dateperiod_properties(object, myht);
56975704
}
@@ -5712,6 +5719,7 @@ PHP_METHOD(DatePeriod, __wakeup)
57125719

57135720
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
57145721
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
5722+
RETURN_THROWS();
57155723
}
57165724
}
57175725
/* }}} */

0 commit comments

Comments
 (0)