diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 15:34:56 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 15:34:56 +0200 |
commit | cc286e5bd5385474d9783d2876ce5a486986c746 (patch) | |
tree | 5f7716e436591896ddd6cc4b1cb7482671452999 /ext/reflection/php_reflection.c | |
parent | d3ed9d819297b6d9cf52f9d1c68ec64608d60aa7 (diff) | |
parent | b964298c19c685f61542bbf30c49bd164b67c653 (diff) | |
download | php-git-cc286e5bd5385474d9783d2876ce5a486986c746.tar.gz |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/reflection/php_reflection.c')
-rw-r--r-- | ext/reflection/php_reflection.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 8e375ccc80..30f0152f90 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -6657,10 +6657,7 @@ 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) - /* 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) + ZEND_ME(reflection_type, __toString, arginfo_reflection__void, ZEND_ACC_DEPRECATED) PHP_FE_END }; |