diff options
| author | Marcus Boerger <helly@php.net> | 2006-08-08 00:40:19 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2006-08-08 00:40:19 +0000 |
| commit | 05206b42d86b9ddd99d16157576959225fecddae (patch) | |
| tree | 67a58e9c5151d5e92f78781739910ae0571bf8d8 | |
| parent | efc6ff0c3954d6abe4e544715e457600b0d5be20 (diff) | |
| download | php-git-05206b42d86b9ddd99d16157576959225fecddae.tar.gz | |
- Speling
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 20 | ||||
| -rwxr-xr-x | tests/classes/ctor_visibility.phpt | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 57d5dd4567..30b2e0151c 100644 --- 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 111cd42ffa..b7d2057146 100644 --- 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 afc823cb82..8d3b1c5c50 100755 --- 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 |