Skip to content

Commit c67e12e

Browse files
committed
ext/date: Use Z_PARAM_ARRAY_HT instead of Z_PARAM_ARRAY
1 parent 0943b8b commit c67e12e

File tree

1 file changed

+8
-27
lines changed

1 file changed

+8
-27
lines changed

ext/date/php_date.c

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2978,15 +2978,13 @@ PHP_METHOD(DateTime, __unserialize)
29782978
{
29792979
zval *object = ZEND_THIS;
29802980
php_date_obj *dateobj;
2981-
zval *array;
29822981
HashTable *myht;
29832982

29842983
ZEND_PARSE_PARAMETERS_START(1, 1)
2985-
Z_PARAM_ARRAY(array)
2984+
Z_PARAM_ARRAY_HT(myht)
29862985
ZEND_PARSE_PARAMETERS_END();
29872986

29882987
dateobj = Z_PHPDATE_P(object);
2989-
myht = Z_ARRVAL_P(array);
29902988

29912989
if (!php_date_initialize_from_hash(&dateobj, myht)) {
29922990
zend_throw_error(NULL, "Invalid serialization data for DateTime object");
@@ -3002,15 +3000,13 @@ PHP_METHOD(DateTimeImmutable, __unserialize)
30023000
{
30033001
zval *object = ZEND_THIS;
30043002
php_date_obj *dateobj;
3005-
zval *array;
30063003
HashTable *myht;
30073004

30083005
ZEND_PARSE_PARAMETERS_START(1, 1)
3009-
Z_PARAM_ARRAY(array)
3006+
Z_PARAM_ARRAY_HT(myht)
30103007
ZEND_PARSE_PARAMETERS_END();
30113008

30123009
dateobj = Z_PHPDATE_P(object);
3013-
myht = Z_ARRVAL_P(array);
30143010

30153011
if (!php_date_initialize_from_hash(&dateobj, myht)) {
30163012
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
40874083
PHP_METHOD(DateTimeZone, __set_state)
40884084
{
40894085
php_timezone_obj *tzobj;
4090-
zval *array;
40914086
HashTable *myht;
40924087

40934088
ZEND_PARSE_PARAMETERS_START(1, 1)
4094-
Z_PARAM_ARRAY(array)
4089+
Z_PARAM_ARRAY_HT(myht)
40954090
ZEND_PARSE_PARAMETERS_END();
40964091

4097-
myht = Z_ARRVAL_P(array);
4098-
40994092
php_date_instantiate(date_ce_timezone, return_value);
41004093
tzobj = Z_PHPTIMEZONE_P(return_value);
41014094
if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
@@ -4174,15 +4167,13 @@ PHP_METHOD(DateTimeZone, __unserialize)
41744167
{
41754168
zval *object = ZEND_THIS;
41764169
php_timezone_obj *tzobj;
4177-
zval *array;
41784170
HashTable *myht;
41794171

41804172
ZEND_PARSE_PARAMETERS_START(1, 1)
4181-
Z_PARAM_ARRAY(array)
4173+
Z_PARAM_ARRAY_HT(myht)
41824174
ZEND_PARSE_PARAMETERS_END();
41834175

41844176
tzobj = Z_PHPTIMEZONE_P(object);
4185-
myht = Z_ARRVAL_P(array);
41864177

41874178
if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) {
41884179
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
47384729
PHP_METHOD(DateInterval, __set_state)
47394730
{
47404731
php_interval_obj *intobj;
4741-
zval *array;
47424732
HashTable *myht;
47434733

47444734
ZEND_PARSE_PARAMETERS_START(1, 1)
4745-
Z_PARAM_ARRAY(array)
4735+
Z_PARAM_ARRAY_HT(myht)
47464736
ZEND_PARSE_PARAMETERS_END();
47474737

4748-
myht = Z_ARRVAL_P(array);
4749-
47504738
php_date_instantiate(date_ce_interval, return_value);
47514739
intobj = Z_PHPINTERVAL_P(return_value);
47524740
php_date_interval_initialize_from_hash(&return_value, &intobj, myht);
@@ -4812,15 +4800,13 @@ PHP_METHOD(DateInterval, __unserialize)
48124800
{
48134801
zval *object = ZEND_THIS;
48144802
php_interval_obj *intervalobj;
4815-
zval *array;
48164803
HashTable *myht;
48174804

48184805
ZEND_PARSE_PARAMETERS_START(1, 1)
4819-
Z_PARAM_ARRAY(array)
4806+
Z_PARAM_ARRAY_HT(myht)
48204807
ZEND_PARSE_PARAMETERS_END();
48214808

48224809
intervalobj = Z_PHPINTERVAL_P(object);
4823-
myht = Z_ARRVAL_P(array);
48244810

48254811
php_date_interval_initialize_from_hash(&object, &intervalobj, myht);
48264812
restore_custom_dateinterval_properties(object, myht);
@@ -5835,15 +5821,12 @@ static bool php_date_period_initialize_from_hash(php_period_obj *period_obj, Has
58355821
PHP_METHOD(DatePeriod, __set_state)
58365822
{
58375823
php_period_obj *period_obj;
5838-
zval *array;
58395824
HashTable *myht;
58405825

58415826
ZEND_PARSE_PARAMETERS_START(1, 1)
5842-
Z_PARAM_ARRAY(array)
5827+
Z_PARAM_ARRAY_HT(myht)
58435828
ZEND_PARSE_PARAMETERS_END();
58445829

5845-
myht = Z_ARRVAL_P(array);
5846-
58475830
object_init_ex(return_value, date_ce_period);
58485831
period_obj = Z_PHPPERIOD_P(return_value);
58495832
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
@@ -5912,15 +5895,13 @@ PHP_METHOD(DatePeriod, __unserialize)
59125895
{
59135896
zval *object = ZEND_THIS;
59145897
php_period_obj *period_obj;
5915-
zval *array;
59165898
HashTable *myht;
59175899

59185900
ZEND_PARSE_PARAMETERS_START(1, 1)
5919-
Z_PARAM_ARRAY(array)
5901+
Z_PARAM_ARRAY_HT(myht)
59205902
ZEND_PARSE_PARAMETERS_END();
59215903

59225904
period_obj = Z_PHPPERIOD_P(object);
5923-
myht = Z_ARRVAL_P(array);
59245905

59255906
if (!php_date_period_initialize_from_hash(period_obj, myht)) {
59265907
zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");

0 commit comments

Comments
 (0)