From 9d6e0154c04a6eaf85a77a6b1d3ddba5c74122cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Tue, 17 Dec 2024 10:40:52 +0100 Subject: [PATCH 1/2] =?UTF-8?q?phpdbg:=20Call=20enums=20=E2=80=9CEnum?= =?UTF-8?q?=E2=80=9D=20in=20`info=20classes`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapi/phpdbg/phpdbg_info.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c index d64703755cbe0..e4be342a7521d 100644 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@ -374,7 +374,10 @@ PHPDBG_INFO(memory) /* {{{ */ static inline void phpdbg_print_class_name(zend_class_entry *ce) /* {{{ */ { const char *visibility = ce->type == ZEND_USER_CLASS ? "User" : "Internal"; - const char *type = (ce->ce_flags & ZEND_ACC_INTERFACE) ? "Interface" : (ce->ce_flags & ZEND_ACC_ABSTRACT) ? "Abstract Class" : "Class"; + const char *type = (ce->ce_flags & ZEND_ACC_INTERFACE) ? "Interface" + : (ce->ce_flags & ZEND_ACC_ABSTRACT) ? "Abstract Class" + : (ce->ce_flags & ZEND_ACC_ENUM) ? "Enum" + : "Class"; phpdbg_writeln("%s %s %.*s (%d)", visibility, type, (int) ZSTR_LEN(ce->name), ZSTR_VAL(ce->name), zend_hash_num_elements(&ce->function_table)); } /* }}} */ From 78ba490bac8264ef251f02d172153bbae7484c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Tue, 17 Dec 2024 17:26:10 +0100 Subject: [PATCH 2/2] =?UTF-8?q?phpdbg:=20Call=20traits=20=E2=80=9CTrait?= =?UTF-8?q?=E2=80=9D=20in=20`info=20classes`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapi/phpdbg/phpdbg_info.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c index e4be342a7521d..b329bdac728bb 100644 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@ -377,6 +377,7 @@ static inline void phpdbg_print_class_name(zend_class_entry *ce) /* {{{ */ const char *type = (ce->ce_flags & ZEND_ACC_INTERFACE) ? "Interface" : (ce->ce_flags & ZEND_ACC_ABSTRACT) ? "Abstract Class" : (ce->ce_flags & ZEND_ACC_ENUM) ? "Enum" + : (ce->ce_flags & ZEND_ACC_TRAIT) ? "Trait" : "Class"; phpdbg_writeln("%s %s %.*s (%d)", visibility, type, (int) ZSTR_LEN(ce->name), ZSTR_VAL(ce->name), zend_hash_num_elements(&ce->function_table));