php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3'

Browse Source 
* PHP-8.3:
  Add missing return for DatePeriod::__unserialize
This commit is contained in:
Máté Kocsis
2024-09-03 21:32:03 +02:00
parent 8a2015451a 1663ed6c6e
commit 7dfbf4d1b7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/date/php_date.c
View File

@@ -3066,6 +3066,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();
}
}
/* }}} */
@@ -3085,6 +3086,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();
}
}
/* }}} */
@@ -4132,6 +4134,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();
}
}
/* }}} */
@@ -4151,6 +4154,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();
}
}
/* }}} */
@@ -4216,6 +4220,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);
@@ -5844,6 +5849,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();
}
}
/* }}} */
@@ -5919,6 +5925,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);
}
@@ -5939,6 +5946,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();
}
}
/* }}} */