diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-03-24 01:51:21 -0300 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2018-03-27 21:56:46 +0200 |
| commit | 63934ea71e719cfc43e94167474f936d8da938de (patch) | |
| tree | 2969795cb00a84e8daf298d1b3167570bb1a9f6d | |
| parent | cdf72523f3b6a07f1e67561d2c13f16a984d2efe (diff) | |
| download | php-git-63934ea71e719cfc43e94167474f936d8da938de.tar.gz | |
Fix #76131 some arginfo params are different from the documentation
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | ext/date/php_date.c | 10 | ||||
| -rw-r--r-- | ext/spl/spl_array.c | 6 |
3 files changed, 15 insertions, 9 deletions
@@ -2,11 +2,17 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.1.17 -- Mbstring: +- Date: + . Fixed bug #76131 (mismatch arginfo for date_create). (carusogabriel) + +- mbstring: . Fixed bug #75944 (Wrong cp1251 detection). (dmk001) . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1). (chrullrich, cmb) +- SPL: + . Fixed bug #76131 (mismatch arginfo for splarray constructor). + (carusogabriel) 29 Mar 2018, PHP 7.1.16 diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 5b07f1e232..7c28f1b4b4 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -161,7 +161,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create, 0, 0, 0) ZEND_ARG_INFO(0, time) - ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, timezone) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create_from_format, 0, 0, 2) @@ -2021,9 +2021,9 @@ static int date_interval_has_property(zval *object, zval *member, int type, void } return retval; } - + prop = date_interval_read_property(object, member, BP_VAR_IS, cache_slot, &rv); - + if (prop != &EG(uninitialized_zval)) { if (type == 2) { retval = 1; @@ -2041,7 +2041,7 @@ static int date_interval_has_property(zval *object, zval *member, int type, void } return retval; - + } /* }}} */ @@ -2390,7 +2390,7 @@ static HashTable *date_object_get_debug_info_timezone(zval *object, int *is_temp *is_temp = 1; ht = zend_array_dup(props); - + ZVAL_LONG(&zv, tzobj->type); zend_hash_str_update(ht, "timezone_type", sizeof("timezone_type")-1, &zv); diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index f8a98a3af2..8abb3ba7ed 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -153,7 +153,7 @@ static zend_always_inline uint32_t *spl_array_get_pos_ptr(HashTable *ht, spl_arr static void spl_array_object_free_storage(zend_object *object) { spl_array_object *intern = spl_array_from_obj(object); - + if (intern->ht_iter != (uint32_t) -1) { zend_hash_iterator_del(intern->ht_iter); } @@ -1859,8 +1859,8 @@ outexcept: /* {{{ arginfo and function table */ ZEND_BEGIN_ARG_INFO_EX(arginfo_array___construct, 0, 0, 0) - ZEND_ARG_INFO(0, array) - ZEND_ARG_INFO(0, ar_flags) + ZEND_ARG_INFO(0, input) + ZEND_ARG_INFO(0, flags) ZEND_ARG_INFO(0, iterator_class) ZEND_END_ARG_INFO() |