MFH: Changed error messages to use "cannot" instead of "can not" (meaning "also can")

diff --git a/Zend/tests/call_static_006.phpt b/Zend/tests/call_static_006.phpt
index 6d6b3ca776b8d43083087484fed754623eba81f3..e172f4e164f9d4c969426257ba655dcbb83475ed 100644 (file)
--- a/Zend/tests/call_static_006.phpt
+++ b/Zend/tests/call_static_006.phpt
@@ -27,4 +27,4 @@ ok
 Strict Standards: Non-static method foo::aa() should not be called statically in %s on line %d
 ok
 
-Fatal error: Can not call constructor in %s on line %d
+Fatal error: Cannot call constructor in %s on line %d

diff --git a/Zend/tests/magic_methods_002.phpt b/Zend/tests/magic_methods_002.phpt
index 1e8305e23769a6f23a67cc254d58e160d74d0a79..fe0a4dcc3dff6ecec51c0cbd4a49d9d9f001a6df 100644 (file)
--- a/Zend/tests/magic_methods_002.phpt
+++ b/Zend/tests/magic_methods_002.phpt
@@ -11,4 +11,4 @@ class foo {
 
 ?>
 --EXPECTF--
-Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d

diff --git a/Zend/tests/magic_methods_003.phpt b/Zend/tests/magic_methods_003.phpt
index 1118a23ba0527d45454fd18730054eb23a4ba783..be354ecc304943a43048ee07d3ccb10a1e8bfbda 100644 (file)
--- a/Zend/tests/magic_methods_003.phpt
+++ b/Zend/tests/magic_methods_003.phpt
@@ -11,4 +11,4 @@ class foo {
 
 ?>
 --EXPECTF--
-Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d

diff --git a/Zend/tests/magic_methods_004.phpt b/Zend/tests/magic_methods_004.phpt
index 0ac332cb3619f35e9ef1be369c29cd0732f198da..33a0a60c0951529feddb29715ca9e07fdbf55627 100644 (file)
--- a/Zend/tests/magic_methods_004.phpt
+++ b/Zend/tests/magic_methods_004.phpt
@@ -11,4 +11,4 @@ class foo {
 
 ?>
 --EXPECTF--
-Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d

diff --git a/Zend/tests/magic_methods_005.phpt b/Zend/tests/magic_methods_005.phpt
index 8e8bb4e8a2730416562117bab9be0500d05c62d6..76ab30087eab97b1cc6591818b360f8f9767eddd 100644 (file)
--- a/Zend/tests/magic_methods_005.phpt
+++ b/Zend/tests/magic_methods_005.phpt
@@ -9,4 +9,4 @@ interface a {
 
 ?>
 --EXPECTF--
-Warning: The magic method __call() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __call() must have public visibility and cannot be static in %s on line %d

diff --git a/Zend/tests/magic_methods_007.phpt b/Zend/tests/magic_methods_007.phpt
index d949c95aeccebfa7f694c59440774ec50294b1f0..0630c63e9f6caba518d12a615ca2d3ecf5c3af5d 100644 (file)
--- a/Zend/tests/magic_methods_007.phpt
+++ b/Zend/tests/magic_methods_007.phpt
@@ -9,6 +9,6 @@ abstract class b {
 
 ?>
 --EXPECTF--
-Warning: The magic method __set() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __set() must have public visibility and cannot be static in %s on line %d
 
 Fatal error: Method b::__set() must take exactly 2 arguments in %s on line %d

diff --git a/Zend/tests/magic_methods_008.phpt b/Zend/tests/magic_methods_008.phpt
index 3d9b69728d290c2ff82511a25f81c64d47242004..61c4fa0a29f587250a84d98ddee5393650e5d312 100644 (file)
--- a/Zend/tests/magic_methods_008.phpt
+++ b/Zend/tests/magic_methods_008.phpt
@@ -14,6 +14,6 @@ class a extends b {
 
 ?>
 --EXPECTF--
-Warning: The magic method __set() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __set() must have public visibility and cannot be static in %s on line %d
 
 Fatal error: Access level to a::__set() must be public (as in class b) in %s on line %d

diff --git a/Zend/tests/magic_methods_010.phpt b/Zend/tests/magic_methods_010.phpt
index d50b357242c11bd744d77ae28b506bf81fc0d52f..06d46dbd2872ac6150dda988a77a249582237aff 100644 (file)
--- a/Zend/tests/magic_methods_010.phpt
+++ b/Zend/tests/magic_methods_010.phpt
@@ -10,6 +10,6 @@ class a {
 
 ?>
 --EXPECTF--
-Warning: The magic method __toString() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __toString() must have public visibility and cannot be static in %s on line %d
 
 Fatal error: Method a::__tostring() cannot take arguments in %s on line %d

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 96bea45431483b49821d4a2d0abd2893dd62e0f9..49524b0f1bd444c8f350e0e0dce6ec79daa7eca6 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1211,7 +1211,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
                if (CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE) {
                        if ((name_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __call() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __call() must have public visibility and cannot be static");
                                }
                        } else if ((name_len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1))) {
                                if ((fn_flags & (ZEND_ACC_PPP_MASK ^ ZEND_ACC_PUBLIC)) || (fn_flags & ZEND_ACC_STATIC) == 0) {
@@ -1219,23 +1219,23 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
                                }
                        } else if ((name_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __get() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __get() must have public visibility and cannot be static");
                                }
                        } else if ((name_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __set() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __set() must have public visibility and cannot be static");
                                }
                        } else if ((name_len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __unset() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __unset() must have public visibility and cannot be static");
                                }
                        } else if ((name_len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __isset() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __isset() must have public visibility and cannot be static");
                                }
                        } else if ((name_len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __toString() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __toString() must have public visibility and cannot be static");
                                }
                        }
                } else {
@@ -1271,7 +1271,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
                                CG(active_class_entry)->clone = (zend_function *) CG(active_op_array);
                        } else if ((name_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __call() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __call() must have public visibility and cannot be static");
                                }
                                CG(active_class_entry)->__call = (zend_function *) CG(active_op_array);
                        } else if ((name_len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1))) {
@@ -1281,27 +1281,27 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
                                CG(active_class_entry)->__callstatic = (zend_function *) CG(active_op_array);
                        } else if ((name_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __get() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __get() must have public visibility and cannot be static");
                                }
                                CG(active_class_entry)->__get = (zend_function *) CG(active_op_array);
                        } else if ((name_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __set() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __set() must have public visibility and cannot be static");
                                }
                                CG(active_class_entry)->__set = (zend_function *) CG(active_op_array);
                        } else if ((name_len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __unset() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __unset() must have public visibility and cannot be static");
                                }
                                CG(active_class_entry)->__unset = (zend_function *) CG(active_op_array);
                        } else if ((name_len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __isset() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __isset() must have public visibility and cannot be static");
                                }
                                CG(active_class_entry)->__isset = (zend_function *) CG(active_op_array);
                        } else if ((name_len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)-1))) {
                                if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
-                                       zend_error(E_WARNING, "The magic method __toString() must have public visibility and can not be static");
+                                       zend_error(E_WARNING, "The magic method __toString() must have public visibility and cannot be static");
                                }                               
                                CG(active_class_entry)->__tostring = (zend_function *) CG(active_op_array);
                        } else if (!(fn_flags & ZEND_ACC_STATIC)) {

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index af3205f03e430242d0bb3352370da9f001922f48..233574d2aa0be5dccbd292303d0b11de10254b7f 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2031,7 +2031,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMP|VAR|UNUS
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -3543,7 +3543,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY)
                        ALLOC_INIT_ZVAL(array_ptr);
                } else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
                        if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) {
-                               zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class");
+                               zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
                                ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num);
                        }
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 24794f7db0fb5d732862e20e45f1aeaaee6d7bf3..2c3e7875a477a7f5204eed6dcb7b073348af0f1e 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2080,7 +2080,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
                        ALLOC_INIT_ZVAL(array_ptr);
                } else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
                        if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) {
-                               zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class");
+                               zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
                                ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num);
                        }
 
