Skip to content

Commit a7db5a5

Browse files
committed
Combine get_object_type uc/lc functions
1 parent ea0a6a8 commit a7db5a5

File tree

2 files changed

+17
-22
lines changed

2 files changed

+17
-22
lines changed

Zend/zend_API.c

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4783,30 +4783,16 @@ ZEND_API void zend_restore_error_handling(zend_error_handling *saved) /* {{{ */
47834783
}
47844784
/* }}} */
47854785

4786-
ZEND_API ZEND_COLD const char *zend_get_object_type(const zend_class_entry *ce) /* {{{ */
4786+
ZEND_API ZEND_COLD const char *zend_get_object_type_case(const zend_class_entry *ce, bool upper_case) /* {{{ */
47874787
{
4788-
if(ce->ce_flags & ZEND_ACC_TRAIT) {
4789-
return "trait";
4788+
if (ce->ce_flags & ZEND_ACC_TRAIT) {
4789+
return upper_case ? "Trait" : "trait";
47904790
} else if (ce->ce_flags & ZEND_ACC_INTERFACE) {
4791-
return "interface";
4791+
return upper_case ? "Interface" : "interface";
47924792
} else if (ce->ce_flags & ZEND_ACC_ENUM) {
4793-
return "enum";
4793+
return upper_case ? "Enum" : "enum";
47944794
} else {
4795-
return "class";
4796-
}
4797-
}
4798-
/* }}} */
4799-
4800-
ZEND_API ZEND_COLD const char *zend_get_object_type_uc(const zend_class_entry *ce) /* {{{ */
4801-
{
4802-
if(ce->ce_flags & ZEND_ACC_TRAIT) {
4803-
return "Trait";
4804-
} else if (ce->ce_flags & ZEND_ACC_INTERFACE) {
4805-
return "Interface";
4806-
} else if (ce->ce_flags & ZEND_ACC_ENUM) {
4807-
return "Enum";
4808-
} else {
4809-
return "Class";
4795+
return upper_case ? "Class" : "class";
48104796
}
48114797
}
48124798
/* }}} */

Zend/zend_API.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,8 +721,17 @@ static zend_always_inline zend_result zend_forbid_dynamic_call(void)
721721
return SUCCESS;
722722
}
723723

724-
ZEND_API ZEND_COLD const char *zend_get_object_type(const zend_class_entry *ce);
725-
ZEND_API ZEND_COLD const char *zend_get_object_type_uc(const zend_class_entry *ce);
724+
ZEND_API ZEND_COLD const char *zend_get_object_type_case(const zend_class_entry *ce, bool upper_case);
725+
726+
static zend_always_inline const char *zend_get_object_type(const zend_class_entry *ce)
727+
{
728+
return zend_get_object_type_case(ce, false);
729+
}
730+
731+
static zend_always_inline const char *zend_get_object_type_uc(const zend_class_entry *ce)
732+
{
733+
return zend_get_object_type_case(ce, true);
734+
}
726735

727736
ZEND_API bool zend_is_iterable(zval *iterable);
728737

0 commit comments

Comments
 (0)