Merge branch 'PHP-7.1'

This commit is contained in:
Nikita Popov 2017-02-03 18:30:40 +01:00
commit 6303dd1ea4
3 changed files with 15 additions and 4 deletions

View File

@ -4690,7 +4690,7 @@ ZEND_METHOD(reflection_class, isInstance)
}
/* }}} */
/* {{{ proto public stdclass ReflectionClass::newInstance(mixed* args, ...)
/* {{{ proto public stdclass ReflectionClass::newInstance([mixed* args], ...)
Returns an instance of this class */
ZEND_METHOD(reflection_class, newInstance)
{
@ -6388,8 +6388,8 @@ ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_isInstance, 0)
ZEND_ARG_INFO(0, object)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstance, 0)
ZEND_ARG_INFO(0, args)
ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_newInstance, 0, 0, 0)
ZEND_ARG_VARIADIC_INFO(0, args)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstanceWithoutConstructor, 0)

View File

@ -265,7 +265,7 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
Method [ <internal:Reflection> public method newInstance ] {
- Parameters [1] {
Parameter #0 [ <required> $args ]
Parameter #0 [ <optional> ...$args ]
}
}

View File

@ -0,0 +1,11 @@
--TEST--
Bug #74035: getNumberOfRequiredParameters wrong for ReflectionClass::newInstance
--FILE--
<?php
$r = new ReflectionClass(ReflectionClass::class);
$m = $r->getMethod('newInstance');
echo $m->getNumberOfRequiredParameters();
?>
--EXPECT--
0