@@ -2677,7 +2677,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -3248,7 +3248,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -3714,7 +3714,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -3936,7 +3936,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -4370,7 +4370,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -5342,7 +5342,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
                        ALLOC_INIT_ZVAL(array_ptr);
                } else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
                        if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) {
-                               zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class");
+                               zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
                                ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num);
                        }
 
@@ -8687,7 +8687,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
                        ALLOC_INIT_ZVAL(array_ptr);
                } else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
                        if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) {
-                               zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class");
+                               zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
                                ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num);
                        }
 
@@ -10423,7 +10423,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -12228,7 +12228,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -14028,7 +14028,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -14922,7 +14922,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -16415,7 +16415,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_
                }
        } else {
                if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
+                       zend_error_noreturn(E_ERROR, "Cannot call constructor");
                }
                if (EG(This) && 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);
@@ -22527,7 +22527,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                        ALLOC_INIT_ZVAL(array_ptr);
                } else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
                        if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) {
-                               zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class");
+                               zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
                                ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num);
                        }
 

diff --git a/tests/classes/__call_005.phpt b/tests/classes/__call_005.phpt
index 53c063aaf24a9ce363bfe4977a31c8ae394e1d79..6e1584878e1d45383c4f7f1ad4325a3a6f67cb55 100644 (file)
--- a/tests/classes/__call_005.phpt
+++ b/tests/classes/__call_005.phpt
@@ -22,7 +22,7 @@ $b = new B();
 $b->test();
 ?>
 --EXPECTF--
-Warning: The magic method __call() must have public visibility and can not be static in %s__call_005.php on line 3
+Warning: The magic method __call() must have public visibility and cannot be static in %s__call_005.php on line 3
 In A::__call(test1, array(1,a))
 object(B)#1 (0) {
 }

diff --git a/tests/classes/__call_007.phpt b/tests/classes/__call_007.phpt
index de225547db39da35f67ea3fdb6ad3660330d04db..d79dba3bf6da039a1e548c9f1dcabc3d06aac87e 100644 (file)
--- a/tests/classes/__call_007.phpt
+++ b/tests/classes/__call_007.phpt
@@ -52,7 +52,7 @@ try {
 ?>
 ==DONE==
 --EXPECTF--
-Warning: The magic method __call() must have public visibility and can not be static in %s on line 3
+Warning: The magic method __call() must have public visibility and cannot be static in %s on line 3
 ---> Invoke __call via simple method call.
 NULL
 Exception caught OK; continuing.