diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-12 22:03:21 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-12 22:03:31 +0100 |
| commit | 134d0b33a3bc18044c44deb1b33755e69b0c5631 (patch) | |
| tree | a343947cf281f1eac853647e145054757810daed | |
| parent | d28df113d5b85ba36b1f75f8346d0965dd53ec04 (diff) | |
| parent | eb1373e509a69a48e90e6dd4c2dda1348e19b776 (diff) | |
| download | php-git-134d0b33a3bc18044c44deb1b33755e69b0c5631.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -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, 4 insertions, 19 deletions
@@ -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 e10f5e86b0..a06522d025 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 2b185db57d..29d58420e3 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 |