summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zend/tests/call_static_006.phpt2
-rw-r--r--Zend/tests/magic_methods_002.phpt2
-rw-r--r--Zend/tests/magic_methods_003.phpt2
-rw-r--r--Zend/tests/magic_methods_004.phpt2
-rw-r--r--Zend/tests/magic_methods_005.phpt2
-rw-r--r--Zend/tests/magic_methods_007.phpt2
-rw-r--r--Zend/tests/magic_methods_008.phpt2
-rw-r--r--Zend/tests/magic_methods_010.phpt2
-rw-r--r--Zend/zend_compile.c24
-rw-r--r--Zend/zend_vm_def.h4
-rw-r--r--Zend/zend_vm_execute.h28
-rw-r--r--tests/classes/__call_005.phpt2
-rw-r--r--tests/classes/__call_007.phpt2
13 files changed, 38 insertions, 38 deletions
diff --git a/Zend/tests/call_static_006.phpt b/Zend/tests/call_static_006.phpt
index 6d6b3ca776..e172f4e164 100644
--- 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 1e8305e237..fe0a4dcc3d 100644
--- 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 1118a23ba0..be354ecc30 100644
--- 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 0ac332cb36..33a0a60c09 100644
--- 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 8e8bb4e8a2..76ab30087e 100644
--- 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 d949c95aec..0630c63e9f 100644
--- 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 3d9b69728d..61c4fa0a29 100644
--- 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 d50b357242..06d46dbd28 100644
--- 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 96bea45431..49524b0f1b 100644
--- 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 af3205f03e..233574d2aa 100644
--- 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 24794f7db0..2c3e7875a4 100644
--- 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 53c063aaf2..6e1584878e 100644
--- 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 de225547db..d79dba3bf6 100644
--- 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.
View Lorry Controller Status