- Speling

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 57d5dd456767b41b9621dd9720801fd29aad8336..30b2e0151c4ec538444f135d6e1654bd5363901d 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1764,7 +1764,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::__constrcut()", ce->name);
+                       zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
                }
                EX(fbc) = ce->constructor;
        }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 111cd42ffa1fafffe85534f3b7efe55e7684de43..b7d20571463e11a39a2482ea81f4d23d21a8a558 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -670,8 +670,8 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
                if(!ce->constructor) {
                        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::__constrcut()", ce->name);
+               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);
                }
                EX(fbc) = ce->constructor;
        }
@@ -874,8 +874,8 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
                if(!ce->constructor) {
                        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::__constrcut()", ce->name);
+               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);
                }
                EX(fbc) = ce->constructor;
        }
@@ -1035,8 +1035,8 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
                if(!ce->constructor) {
                        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::__constrcut()", ce->name);
+               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);
                }
                EX(fbc) = ce->constructor;
        }
@@ -1195,8 +1195,8 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
                if(!ce->constructor) {
                        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::__constrcut()", ce->name);
+               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);
                }
                EX(fbc) = ce->constructor;
        }
@@ -1288,8 +1288,8 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                if(!ce->constructor) {
                        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::__constrcut()", ce->name);
+               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);
                }
                EX(fbc) = ce->constructor;
        }

diff --git a/tests/classes/ctor_visibility.phpt b/tests/classes/ctor_visibility.phpt
index afc823cb82d618fa7c52cc014af6d2c159695f1f..8d3b1c5c501be33ac19a22c861d75143f578ed02 100755 (executable)
--- a/tests/classes/ctor_visibility.phpt
+++ b/tests/classes/ctor_visibility.phpt
@@ -66,4 +66,4 @@ Test::__construct()
 TestPriv::__construct()
 DerivedPriv::__construct()
 
-Fatal error: Cannot call private TestPriv::__constrcut() in %sctor_visibility.php on line %d
+Fatal error: Cannot call private TestPriv::__construct() in %sctor_visibility.php on line %d