Skip to content

Commit 7dfbf4d

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Add missing return for DatePeriod::__unserialize
2 parents 8a20154 + 1663ed6 commit 7dfbf4d

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
@@ -3066,6 +3066,7 @@ PHP_METHOD(DateTime, __wakeup)
30663066

30673067
if (!php_date_initialize_from_hash(&dateobj, myht)) {
30683068
zend_throw_error(NULL, "Invalid serialization data for DateTime object");
3069+
RETURN_THROWS();
30693070
}
30703071
}
30713072
/* }}} */
@@ -3085,6 +3086,7 @@ PHP_METHOD(DateTimeImmutable, __wakeup)
30853086

30863087
if (!php_date_initialize_from_hash(&dateobj, myht)) {
30873088
zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object");
3089+
RETURN_THROWS();
30883090
}
30893091
}
30903092
/* }}} */
@@ -4132,6 +4134,7 @@ PHP_METHOD(DateTimeZone, __set_state)
41324134
tzobj = Z_PHPTIMEZONE_P(return_value);
41334135
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
41344136
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
4137+
RETURN_THROWS();
41354138
}
41364139
}
41374140
/* }}} */
@@ -4151,6 +4154,7 @@ PHP_METHOD(DateTimeZone, __wakeup)
41514154

41524155
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
41534156
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
4157+
RETURN_THROWS();
41544158
}
41554159
}
41564160
/* }}} */
@@ -4216,6 +4220,7 @@ PHP_METHOD(DateTimeZone, __unserialize)
42164220

42174221
if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) {
42184222
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
4223+
RETURN_THROWS();
42194224
}
42204225

42214226
restore_custom_datetimezone_properties(object, myht);
@@ -5844,6 +5849,7 @@ PHP_METHOD(DatePeriod, __set_state)
58445849
period_obj = Z_PHPPERIOD_P(return_value);
58455850
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
58465851
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
5852+
RETURN_THROWS();
58475853
}
58485854
}
58495855
/* }}} */
@@ -5919,6 +5925,7 @@ PHP_METHOD(DatePeriod, __unserialize)
59195925

59205926
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
59215927
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
5928+
RETURN_THROWS();
59225929
}
59235930
restore_custom_dateperiod_properties(object, myht);
59245931
}
@@ -5939,6 +5946,7 @@ PHP_METHOD(DatePeriod, __wakeup)
59395946

59405947
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
59415948
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
5949+
RETURN_THROWS();
59425950
}
59435951
}
59445952
/* }}} */

0 commit comments

Comments
 (0)