%s -> %v

ce names are in Unicode

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index b5dabb3ef4ed86ce0dd8cc90909a6caba7043c69..bace5032abf85970a51a21df15516512dfb21710 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1790,7 +1790,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, ANY, CONST|TMP|VAR|UNUSED|CV)
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f2240949ad1c0322470830f1ea556640f9f4f1e6..a5be1cd4589f18dbc4e9f87cbcb827242de12a32 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -681,7 +681,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }
@@ -902,7 +902,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }
@@ -1038,7 +1038,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }
@@ -1173,7 +1173,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }
@@ -1266,7 +1266,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                        zend_error_noreturn(E_ERROR, "Can not call constructor");
                }
                if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
-                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }