Browse Source

Merge branch 'PHP-7.2'

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

5
NEWS

@ -54,6 +54,7 @@ PHP NEWS
. Fixed bug #75222 (DateInterval microseconds property always 0). (jhdxr)
. Fixed bug #68406 (calling var_dump on a DateTimeZone object modifies it).
(jhdxr)
. Fixed bug #76131 (mismatch arginfo for date_create). (carusogabriel)
- DBA:
. Fixed bug #75264 (compiler warnings emitted). (petk)
@ -92,7 +93,7 @@ PHP NEWS
only litespeed SAPI). (petk)
. Fixed bug #75251 (Missing program prefix and suffix). (petk)
- Mbstring:
- mbstring:
. Fixed bug #65544 (mb title case conversion-first word in quotation isn't
capitalized). (Nikita)
. Fixed bug #71298 (MB_CASE_TITLE misbehaves with curled apostrophe/quote.
@ -172,6 +173,8 @@ PHP NEWS
. Fixed bug #75878 (RecursiveTreeIterator::setPostfix has wrong signature).
(cmb)
. Fixed bug #74519 (strange behavior of AppendIterator). (jhdxr)
. Fixed bug #76131 (mismatch arginfo for splarray constructor).
(carusogabriel)
- SQLite3:
. Updated bundled libsqlite to 3.22.0. (cmb)

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

4
ext/spl/spl_array.c

@ -1884,8 +1884,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