diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-27 12:43:23 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-27 12:43:23 +0100 |
| commit | 9b7a78b1c2228974d74c5bdf1774ddfdf3e9f1d7 (patch) | |
| tree | e6d2e63d349294c744132064a448e5fa6f948165 /Zend/zend_inheritance.c | |
| parent | 7873c7965173fc40ebe040b0c9d4a5971de1a077 (diff) | |
| parent | 251f293cb7e6fa603885e912e455725efe4cd94e (diff) | |
| download | php-git-9b7a78b1c2228974d74c5bdf1774ddfdf3e9f1d7.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index ed6d30886e..4e20526f58 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -639,7 +639,10 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function * error_level = E_WARNING; error_verb = "should"; } - zend_error(error_level, "Declaration of %s %s be compatible with %s", ZSTR_VAL(child_prototype), error_verb, ZSTR_VAL(method_prototype)); + zend_error_at(error_level, NULL, + child->common.type == ZEND_USER_FUNCTION ? child->op_array.line_start : 0, + "Declaration of %s %s be compatible with %s", + ZSTR_VAL(child_prototype), error_verb, ZSTR_VAL(method_prototype)); zend_string_efree(child_prototype); zend_string_efree(method_prototype); } |