diff options
| author | Julien Pauli <jpauli@php.net> | 2014-11-21 15:50:27 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-11-21 15:50:27 +0100 |
| commit | ab3525c40124cd569fbde32a0bb123348b1048bc (patch) | |
| tree | eef9de8007c34155141769cecc7b6cf7865513db | |
| parent | 64b9277867cb0da1a68a122b0a9fe6dfb78d9c84 (diff) | |
| parent | cd3b46f28af49e5eaaa687d5d186e641ce147853 (diff) | |
| download | php-git-ab3525c40124cd569fbde32a0bb123348b1048bc.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix #68185 - Inconsistent insteadof definition
Conflicts:
Zend/zend_compile.c
| -rw-r--r-- | Zend/zend_compile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 19185dfb70..8e416ea0a5 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4246,8 +4246,8 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* /* make sure that the trait method is not from a class mentioned in exclude_from_classes, for consistency */ - if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[i]) { - zend_error_noreturn(E_COMPILE_ERROR, + if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[j]) { + zend_error(E_COMPILE_ERROR, "Inconsistent insteadof definition. " "The method %s is to be used from %s, but %s is also on the exclude list", cur_method_ref->method_name, |