From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 12 Feb 2017 21:02:39 +0000 (+0100)
Subject: Revert "Fixed bug #74035"
X-Git-Tag: php-7.0.17RC1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb1373e509a69a48e90e6dd4c2dda1348e19b776;p=php

Revert "Fixed bug #74035"

This reverts commit 9ffc6ca62f53431a4b32b30cdda8180142f47cdb.
---

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 7c21904991..7d703262f1 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_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 89b36fd254..b9a9b0d559 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 [ <optional> ...$args ]
+        Parameter #0 [ <required> $args ]
       }
     }
 
diff --git a/ext/reflection/tests/bug74035.phpt b/ext/reflection/tests/bug74035.phpt
deleted file mode 100644
index 74cf03f5e5..0000000000
--- a/ext/reflection/tests/bug74035.phpt
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-Bug #74035: getNumberOfRequiredParameters wrong for ReflectionClass::newInstance
---FILE--
-<?php
-$r = new ReflectionClass(ReflectionClass::class);
-$m = $r->getMethod('newInstance');
-
-echo $m->getNumberOfRequiredParameters();
-?>
---EXPECT--
-0