diff options
| author | Stefan Marr <gron@php.net> | 2011-10-31 22:59:00 +0000 |
|---|---|---|
| committer | Stefan Marr <gron@php.net> | 2011-10-31 22:59:00 +0000 |
| commit | 2e5d5e5ac64daab299cd04382df92c3fd4fa17f6 (patch) | |
| tree | ec1e1b9b57cbf591a30e820d9cd76e21b3628693 | |
| parent | c4eb5f238783397860524719427507f34ecea0f1 (diff) | |
| download | php-git-2e5d5e5ac64daab299cd04382df92c3fd4fa17f6.tar.gz | |
Fixed Bug #60173 (Wrong error message on reflective trait instantiation)
| -rw-r--r-- | Zend/tests/traits/bug60173.phpt | 12 | ||||
| -rw-r--r-- | Zend/zend_API.c | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Zend/tests/traits/bug60173.phpt b/Zend/tests/traits/bug60173.phpt new file mode 100644 index 0000000000..a28a1033a0 --- /dev/null +++ b/Zend/tests/traits/bug60173.phpt @@ -0,0 +1,12 @@ +--TEST-- +Bug #60173 (Wrong error message on reflective trait instantiation) +--FILE-- +<?php + +trait foo { } + +$rc = new ReflectionClass('foo'); +$rc->newInstance(); + +--EXPECTF-- +Fatal error: Cannot instantiate trait foo in %s on line %d diff --git a/Zend/zend_API.c b/Zend/zend_API.c index ed2f6d6e38..95afc13d9c 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1107,7 +1107,9 @@ ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type zend_object *object; if (class_type->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) { - char *what = class_type->ce_flags & ZEND_ACC_INTERFACE ? "interface" : "abstract class"; + char *what = (class_type->ce_flags & ZEND_ACC_INTERFACE) ? "interface" + :((class_type->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) ? "trait" + : "abstract class"; zend_error(E_ERROR, "Cannot instantiate %s %s", what, class_type->name); } |