archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/date: Use Z_PARAM_ARRAY_HT instead of Z_PARAM_ARRAY

Browse source
This commit is contained in:
Gina Peter Banyard 2025-03-13 15:05:39 +00:00
parent 0943b8b7eb
commit c67e12e718
1 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ext/date/php_date.c
View file

@ -2978,15 +2978,13 @@ PHP_METHOD(DateTime, __unserialize)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
php_date_obj *dateobj; php_date_obj *dateobj;
zval *array;
HashTable *myht; HashTable *myht;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_ARRAY(array) Z_PARAM_ARRAY_HT(myht)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
dateobj = Z_PHPDATE_P(object); dateobj = Z_PHPDATE_P(object);
myht = Z_ARRVAL_P(array);
if (!php_date_initialize_from_hash(&dateobj, myht)) { if (!php_date_initialize_from_hash(&dateobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTime object"); zend_throw_error(NULL, "Invalid serialization data for DateTime object");
@ -3002,15 +3000,13 @@ PHP_METHOD(DateTimeImmutable, __unserialize)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
php_date_obj *dateobj; php_date_obj *dateobj;
zval *array;
HashTable *myht; HashTable *myht;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_ARRAY(array) Z_PARAM_ARRAY_HT(myht)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
dateobj = Z_PHPDATE_P(object); dateobj = Z_PHPDATE_P(object);
myht = Z_ARRVAL_P(array);
if (!php_date_initialize_from_hash(&dateobj, myht)) { if (!php_date_initialize_from_hash(&dateobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object"); zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object");
@ -4087,15 +4083,12 @@ static bool php_date_timezone_initialize_from_hash(zval **return_value, php_time
PHP_METHOD(DateTimeZone, __set_state) PHP_METHOD(DateTimeZone, __set_state)
{ {
php_timezone_obj *tzobj; php_timezone_obj *tzobj;
zval *array;
HashTable *myht; HashTable *myht;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_ARRAY(array) Z_PARAM_ARRAY_HT(myht)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
myht = Z_ARRVAL_P(array);
php_date_instantiate(date_ce_timezone, return_value); php_date_instantiate(date_ce_timezone, return_value);
tzobj = Z_PHPTIMEZONE_P(return_value); tzobj = Z_PHPTIMEZONE_P(return_value);
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) { if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
@ -4174,15 +4167,13 @@ PHP_METHOD(DateTimeZone, __unserialize)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
php_timezone_obj *tzobj; php_timezone_obj *tzobj;
zval *array;
HashTable *myht; HashTable *myht;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_ARRAY(array) Z_PARAM_ARRAY_HT(myht)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
tzobj = Z_PHPTIMEZONE_P(object); tzobj = Z_PHPTIMEZONE_P(object);
myht = Z_ARRVAL_P(array);
if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) { if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object"); zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
@ -4738,15 +4729,12 @@ static void php_date_interval_initialize_from_hash(zval **return_value, php_inte
PHP_METHOD(DateInterval, __set_state) PHP_METHOD(DateInterval, __set_state)
{ {
php_interval_obj *intobj; php_interval_obj *intobj;
zval *array;
HashTable *myht; HashTable *myht;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_ARRAY(array) Z_PARAM_ARRAY_HT(myht)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
myht = Z_ARRVAL_P(array);
php_date_instantiate(date_ce_interval, return_value); php_date_instantiate(date_ce_interval, return_value);
intobj = Z_PHPINTERVAL_P(return_value); intobj = Z_PHPINTERVAL_P(return_value);
php_date_interval_initialize_from_hash(&return_value, &intobj, myht); php_date_interval_initialize_from_hash(&return_value, &intobj, myht);
@ -4812,15 +4800,13 @@ PHP_METHOD(DateInterval, __unserialize)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
php_interval_obj *intervalobj; php_interval_obj *intervalobj;
zval *array;
HashTable *myht; HashTable *myht;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_ARRAY(array) Z_PARAM_ARRAY_HT(myht)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
intervalobj = Z_PHPINTERVAL_P(object); intervalobj = Z_PHPINTERVAL_P(object);
myht = Z_ARRVAL_P(array);
php_date_interval_initialize_from_hash(&object, &intervalobj, myht); php_date_interval_initialize_from_hash(&object, &intervalobj, myht);
restore_custom_dateinterval_properties(object, myht); restore_custom_dateinterval_properties(object, myht);
@ -5835,15 +5821,12 @@ static bool php_date_period_initialize_from_hash(php_period_obj *period_obj, Has
PHP_METHOD(DatePeriod, __set_state) PHP_METHOD(DatePeriod, __set_state)
{ {
php_period_obj *period_obj; php_period_obj *period_obj;
zval *array;
HashTable *myht; HashTable *myht;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_ARRAY(array) Z_PARAM_ARRAY_HT(myht)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
myht = Z_ARRVAL_P(array);
object_init_ex(return_value, date_ce_period); object_init_ex(return_value, date_ce_period);
period_obj = Z_PHPPERIOD_P(return_value); period_obj = Z_PHPPERIOD_P(return_value);
if (!php_date_period_initialize_from_hash(period_obj, myht)) { if (!php_date_period_initialize_from_hash(period_obj, myht)) {
@ -5912,15 +5895,13 @@ PHP_METHOD(DatePeriod, __unserialize)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
php_period_obj *period_obj; php_period_obj *period_obj;
zval *array;
HashTable *myht; HashTable *myht;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_ARRAY(array) Z_PARAM_ARRAY_HT(myht)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
period_obj = Z_PHPPERIOD_P(object); period_obj = Z_PHPPERIOD_P(object);
myht = Z_ARRVAL_P(array);
if (!php_date_period_initialize_from_hash(period_obj, myht)) { if (!php_date_period_initialize_from_hash(period_obj, myht)) {
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object"); zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");