diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-21 22:44:45 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-04-21 22:44:45 +0800 |
| commit | 29c449ce98147610f964c8d3681faaf979748fc0 (patch) | |
| tree | fe887e52c063ee4ca0bc1ee0c54acf98a217ba56 | |
| parent | ceb992501be4cc18c22f652a23c28cea683afe00 (diff) | |
| parent | a50869387413c884b079fd5773c680965fb1b23a (diff) | |
| download | php-git-29c449ce98147610f964c8d3681faaf979748fc0.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | Zend/zend_compile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 82cfb33124..0f343e7f14 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4059,7 +4059,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const zend_get_function_declaration(fn TSRMLS_CC), zend_get_function_declaration(existing_fn TSRMLS_CC)); } - } else if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) { + } else if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) { /* Make sure the abstract declaration is compatible with previous declaration */ if (!zend_traits_method_compatibility_check(existing_fn, fn TSRMLS_CC)) { zend_error_noreturn(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s", |