summaryrefslogtreecommitdiff
path: root/ext/reflection/php_reflection.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2016-09-27 19:26:50 +0200
committerNikita Popov <nikic@php.net>2016-09-28 19:21:53 +0200
commitf70fb05138e9d5dd2126eadec0377abf705dec74 (patch)
tree764781390f5ee700f3009dd5bc3a114080d21398 /ext/reflection/php_reflection.c
parentbf907b9961000dfb9b3bf3bd8a1e00e327a8268e (diff)
downloadphp-git-f70fb05138e9d5dd2126eadec0377abf705dec74.tar.gz
Don't mark ReflectionType::__toString() as deprecated for now
Diffstat (limited to 'ext/reflection/php_reflection.c')
-rw-r--r--ext/reflection/php_reflection.c5
1 files changed, 4 insertions, 1 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
};