Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #74404 (wrong reflection on DateTimeZone::getTransitions)
This commit is contained in:
Joe Watkins 2017-04-10 12:49:54 +01:00
commit 67ef80d34b
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
2 changed files with 3 additions and 1 deletions

2
NEWS
View File

@ -48,6 +48,8 @@ PHP NEWS
- Date:
. Fixed bug #69587 (DateInterval properties and isset). (jhdxr)
. Fixed bug #74404 (Wrong reflection on DateTimeZone::getTransitions).
(krakjoe)
- DOM:
. Fixed bug #67474 (getElementsByTagNameNS filter on default ns). (aboks)

View File

@ -345,7 +345,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_transitions_get, 0, 0, 1)
ZEND_ARG_INFO(0, timestamp_end)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_timezone_method_transitions_get, 0)
ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_method_transitions_get, 0, 0, 0)
ZEND_ARG_INFO(0, timestamp_begin)
ZEND_ARG_INFO(0, timestamp_end)
ZEND_END_ARG_INFO()