From: Michael Moravec <mail@majkl578.cz>
Date: Thu, 2 Nov 2017 18:22:37 +0000 (+0100)
Subject: Revert BC break caused by fixing bug #74035
X-Git-Tag: php-7.2.0RC6~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f70ca770b657f2d0dfe2b44f369c266e1ae15ab2;p=php

Revert BC break caused by fixing bug #74035

This reverts commit 9ffc6ca62f53431a4b32b30cdda8180142f47cdb.
---

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index a87ecddae4..6cf0392a73 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -4715,7 +4715,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)
 {
@@ -6419,8 +6419,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 5a2b497905..179d63afad 100644
--- a/ext/reflection/tests/ReflectionClass_toString_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt
@@ -265,7 +265,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