diff options
| author | andrewnester <andrew.nester.dev@gmail.com> | 2017-02-03 11:57:16 +0300 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-03 18:29:39 +0100 |
| commit | 9ffc6ca62f53431a4b32b30cdda8180142f47cdb (patch) | |
| tree | 2953075aa1f25d785f47301eb3cd1a0cb39b5b05 | |
| parent | 6988d070ea8c7d44452d8c98e594d65ea722a1d8 (diff) | |
| download | php-git-9ffc6ca62f53431a4b32b30cdda8180142f47cdb.tar.gz | |
Fixed bug #74035
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/reflection/php_reflection.c | 6 | ||||
| -rw-r--r-- | ext/reflection/tests/ReflectionClass_toString_001.phpt | 2 | ||||
| -rw-r--r-- | ext/reflection/tests/bug74035.phpt | 11 |
4 files changed, 19 insertions, 4 deletions
@@ -20,6 +20,10 @@ PHP NEWS . Fixed bug #74022 (PHP Fast CGI crashes when reading from a pfx file). (Anatol) +- Reflection: + . Fixed bug #74035 (getNumberOfRequiredParameters wrong for + ReflectionClass::newInstance). (Andrew Nester) + - Standard: . Fixed bug #74005 (mail.add_x_header causes RFC-breaking lone line feed). (Anatol) diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 7d703262f1..7c21904991 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4586,7 +4586,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) { @@ -6273,8 +6273,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) diff --git a/ext/reflection/tests/ReflectionClass_toString_001.phpt b/ext/reflection/tests/ReflectionClass_toString_001.phpt index b9a9b0d559..89b36fd254 100644 --- a/ext/reflection/tests/ReflectionClass_toString_001.phpt +++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt @@ -252,7 +252,7 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] { Method [ <internal:Reflection> public method newInstance ] { - Parameters [1] { - Parameter #0 [ <required> $args ] + Parameter #0 [ <optional> ...$args ] } } diff --git a/ext/reflection/tests/bug74035.phpt b/ext/reflection/tests/bug74035.phpt new file mode 100644 index 0000000000..74cf03f5e5 --- /dev/null +++ b/ext/reflection/tests/bug74035.phpt @@ -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 |