summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/reflection/php_reflection.c2
-rw-r--r--ext/reflection/tests/traits002.phpt2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 9b85b79d81..2d8ba6e0c2 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -382,7 +382,7 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in
}
if (ce->ce_flags & ZEND_ACC_INTERFACE) {
string_printf(str, "interface ");
- } else if (ce->ce_flags & ZEND_ACC_TRAIT) {
+ } else if ((ce->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
string_printf(str, "trait ");
} else {
if (ce->ce_flags & (ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {
diff --git a/ext/reflection/tests/traits002.phpt b/ext/reflection/tests/traits002.phpt
index fc0dd59b2e..b55b288aa0 100644
--- a/ext/reflection/tests/traits002.phpt
+++ b/ext/reflection/tests/traits002.phpt
@@ -15,7 +15,7 @@ reflectionclass::export('bar');
?>
--EXPECTF--
-Class [ <user> trait foo ] {
+Class [ <user> abstract class foo ] {
@@ %s 3-4
- Constants [0] {