com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_c ompile.c

Commit: ef8c8eaa9583130029facf2817d2c5c4b01f1c41 Author: Dmitry Stogov <dmitry@zend.com> Tue, 19 Mar 2013 13:07:32 +0400 Parents: f621f0b8e7f1a2d061d37e16f71bcb2000c2a786 e62bb0325763d9847847dd198e05c9b3147caf05 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ef8c8eaa9583130029facf2817d2c5c4b01f1c41 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error) Conflicts: NEWS Zend/zend_compile.c Bugs: https://bugs.php.net/64417 Changed paths: MM Zend/zend_compile.c Diff: diff --cc Zend/zend_compile.c index aa1df99,766a2de..6df3def --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@@ -3829,10 -3632,10 +3829,10 @@@ static zend_bool zend_traits_method_com { zend_uint fn_flags = fn->common.scope->ce_flags; zend_uint other_flags = other_fn->common.scope->ce_flags; - + return zend_do_perform_implementation_check(fn, other_fn TSRMLS_CC) - && zend_do_perform_implementation_check(other_fn, fn TSRMLS_CC) + && ((other_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) || zend_do_perform_implementation_check(other_fn, fn TSRMLS_CC)) - && ((fn_flags & (ZEND_ACC_FINAL|ZEND_ACC_STATIC)) == + && ((fn_flags & (ZEND_ACC_FINAL|ZEND_ACC_STATIC)) == (other_flags & (ZEND_ACC_FINAL|ZEND_ACC_STATIC))); /* equal final and static qualifier */ } /* }}} */