use zend_make_string_zval(), we want to see the notices

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index e1c9e9e122f03eca427ce441f92feb110d3e4f43..3e739f153c202293500cc85552c8b681a888d020 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1671,7 +1671,7 @@ ZEND_VM_HANDLER(56, ZEND_ADD_VAR, TMP, TMP|VAR|CV)
        if (opline->extended_value == IS_UNICODE) {
                zend_make_unicode_zval(var, &var_copy, &use_copy);
        } else {
-               zend_make_printable_zval(var, &var_copy, &use_copy);
+               zend_make_string_zval(var, &var_copy, &use_copy);
        }
        if (use_copy) {
                var = &var_copy;

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 3c06458da3df21dc0d9403e1308d739b161d984e..f9798f60feba9ce83dee078d85a1f40c0fbebad0 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5837,7 +5837,7 @@ static int ZEND_ADD_VAR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (opline->extended_value == IS_UNICODE) {
                zend_make_unicode_zval(var, &var_copy, &use_copy);
        } else {
-               zend_make_printable_zval(var, &var_copy, &use_copy);
+               zend_make_string_zval(var, &var_copy, &use_copy);
        }
        if (use_copy) {
                var = &var_copy;
@@ -6285,7 +6285,7 @@ static int ZEND_ADD_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (opline->extended_value == IS_UNICODE) {
                zend_make_unicode_zval(var, &var_copy, &use_copy);
        } else {
-               zend_make_printable_zval(var, &var_copy, &use_copy);
+               zend_make_string_zval(var, &var_copy, &use_copy);
        }
        if (use_copy) {
                var = &var_copy;
@@ -6827,7 +6827,7 @@ static int ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (opline->extended_value == IS_UNICODE) {
                zend_make_unicode_zval(var, &var_copy, &use_copy);
        } else {
-               zend_make_printable_zval(var, &var_copy, &use_copy);
+               zend_make_string_zval(var, &var_copy, &use_copy);
        }
        if (use_copy) {
                var = &var_copy;