archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Made ZEND_ACC_TRAIT a saner value

Browse source 
CC_TRAIT valued as 0x120 is too magical to be comprehensible by others.
This commit is contained in:
Guilherme Blanco 2015-02-12 23:19:14 +01:00 • committed by Nikita Popov
parent a0d472e1da
commit 8c81d80e10
11 changed files with 37 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_inheritance.c
View file

@ -1126,7 +1126,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
zend_get_function_declaration(existing_fn)->val);
}
return;
} else if ((existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
} else if (existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT) {
/* two traits can't define the same non-abstract method */
#if 1
zend_error_noreturn(E_COMPILE_ERROR, "Trait method %s has not been applied, because there are collisions with other trait methods on %s",