diff options
| author | Nikita Popov <nikic@php.net> | 2016-09-27 19:26:50 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-09-28 19:21:53 +0200 |
| commit | f70fb05138e9d5dd2126eadec0377abf705dec74 (patch) | |
| tree | 764781390f5ee700f3009dd5bc3a114080d21398 | |
| parent | bf907b9961000dfb9b3bf3bd8a1e00e327a8268e (diff) | |
| download | php-git-f70fb05138e9d5dd2126eadec0377abf705dec74.tar.gz | |
Don't mark ReflectionType::__toString() as deprecated for now
| -rw-r--r-- | ext/reflection/php_reflection.c | 5 | ||||
| -rw-r--r-- | ext/reflection/tests/ReflectionNamedType.phpt | 10 | ||||
| -rw-r--r-- | ext/reflection/tests/bug72661.phpt | 3 |
3 files changed, 6 insertions, 12 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 47c09d4521..52d35409d3 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -6701,7 +6701,10 @@ static const zend_function_entry reflection_type_functions[] = { ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) ZEND_ME(reflection_type, allowsNull, arginfo_reflection__void, 0) ZEND_ME(reflection_type, isBuiltin, arginfo_reflection__void, 0) - ZEND_ME(reflection_type, __toString, arginfo_reflection__void, ZEND_ACC_DEPRECATED) + /* ReflectionType::__toString() is deprecated, but we currently do not mark it as such + * due to bad interaction with the PHPUnit error handler and exceptions in __toString(). + * See PR2137. */ + ZEND_ME(reflection_type, __toString, arginfo_reflection__void, 0) PHP_FE_END }; diff --git a/ext/reflection/tests/ReflectionNamedType.phpt b/ext/reflection/tests/ReflectionNamedType.phpt index afb592127c..a40d4066ec 100644 --- a/ext/reflection/tests/ReflectionNamedType.phpt +++ b/ext/reflection/tests/ReflectionNamedType.phpt @@ -30,20 +30,12 @@ var_dump($return->getName()); var_dump((string) $return); ?> ---EXPECTF-- +--EXPECT-- string(11) "Traversable" - -Deprecated: Function ReflectionType::__toString() is deprecated in %s on line %d string(11) "Traversable" string(6) "string" - -Deprecated: Function ReflectionType::__toString() is deprecated in %s on line %d string(6) "string" string(4) "Test" - -Deprecated: Function ReflectionType::__toString() is deprecated in %s on line %d string(4) "Test" string(4) "Test" - -Deprecated: Function ReflectionType::__toString() is deprecated in %s on line %d string(4) "Test" diff --git a/ext/reflection/tests/bug72661.phpt b/ext/reflection/tests/bug72661.phpt index 1522c5f201..40d14922b8 100644 --- a/ext/reflection/tests/bug72661.phpt +++ b/ext/reflection/tests/bug72661.phpt @@ -6,6 +6,5 @@ function test(iterable $arg) { } var_dump((string)(new ReflectionParameter("test", 0))->getType()); ?> ---EXPECTF-- -Deprecated: Function ReflectionType::__toString() is deprecated in %s on line %d +--EXPECT-- string(8) "iterable" |