summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2016-09-21 21:36:09 +0200
committerNikita Popov <nikic@php.net>2016-09-28 19:21:51 +0200
commitbf907b9961000dfb9b3bf3bd8a1e00e327a8268e (patch)
tree92281583c6e5f5449596f54ec719b0f35042719e /Zend/zend_API.c
parent4c0804c07de703826e38646bb6cc6d6ca633ddc4 (diff)
downloadphp-git-bf907b9961000dfb9b3bf3bd8a1e00e327a8268e.tar.gz
Revert ReflectionType::__toString() behavior + deprecate
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index fe2bf3711b..6ce60e1f06 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2158,7 +2158,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
internal_function->prototype = NULL;
if (ptr->flags) {
if (!(ptr->flags & ZEND_ACC_PPP_MASK)) {
- if (ptr->flags != ZEND_ACC_DEPRECATED || scope) {
+ if (ptr->flags != ZEND_ACC_DEPRECATED && scope) {
zend_error(error_type, "Invalid access level for %s%s%s() - access must be exactly one of public, protected or private", scope ? ZSTR_VAL(scope->name) : "", scope ? "::" : "", ptr->fname);
}
internal_function->fn_flags = ZEND_ACC_PUBLIC | ptr->flags;