archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0' into PHP-7.1

Browse source
This commit is contained in:
Nikita Popov 2017-02-12 22:03:21 +01:00
commit 134d0b33a3
4 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -37,10 +37,6 @@ PHP NEWS
. Fixed bug #74022 (PHP Fast CGI crashes when reading from a pfx file). . Fixed bug #74022 (PHP Fast CGI crashes when reading from a pfx file).
(Anatol) (Anatol)
- Reflection:
. Fixed bug #74035 (getNumberOfRequiredParameters wrong for
ReflectionClass::newInstance). (Andrew Nester)
- Standard: - Standard:
. Fixed bug #74005 (mail.add_x_header causes RFC-breaking lone line feed). . Fixed bug #74005 (mail.add_x_header causes RFC-breaking lone line feed).
(Anatol) (Anatol)

6
ext/reflection/php_reflection.c
View file

@ -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 */ Returns an instance of this class */
ZEND_METHOD(reflection_class, newInstance) ZEND_METHOD(reflection_class, newInstance)
{ {
@ -6514,8 +6514,8 @@ ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_isInstance, 0)
ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, object)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_newInstance, 0, 0, 0) ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstance, 0)
ZEND_ARG_VARIADIC_INFO(0, args) ZEND_ARG_INFO(0, args)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstanceWithoutConstructor, 0) ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstanceWithoutConstructor, 0)

2
ext/reflection/tests/ReflectionClass_toString_001.phpt
View file

@ -265,7 +265,7 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
Method [ <internal:Reflection> public method newInstance ] { Method [ <internal:Reflection> public method newInstance ] {
- Parameters [1] { - Parameters [1] {
Parameter #0 [ <optional> ...$args ] Parameter #0 [ <required> $args ]
} }
} }

11
ext/reflection/tests/bug74035.phpt
View file

@ -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