Commit 3efeb2afedd for php
commit 3efeb2afedd673ee3dc05a650e64bd4ef926af72
Author: Weilin Du <weilindu@php.net>
Date: Fri Oct 16 00:21:43 2026 +0800
ext/standard: Simplify type alias handling in settype() (#24348)
diff --git a/ext/standard/type.c b/ext/standard/type.c
index dc99dac93da..2755f08d88d 100644
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -98,13 +98,11 @@ PHP_FUNCTION(settype)
} else {
ptr = Z_REFVAL_P(var);
}
- if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_INTEGER))) {
+ if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_INTEGER))
+ || zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_INT))) {
convert_to_long(ptr);
- } else if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_INT))) {
- convert_to_long(ptr);
- } else if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_FLOAT))) {
- convert_to_double(ptr);
- } else if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_DOUBLE))) {
+ } else if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_FLOAT))
+ || zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_DOUBLE))) {
convert_to_double(ptr);
} else if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_STRING))) {
convert_to_string(ptr);
@@ -112,9 +110,8 @@ PHP_FUNCTION(settype)
convert_to_array(ptr);
} else if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_OBJECT))) {
convert_to_object(ptr);
- } else if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_BOOL))) {
- convert_to_boolean(ptr);
- } else if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_BOOLEAN))) {
+ } else if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_BOOL))
+ || zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_BOOLEAN))) {
convert_to_boolean(ptr);
} else if (zend_string_equals_ci(type, ZSTR_KNOWN(ZEND_STR_NULL_LOWERCASE))) {
convert_to_null(ptr);