Skip to content

Commit 1b240ff

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

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-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/spl/php_spl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,8 @@ ZEND_END_ARG_INFO()
902902

903903
ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload_register, 0, 0, 0)
904904
ZEND_ARG_INFO(0, autoload_function)
905+
ZEND_ARG_INFO(0, throw)
906+
ZEND_ARG_INFO(0, prepend)
905907
ZEND_END_ARG_INFO()
906908

907909
ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload_unregister, 0, 0, 1)

ext/standard/basic_functions.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,6 +1435,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setcookie, 0, 0, 1)
14351435
ZEND_ARG_INFO(0, path)
14361436
ZEND_ARG_INFO(0, domain)
14371437
ZEND_ARG_INFO(0, secure)
1438+
ZEND_ARG_INFO(0, httponly)
14381439
ZEND_END_ARG_INFO()
14391440

14401441
ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1)
@@ -1444,6 +1445,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1)
14441445
ZEND_ARG_INFO(0, path)
14451446
ZEND_ARG_INFO(0, domain)
14461447
ZEND_ARG_INFO(0, secure)
1448+
ZEND_ARG_INFO(0, httponly)
14471449
ZEND_END_ARG_INFO()
14481450

14491451
ZEND_BEGIN_ARG_INFO_EX(arginfo_headers_sent, 0, 0, 0)

0 commit comments

Comments
 (0)