From 0ed3b00406a4486635ce6086d9bb3ed585b89a1d Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Sun, 4 Mar 2012 18:33:33 +0000 Subject: [PATCH] Fixed Bug #60911 (Confusing error message when extending traits) --- Zend/tests/traits/bug55524.phpt | 2 +- Zend/zend_compile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/tests/traits/bug55524.phpt b/Zend/tests/traits/bug55524.phpt index 1911cde130..137975980d 100644 --- a/Zend/tests/traits/bug55524.phpt +++ b/Zend/tests/traits/bug55524.phpt @@ -12,4 +12,4 @@ trait Foo extends Base { echo 'DONE'; ?> --EXPECTF-- -Fatal error: A trait (Foo) cannot extend a class in %s on line %d +Fatal error: A trait (Foo) cannot extend a class. Traits can only be composed from other traits with the 'use' keyword. Error in %s on line %d diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a7b130d8fd..88c5020a29 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4995,7 +4995,7 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name 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); + zend_error(E_COMPILE_ERROR, "A trait (%s) cannot extend a class. Traits can only be composed from other traits with the 'use' keyword. Error", new_class_entry->name); } opline->extended_value = parent_class_name->u.op.var; -- 2.40.0