summaryrefslogtreecommitdiff
path: root/Zend/zend_inheritance.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2018-07-09 16:28:13 +0300
committerDmitry Stogov <dmitry@zend.com>2018-07-09 16:28:13 +0300
commit797e87060ccf1dc54809765d5494488cde7176fb (patch)
tree79da983987a5749c1d7dcf4c3cfa7d739cda2e9c /Zend/zend_inheritance.c
parent117c37da76152a85aa348a829beacbac8fcda5c3 (diff)
downloadphp-git-797e87060ccf1dc54809765d5494488cde7176fb.tar.gz
Avoid reloading
Diffstat (limited to 'Zend/zend_inheritance.c')
-rw-r--r--Zend/zend_inheritance.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index 1873d76007..e9c85021bc 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -557,7 +557,7 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function *
/* You cannot change from static to non static and vice versa.
*/
if (UNEXPECTED((child_flags & ZEND_ACC_STATIC) != (parent_flags & ZEND_ACC_STATIC))) {
- if (child->common.fn_flags & ZEND_ACC_STATIC) {
+ if (child_flags & ZEND_ACC_STATIC) {
zend_error_noreturn(E_COMPILE_ERROR, "Cannot make non static method %s::%s() static in class %s", ZEND_FN_SCOPE_NAME(parent), ZSTR_VAL(child->common.function_name), ZEND_FN_SCOPE_NAME(child));
} else {
zend_error_noreturn(E_COMPILE_ERROR, "Cannot make static method %s::%s() non static in class %s", ZEND_FN_SCOPE_NAME(parent), ZSTR_VAL(child->common.function_name), ZEND_FN_SCOPE_NAME(child));