clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source 
* PHP-8.2:
  Add missing return for DatePeriod::__unserialize
This commit is contained in:
Máté Kocsis 2024-09-03 21:31:00 +02:00
commit 1663ed6c6e
No known key found for this signature in database
GPG Key ID: FD055E41728BF310
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/date/php_date.c
View File

@ -2933,6 +2933,7 @@ PHP_METHOD(DateTime, __wakeup)
if (!php_date_initialize_from_hash(&dateobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTime object");
RETURN_THROWS();
}
}
/* }}} */
@ -2952,6 +2953,7 @@ PHP_METHOD(DateTimeImmutable, __wakeup)
if (!php_date_initialize_from_hash(&dateobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object");
RETURN_THROWS();
}
}
/* }}} */
@ -3911,6 +3913,7 @@ PHP_METHOD(DateTimeZone, __set_state)
tzobj = Z_PHPTIMEZONE_P(return_value);
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
RETURN_THROWS();
}
}
/* }}} */
@ -3930,6 +3933,7 @@ PHP_METHOD(DateTimeZone, __wakeup)
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
RETURN_THROWS();
}
}
/* }}} */
@ -3995,6 +3999,7 @@ PHP_METHOD(DateTimeZone, __unserialize)
if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
RETURN_THROWS();
}
restore_custom_datetimezone_properties(object, myht);
@ -5617,6 +5622,7 @@ PHP_METHOD(DatePeriod, __set_state)
period_obj = Z_PHPPERIOD_P(return_value);
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
RETURN_THROWS();
}
}
/* }}} */
@ -5692,6 +5698,7 @@ PHP_METHOD(DatePeriod, __unserialize)
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
RETURN_THROWS();
}
restore_custom_dateperiod_properties(object, myht);
}
@ -5712,6 +5719,7 @@ PHP_METHOD(DatePeriod, __wakeup)
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
RETURN_THROWS();
}
}
/* }}} */