Cleanup type conversion

Author: dstogov

Zend/zend_API.c

@@ -3237,7 +3237,7 @@ ZEND_API zend_string *zend_get_callable_name_ex(zval *callable, zend_object *obj
 			callable = Z_REFVAL_P(callable);
 			goto try_again;
 		default:
-			return zval_get_string(callable);
+			return zval_get_string_func(callable);
 	}
 }
 /* }}} */

Zend/zend_compile.c

@@ -2568,7 +2568,7 @@ static int zend_try_compile_cv(znode *result, zend_ast *ast) /* {{{ */
 		if (EXPECTED(Z_TYPE_P(zv) == IS_STRING)) {
 			name = zval_make_interned_string(zv);
 		} else {
-			name = zend_new_interned_string(zval_get_string(zv));
+			name = zend_new_interned_string(zval_get_string_func(zv));
 		}
 
 		if (zend_is_auto_global(name)) {

Zend/zend_execute.c

@@ -2812,7 +2812,7 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval
 
 	ZVAL_UNDEF(&tmp_inc_filename);
 	if (Z_TYPE_P(inc_filename) != IS_STRING) {
-		ZVAL_STR(&tmp_inc_filename, zval_get_string(inc_filename));
+		ZVAL_STR(&tmp_inc_filename, zval_get_string_func(inc_filename));
 		inc_filename = &tmp_inc_filename;
 	}