diff options
| author | Sara Golemon <pollita@php.net> | 2017-11-06 17:52:35 -0500 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-11-06 17:52:35 -0500 |
| commit | c33008339e604bccf5f9d2cf15a8aa49dd4977d7 (patch) | |
| tree | b0bb6b9c4c8f5ae8022ce82537dda3ec4276cd81 | |
| parent | e36244e7763f4671f7cc36bb23f37db825d2ce67 (diff) | |
| parent | f70ca770b657f2d0dfe2b44f369c266e1ae15ab2 (diff) | |
| download | php-git-c33008339e604bccf5f9d2cf15a8aa49dd4977d7.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Revert BC break caused by fixing bug #74035
| -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 |
3 files changed, 4 insertions, 15 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 6f19fc77fc..4291883ce9 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4722,7 +4722,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) { @@ -6444,8 +6444,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 |