@@ -98,23 +98,20 @@ PHP_FUNCTION(settype)
9898 } else {
9999 ptr = Z_REFVAL_P (var );
100100 }
101- if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_INTEGER ))) {
101+ if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_INTEGER ))
102+ || zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_INT ))) {
102103 convert_to_long (ptr );
103- } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_INT ))) {
104- convert_to_long (ptr );
105- } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_FLOAT ))) {
106- convert_to_double (ptr );
107- } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_DOUBLE ))) {
104+ } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_FLOAT ))
105+ || zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_DOUBLE ))) {
108106 convert_to_double (ptr );
109107 } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_STRING ))) {
110108 convert_to_string (ptr );
111109 } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_ARRAY ))) {
112110 convert_to_array (ptr );
113111 } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_OBJECT ))) {
114112 convert_to_object (ptr );
115- } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_BOOL ))) {
116- convert_to_boolean (ptr );
117- } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_BOOLEAN ))) {
113+ } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_BOOL ))
114+ || zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_BOOLEAN ))) {
118115 convert_to_boolean (ptr );
119116 } else if (zend_string_equals_ci (type , ZSTR_KNOWN (ZEND_STR_NULL_LOWERCASE ))) {
120117 convert_to_null (ptr );
0 commit comments