File tree 2 files changed +17
-22
lines changed
2 files changed +17
-22
lines changed Original file line number Diff line number Diff line change @@ -4783,30 +4783,16 @@ ZEND_API void zend_restore_error_handling(zend_error_handling *saved) /* {{{ */
4783
4783
}
4784
4784
/* }}} */
4785
4785
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 ) /* {{{ */
4787
4787
{
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" ;
4790
4790
} else if (ce -> ce_flags & ZEND_ACC_INTERFACE ) {
4791
- return "interface" ;
4791
+ return upper_case ? "Interface" : "interface" ;
4792
4792
} else if (ce -> ce_flags & ZEND_ACC_ENUM ) {
4793
- return "enum" ;
4793
+ return upper_case ? "Enum" : "enum" ;
4794
4794
} 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" ;
4810
4796
}
4811
4797
}
4812
4798
/* }}} */
Original file line number Diff line number Diff line change @@ -721,8 +721,17 @@ static zend_always_inline zend_result zend_forbid_dynamic_call(void)
721
721
return SUCCESS ;
722
722
}
723
723
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
+ }
726
735
727
736
ZEND_API bool zend_is_iterable (zval * iterable );
728
737
You can’t perform that action at this time.
0 commit comments