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 da29aaa3a01cfc3c043a6f52cf0a2781a5db4a3c..c5d2d6b36b3ee45df2279f4a3dae4d9fa5814fcf 100644 (file)
--- a/Zend/tests/magic_methods_002.phpt
+++ b/Zend/tests/magic_methods_002.phpt
@@ -11,4 +11,4 @@ class foo {
 
 ?>
 --EXPECTF--
-Fatal error: The magic method __unset() must have public visibility and can not be static in %s on line %d
+Fatal error: 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 25802223c44be024d14690a2bb13454bc26faed8..c963acc4628c5a0b2b18b3da645a39497df34556 100644 (file)
--- a/Zend/tests/magic_methods_003.phpt
+++ b/Zend/tests/magic_methods_003.phpt
@@ -11,4 +11,4 @@ class foo {
 
 ?>
 --EXPECTF--
-Fatal error: The magic method __unset() must have public visibility and can not be static in %s on line %d
+Fatal error: 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 c75e454395020f98f0d4fa227a6deef8f58857c5..588bcdb8723dfca7fcdc35307f248b28c9069f66 100644 (file)
--- a/Zend/tests/magic_methods_004.phpt
+++ b/Zend/tests/magic_methods_004.phpt
@@ -11,4 +11,4 @@ class foo {
 
 ?>
 --EXPECTF--
-Fatal error: The magic method __unset() must have public visibility and can not be static in %s on line %d
+Fatal error: 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 2cf84dc997698a7f4daeac38115f6aa18616a4da..9a00f3bcba7273ea1ea98d76f34e454d8cad55b4 100644 (file)
--- a/Zend/tests/magic_methods_005.phpt
+++ b/Zend/tests/magic_methods_005.phpt
@@ -9,4 +9,4 @@ interface a {
 
 ?>
 --EXPECTF--
-Fatal error: The magic method __call() must have public visibility and can not be static in %s on line %d
+Fatal error: 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 0f3b9e521dad563f2d970152477a11bd6c12e970..44f303bbc5dc31adea5c5494de4d6f12e834be60 100644 (file)
--- a/Zend/tests/magic_methods_007.phpt
+++ b/Zend/tests/magic_methods_007.phpt
@@ -9,4 +9,4 @@ abstract class b {
 
 ?>
 --EXPECTF--
-Fatal error: The magic method __set() must have public visibility and can not be static in %s on line %d
+Fatal error: The magic method __set() must have public visibility and cannot be static in %s on line %d

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

diff --git a/Zend/tests/magic_methods_010.phpt b/Zend/tests/magic_methods_010.phpt
index 33e6b873ff8deeec97d2b4f38595f167748db4f8..d50f2f60757ec7fdeda97b58cbf98b3839e4d364 100644 (file)
--- a/Zend/tests/magic_methods_010.phpt
+++ b/Zend/tests/magic_methods_010.phpt
@@ -10,4 +10,4 @@ class a {
 
 ?>
 --EXPECTF--
-Fatal error: The magic method __toString() must have public visibility and can not be static in %s on line %d
+Fatal error: The magic method __toString() must have public visibility and cannot be static in %s on line %d

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index de57ac881943ad8b24ad4099e8f39740f11fe03d..a081979b2513eca2e66d5445c760fd8e05ea1eed 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1273,7 +1273,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
                if (CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE) {
                        if ((lcname_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __call() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "The magic method __call() must have public visibility and cannot be static");
                                }
                        } else if ((lcname_len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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) {
@@ -1281,23 +1281,23 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
                                }
                        } else if ((lcname_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __get() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "The magic method __get() must have public visibility and cannot be static");
                                }
                        } else if ((lcname_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __set() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "The magic method __set() must have public visibility and cannot be static");
                                }
                        } else if ((lcname_len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __unset() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "The magic method __unset() must have public visibility and cannot be static");
                                }
                        } else if ((lcname_len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __isset() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "The magic method __isset() must have public visibility and cannot be static");
                                }
                        } else if ((lcname_len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __toString() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "The magic method __toString() must have public visibility and cannot be static");
                                }
                        }
                } else {
@@ -1332,7 +1332,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 ((lcname_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __call() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "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 ((lcname_len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1))) {
@@ -1342,27 +1342,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 ((lcname_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __get() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "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 ((lcname_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __set() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "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 ((lcname_len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __unset() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "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 ((lcname_len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __isset() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "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 ((lcname_len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && (ZEND_U_EQUAL(Z_TYPE(function_name->u.constant), lcname, lcname_len, 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_COMPILE_ERROR, "The magic method __toString() must have public visibility and can not be static");
+                                       zend_error(E_COMPILE_ERROR, "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 bd762a2240790d849d0009f7605072312d5f3fbb..5db41a380454eff7d66d3f3d831bb097b7b411c9 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2095,7 +2095,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 %v::__construct()", ce->name);
@@ -3697,7 +3697,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 b2b89bf26d0c74ca597a7ecca11c8a6335474fcc..5463c45dbd1674ac56966f22eca56a93b4c40c0c 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2112,7 +2112,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);
                        }
 
@@ -2748,7 +2748,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 %v::__construct()", ce->name);
@@ -3339,7 +3339,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 %v::__construct()", ce->name);
@@ -3809,7 +3809,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 %v::__construct()", ce->name);
@@ -4035,7 +4035,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 %v::__construct()", ce->name);
@@ -4473,7 +4473,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 %v::__construct()", ce->name);
@@ -5526,7 +5526,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);
                        }
 
@@ -9012,7 +9012,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);
                        }
 
@@ -10832,7 +10832,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 %v::__construct()", ce->name);
@@ -12718,7 +12718,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 %v::__construct()", ce->name);
@@ -14587,7 +14587,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 %v::__construct()", ce->name);
@@ -15541,7 +15541,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 %v::__construct()", ce->name);
@@ -17050,7 +17050,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 %v::__construct()", ce->name);
@@ -23535,7 +23535,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 5706a7c004b54b97b35d04aefaefc3adf26b41a6..b9c252c4f6690f66dec414965534fa9773195022 100644 (file)
--- a/tests/classes/__call_005.phpt
+++ b/tests/classes/__call_005.phpt
@@ -22,4 +22,4 @@ $b = new B();
 $b->test();
 ?>
 --EXPECTF--
-Fatal error: The magic method __call() must have public visibility and can not be static in %s on line %d
+Fatal error: The magic method __call() must have public visibility and cannot be static in %s on line %d

diff --git a/tests/classes/__call_007.phpt b/tests/classes/__call_007.phpt
index 696ee2022f395ce8f7bbe86746604a84aa622467..6ad0003cd89d916e24b9a9c2f74fc51f903ebade 100644 (file)
--- a/tests/classes/__call_007.phpt
+++ b/tests/classes/__call_007.phpt
@@ -52,4 +52,4 @@ try {
 ?>
 ==DONE==
 --EXPECTF--
-Fatal error: The magic method __call() must have public visibility and can not be static in %s on line 3
\ No newline at end of file
+Fatal error: The magic method __call() must have public visibility and cannot be static in %s on line 3
\ No newline at end of file