Skip to content

Commit 968a9f4

Browse files
committed
Merge branch 'PHP-5.6'
* PHP-5.6: Fixed bug #69141 Missing arguments in reflection info for some builtin functions
2 parents ed10253 + 1b240ff commit 968a9f4

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

ext/date/php_date.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mktime, 0, 0, 0)
8585
ZEND_ARG_INFO(0, mon)
8686
ZEND_ARG_INFO(0, day)
8787
ZEND_ARG_INFO(0, year)
88+
ZEND_ARG_INFO(0, is_dst)
8889
ZEND_END_ARG_INFO()
8990

9091
ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0)
@@ -94,6 +95,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0)
9495
ZEND_ARG_INFO(0, mon)
9596
ZEND_ARG_INFO(0, day)
9697
ZEND_ARG_INFO(0, year)
98+
ZEND_ARG_INFO(0, is_dst)
9799
ZEND_END_ARG_INFO()
98100

99101
ZEND_BEGIN_ARG_INFO(arginfo_checkdate, 0)

ext/standard/basic_functions.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,6 +1419,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setcookie, 0, 0, 1)
14191419
ZEND_ARG_INFO(0, path)
14201420
ZEND_ARG_INFO(0, domain)
14211421
ZEND_ARG_INFO(0, secure)
1422+
ZEND_ARG_INFO(0, httponly)
14221423
ZEND_END_ARG_INFO()
14231424

14241425
ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1)
@@ -1428,6 +1429,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1)
14281429
ZEND_ARG_INFO(0, path)
14291430
ZEND_ARG_INFO(0, domain)
14301431
ZEND_ARG_INFO(0, secure)
1432+
ZEND_ARG_INFO(0, httponly)
14311433
ZEND_END_ARG_INFO()
14321434

14331435
ZEND_BEGIN_ARG_INFO_EX(arginfo_headers_sent, 0, 0, 0)

0 commit comments

Comments
 (0)