@@ -2978,15 +2978,13 @@ PHP_METHOD(DateTime, __unserialize)
2978
2978
{
2979
2979
zval * object = ZEND_THIS ;
2980
2980
php_date_obj * dateobj ;
2981
- zval * array ;
2982
2981
HashTable * myht ;
2983
2982
2984
2983
ZEND_PARSE_PARAMETERS_START (1 , 1 )
2985
- Z_PARAM_ARRAY ( array )
2984
+ Z_PARAM_ARRAY_HT ( myht )
2986
2985
ZEND_PARSE_PARAMETERS_END ();
2987
2986
2988
2987
dateobj = Z_PHPDATE_P (object );
2989
- myht = Z_ARRVAL_P (array );
2990
2988
2991
2989
if (!php_date_initialize_from_hash (& dateobj , myht )) {
2992
2990
zend_throw_error (NULL , "Invalid serialization data for DateTime object" );
@@ -3002,15 +3000,13 @@ PHP_METHOD(DateTimeImmutable, __unserialize)
3002
3000
{
3003
3001
zval * object = ZEND_THIS ;
3004
3002
php_date_obj * dateobj ;
3005
- zval * array ;
3006
3003
HashTable * myht ;
3007
3004
3008
3005
ZEND_PARSE_PARAMETERS_START (1 , 1 )
3009
- Z_PARAM_ARRAY ( array )
3006
+ Z_PARAM_ARRAY_HT ( myht )
3010
3007
ZEND_PARSE_PARAMETERS_END ();
3011
3008
3012
3009
dateobj = Z_PHPDATE_P (object );
3013
- myht = Z_ARRVAL_P (array );
3014
3010
3015
3011
if (!php_date_initialize_from_hash (& dateobj , myht )) {
3016
3012
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
4087
4083
PHP_METHOD (DateTimeZone , __set_state )
4088
4084
{
4089
4085
php_timezone_obj * tzobj ;
4090
- zval * array ;
4091
4086
HashTable * myht ;
4092
4087
4093
4088
ZEND_PARSE_PARAMETERS_START (1 , 1 )
4094
- Z_PARAM_ARRAY ( array )
4089
+ Z_PARAM_ARRAY_HT ( myht )
4095
4090
ZEND_PARSE_PARAMETERS_END ();
4096
4091
4097
- myht = Z_ARRVAL_P (array );
4098
-
4099
4092
php_date_instantiate (date_ce_timezone , return_value );
4100
4093
tzobj = Z_PHPTIMEZONE_P (return_value );
4101
4094
if (!php_date_timezone_initialize_from_hash (& return_value , & tzobj , myht )) {
@@ -4174,15 +4167,13 @@ PHP_METHOD(DateTimeZone, __unserialize)
4174
4167
{
4175
4168
zval * object = ZEND_THIS ;
4176
4169
php_timezone_obj * tzobj ;
4177
- zval * array ;
4178
4170
HashTable * myht ;
4179
4171
4180
4172
ZEND_PARSE_PARAMETERS_START (1 , 1 )
4181
- Z_PARAM_ARRAY ( array )
4173
+ Z_PARAM_ARRAY_HT ( myht )
4182
4174
ZEND_PARSE_PARAMETERS_END ();
4183
4175
4184
4176
tzobj = Z_PHPTIMEZONE_P (object );
4185
- myht = Z_ARRVAL_P (array );
4186
4177
4187
4178
if (!php_date_timezone_initialize_from_hash (& object , & tzobj , myht )) {
4188
4179
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
4738
4729
PHP_METHOD (DateInterval , __set_state )
4739
4730
{
4740
4731
php_interval_obj * intobj ;
4741
- zval * array ;
4742
4732
HashTable * myht ;
4743
4733
4744
4734
ZEND_PARSE_PARAMETERS_START (1 , 1 )
4745
- Z_PARAM_ARRAY ( array )
4735
+ Z_PARAM_ARRAY_HT ( myht )
4746
4736
ZEND_PARSE_PARAMETERS_END ();
4747
4737
4748
- myht = Z_ARRVAL_P (array );
4749
-
4750
4738
php_date_instantiate (date_ce_interval , return_value );
4751
4739
intobj = Z_PHPINTERVAL_P (return_value );
4752
4740
php_date_interval_initialize_from_hash (& return_value , & intobj , myht );
@@ -4812,15 +4800,13 @@ PHP_METHOD(DateInterval, __unserialize)
4812
4800
{
4813
4801
zval * object = ZEND_THIS ;
4814
4802
php_interval_obj * intervalobj ;
4815
- zval * array ;
4816
4803
HashTable * myht ;
4817
4804
4818
4805
ZEND_PARSE_PARAMETERS_START (1 , 1 )
4819
- Z_PARAM_ARRAY ( array )
4806
+ Z_PARAM_ARRAY_HT ( myht )
4820
4807
ZEND_PARSE_PARAMETERS_END ();
4821
4808
4822
4809
intervalobj = Z_PHPINTERVAL_P (object );
4823
- myht = Z_ARRVAL_P (array );
4824
4810
4825
4811
php_date_interval_initialize_from_hash (& object , & intervalobj , myht );
4826
4812
restore_custom_dateinterval_properties (object , myht );
@@ -5835,15 +5821,12 @@ static bool php_date_period_initialize_from_hash(php_period_obj *period_obj, Has
5835
5821
PHP_METHOD (DatePeriod , __set_state )
5836
5822
{
5837
5823
php_period_obj * period_obj ;
5838
- zval * array ;
5839
5824
HashTable * myht ;
5840
5825
5841
5826
ZEND_PARSE_PARAMETERS_START (1 , 1 )
5842
- Z_PARAM_ARRAY ( array )
5827
+ Z_PARAM_ARRAY_HT ( myht )
5843
5828
ZEND_PARSE_PARAMETERS_END ();
5844
5829
5845
- myht = Z_ARRVAL_P (array );
5846
-
5847
5830
object_init_ex (return_value , date_ce_period );
5848
5831
period_obj = Z_PHPPERIOD_P (return_value );
5849
5832
if (!php_date_period_initialize_from_hash (period_obj , myht )) {
@@ -5912,15 +5895,13 @@ PHP_METHOD(DatePeriod, __unserialize)
5912
5895
{
5913
5896
zval * object = ZEND_THIS ;
5914
5897
php_period_obj * period_obj ;
5915
- zval * array ;
5916
5898
HashTable * myht ;
5917
5899
5918
5900
ZEND_PARSE_PARAMETERS_START (1 , 1 )
5919
- Z_PARAM_ARRAY ( array )
5901
+ Z_PARAM_ARRAY_HT ( myht )
5920
5902
ZEND_PARSE_PARAMETERS_END ();
5921
5903
5922
5904
period_obj = Z_PHPPERIOD_P (object );
5923
- myht = Z_ARRVAL_P (array );
5924
5905
5925
5906
if (!php_date_period_initialize_from_hash (period_obj , myht )) {
5926
5907
zend_throw_error (NULL , "Invalid serialization data for DatePeriod object" );
0 commit comments