Merge branch 'fix_74541' of https://github.com/villfa/php-src into PHP-7.0

* 'fix_74541' of https://github.com/villfa/php-src:
  Fix Bug #74541 Wrong reflection on session_start()
This commit is contained in:
Xinchen Hui 2017-05-09 11:04:39 +08:00
commit d40a852919
2 changed files with 23 additions and 1 deletions

View file

@ -2554,6 +2554,10 @@ ZEND_BEGIN_ARG_INFO(arginfo_session_class_updateTimestamp, 0)
ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, val)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_session_start, 0, 0, 0)
ZEND_ARG_INFO(0, options) /* array */
ZEND_END_ARG_INFO()
/* }}} */
/* {{{ session_functions[]
@ -2566,7 +2570,7 @@ static const zend_function_entry session_functions[] = {
PHP_FE(session_regenerate_id, arginfo_session_regenerate_id)
PHP_FE(session_decode, arginfo_session_decode)
PHP_FE(session_encode, arginfo_session_void)
PHP_FE(session_start, arginfo_session_void)
PHP_FE(session_start, arginfo_session_start)
PHP_FE(session_destroy, arginfo_session_void)
PHP_FE(session_unset, arginfo_session_void)
PHP_FE(session_set_save_handler, arginfo_session_set_save_handler)

View file

@ -0,0 +1,18 @@
--TEST--
Bug #74541 Wrong reflection on session_start()
--SKIPIF--
<?php
include('skipif.inc');
if (!extension_loaded('reflection')) die("skip");
?>
--FILE--
<?php
$r = new ReflectionFunction('session_start');
var_dump($r->getNumberOfParameters());
var_dump($r->getNumberOfRequiredParameters());
?>
===DONE===
--EXPECT--
int(1)
int(0)
===DONE===