diff options
| author | Joe Watkins <krakjoe@php.net> | 2018-03-27 21:57:28 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2018-03-27 21:58:24 +0200 |
| commit | 3e267ca91bdde9430db3236602652c4fbf2580fa (patch) | |
| tree | b8b1da98066db4d08343230f44577c6daa17731b | |
| parent | a492fe213a0d39520a4b4086fc101b20c1175f59 (diff) | |
| parent | 63934ea71e719cfc43e94167474f936d8da938de (diff) | |
| download | php-git-3e267ca91bdde9430db3236602652c4fbf2580fa.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76131 some arginfo params are different from the documentation
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | ext/date/php_date.c | 10 | ||||
| -rw-r--r-- | ext/spl/spl_array.c | 4 |
3 files changed, 15 insertions, 8 deletions
@@ -6,7 +6,10 @@ PHP NEWS . Fixed bug #75722 (Convert valgrind detection to configure option). (Michael Heimpold) -- 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) @@ -18,6 +21,10 @@ PHP NEWS - Opcache: . Fixed bug #76094 (Access violation when using opcache). (Laruence) +- SPL: + . Fixed bug #76131 (mismatch arginfo for splarray constructor). + (carusogabriel) + - Standard: . Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb) diff --git a/ext/date/php_date.c b/ext/date/php_date.c index a23e551af6..993a7b11cf 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -162,7 +162,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) @@ -2042,9 +2042,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; @@ -2062,7 +2062,7 @@ static int date_interval_has_property(zval *object, zval *member, int type, void } return retval; - + } /* }}} */ @@ -2435,7 +2435,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 9e3b55ebd8..bc883b02e6 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -1883,8 +1883,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() |