diff --git a/NEWS b/NEWS index 3a179686144..6fa6d883b18 100644 --- a/NEWS +++ b/NEWS @@ -37,10 +37,6 @@ 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 e10f5e86b0c..a06522d025b 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4813,7 +4813,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) { @@ -6514,8 +6514,8 @@ ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_isInstance, 0) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_newInstance, 0, 0, 0) - ZEND_ARG_VARIADIC_INFO(0, args) +ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstance, 0) + ZEND_ARG_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 2b185db57d7..29d58420e37 100644 --- a/ext/reflection/tests/ReflectionClass_toString_001.phpt +++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt @@ -265,7 +265,7 @@ Class [ class ReflectionClass implements Reflector ] { Method [ public method newInstance ] { - Parameters [1] { - Parameter #0 [ ...$args ] + Parameter #0 [ $args ] } } diff --git a/ext/reflection/tests/bug74035.phpt b/ext/reflection/tests/bug74035.phpt deleted file mode 100644 index 74cf03f5e5d..00000000000 --- a/ext/reflection/tests/bug74035.phpt +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Bug #74035: getNumberOfRequiredParameters wrong for ReflectionClass::newInstance ---FILE-- -getMethod('newInstance'); - -echo $m->getNumberOfRequiredParameters(); -?> ---EXPECT-- -0