Browse Source

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #76131 some arginfo params are different from the documentation
PHP-7.2.5
Joe Watkins 8 years ago
parent
commit
3e267ca91b
No known key found for this signature in database GPG Key ID: F9BA0ADA31CBD89E
  1. 9
      NEWS
  2. 10
      ext/date/php_date.c
  3. 4
      ext/spl/spl_array.c

9
NEWS

@ -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)

10
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);

4
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()

Loading…
Cancel
Save