mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-19 06:50:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #55524 Traits should not be able to extend a class

Browse Source 
# also used the Z_STRVAL where it seemed appropriate
This commit is contained in:
Stefan Marr 2011-08-29 15:53:46 +00:00
parent bf78161b94
commit 117e072941
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Zend/tests/traits/bug55524.phpt Normal file
View File

@ -0,0 +1,15 @@
--TEST--
Bug #55524 Traits should not be able to extend a class
--FILE--
<?php
class Base {}
trait Foo extends Base {
function bar() {}
}
echo 'DONE';
?>
--EXPECTF--
Fatal error: A trait (Foo) cannot extend a class in %s on line %d

7
Zend/zend_compile.c
View File

@ -4640,7 +4640,7 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name
if (!(strcmp(lcname, "self") && strcmp(lcname, "parent"))) {
efree(lcname);
zend_error(E_COMPILE_ERROR, "Cannot use '%s' as class name as it is reserved", class_name->u.constant.value.str.val);
zend_error(E_COMPILE_ERROR, "Cannot use '%s' as class name as it is reserved", Z_STRVAL(class_name->u.constant));
}
/* Class name must not conflict with import names */
@ -4707,6 +4707,11 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name
opline->op2_type = IS_CONST;
if (doing_inheritance) {
/* Make sure a trait does not try to extend a class */
if ((new_class_entry->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
zend_error(E_COMPILE_ERROR, "A trait (%s) cannot extend a class", new_class_entry->name);
}
opline->extended_value = parent_class_name->u.op.var;
opline->opcode = ZEND_DECLARE_INHERITED_CLASS;
} else {