mattwil         Sun Jun  7 15:45:47 2009 UTC

  Modified files:              
    /ZendEngine2        zend_compile.c zend_vm_def.h zend_vm_execute.h 
    /ZendEngine2/tests  call_static_006.phpt magic_methods_002.phpt 
                        magic_methods_003.phpt magic_methods_004.phpt 
                        magic_methods_005.phpt magic_methods_007.phpt 
                        magic_methods_008.phpt magic_methods_010.phpt 
    /php-src/tests/classes      __call_005.phpt __call_007.phpt 
  Log:
  Changed error messages to use "cannot" instead of "can not" (meaning "also 
can")
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.860&r2=1.861&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.860 ZendEngine2/zend_compile.c:1.861
--- ZendEngine2/zend_compile.c:1.860    Thu Jun  4 18:18:46 2009
+++ ZendEngine2/zend_compile.c  Sun Jun  7 15:45:46 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_compile.c,v 1.860 2009/06/04 18:18:46 mattwil Exp $ */
+/* $Id: zend_compile.c,v 1.861 2009/06/07 15:45:46 mattwil Exp $ */
 
 #include <zend_language_parser.h>
 #include "zend.h"
@@ -1273,7 +1273,7 @@
                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 @@
                                }
                        } 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 @@
                                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 @@
                                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)) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.268&r2=1.269&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.268 ZendEngine2/zend_vm_def.h:1.269
--- ZendEngine2/zend_vm_def.h:1.268     Fri Jun  5 11:21:16 2009
+++ ZendEngine2/zend_vm_def.h   Sun Jun  7 15:45:46 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_vm_def.h,v 1.268 2009/06/05 11:21:16 lbarnaud Exp $ */
+/* $Id: zend_vm_def.h,v 1.269 2009/06/07 15:45:46 mattwil Exp $ */
 
 /* If you change this file, please regenerate the zend_vm_execute.h and
  * zend_vm_opcodes.h files by running:
@@ -2095,7 +2095,7 @@
                }
        } 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 @@
                        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);
                        }
 
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.272&r2=1.273&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.272 ZendEngine2/zend_vm_execute.h:1.273
--- ZendEngine2/zend_vm_execute.h:1.272 Fri Jun  5 11:21:16 2009
+++ ZendEngine2/zend_vm_execute.h       Sun Jun  7 15:45:46 2009
@@ -2112,7 +2112,7 @@
                        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 @@
                }
        } 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 @@
                }
        } 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 @@
                }
        } 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 @@
                }
        } 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 @@
                }
        } 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 @@
                        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 @@
                        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 @@
                }
        } 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 @@
                }
        } 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 @@
                }
        } 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 @@
                }
        } 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 @@
                }
        } 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 @@
                        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);
                        }
 
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/call_static_006.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/call_static_006.phpt
diff -u ZendEngine2/tests/call_static_006.phpt:1.3 
ZendEngine2/tests/call_static_006.phpt:1.4
--- ZendEngine2/tests/call_static_006.phpt:1.3  Tue Jun  3 17:09:29 2008
+++ ZendEngine2/tests/call_static_006.phpt      Sun Jun  7 15:45:46 2009
@@ -27,4 +27,4 @@
 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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/magic_methods_002.phpt
diff -u ZendEngine2/tests/magic_methods_002.phpt:1.1 
ZendEngine2/tests/magic_methods_002.phpt:1.2
--- ZendEngine2/tests/magic_methods_002.phpt:1.1        Tue Jun  3 13:55:47 2008
+++ ZendEngine2/tests/magic_methods_002.phpt    Sun Jun  7 15:45:46 2009
@@ -11,4 +11,4 @@
 
 ?>
 --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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_003.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/magic_methods_003.phpt
diff -u ZendEngine2/tests/magic_methods_003.phpt:1.1 
ZendEngine2/tests/magic_methods_003.phpt:1.2
--- ZendEngine2/tests/magic_methods_003.phpt:1.1        Tue Jun  3 13:55:47 2008
+++ ZendEngine2/tests/magic_methods_003.phpt    Sun Jun  7 15:45:46 2009
@@ -11,4 +11,4 @@
 
 ?>
 --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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_004.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/magic_methods_004.phpt
diff -u ZendEngine2/tests/magic_methods_004.phpt:1.1 
ZendEngine2/tests/magic_methods_004.phpt:1.2
--- ZendEngine2/tests/magic_methods_004.phpt:1.1        Tue Jun  3 13:55:47 2008
+++ ZendEngine2/tests/magic_methods_004.phpt    Sun Jun  7 15:45:46 2009
@@ -11,4 +11,4 @@
 
 ?>
 --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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_005.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/magic_methods_005.phpt
diff -u ZendEngine2/tests/magic_methods_005.phpt:1.1 
ZendEngine2/tests/magic_methods_005.phpt:1.2
--- ZendEngine2/tests/magic_methods_005.phpt:1.1        Tue Jun  3 13:55:47 2008
+++ ZendEngine2/tests/magic_methods_005.phpt    Sun Jun  7 15:45:46 2009
@@ -9,4 +9,4 @@
 
 ?>
 --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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_007.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/magic_methods_007.phpt
diff -u ZendEngine2/tests/magic_methods_007.phpt:1.1 
ZendEngine2/tests/magic_methods_007.phpt:1.2
--- ZendEngine2/tests/magic_methods_007.phpt:1.1        Tue Jun  3 13:55:47 2008
+++ ZendEngine2/tests/magic_methods_007.phpt    Sun Jun  7 15:45:46 2009
@@ -9,4 +9,4 @@
 
 ?>
 --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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_008.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/magic_methods_008.phpt
diff -u ZendEngine2/tests/magic_methods_008.phpt:1.1 
ZendEngine2/tests/magic_methods_008.phpt:1.2
--- ZendEngine2/tests/magic_methods_008.phpt:1.1        Tue Jun  3 13:55:47 2008
+++ ZendEngine2/tests/magic_methods_008.phpt    Sun Jun  7 15:45:46 2009
@@ -14,4 +14,4 @@
 
 ?>
 --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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_010.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/magic_methods_010.phpt
diff -u ZendEngine2/tests/magic_methods_010.phpt:1.1 
ZendEngine2/tests/magic_methods_010.phpt:1.2
--- ZendEngine2/tests/magic_methods_010.phpt:1.1        Tue Jun  3 13:55:47 2008
+++ ZendEngine2/tests/magic_methods_010.phpt    Sun Jun  7 15:45:46 2009
@@ -10,4 +10,4 @@
 
 ?>
 --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
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__call_005.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/tests/classes/__call_005.phpt
diff -u php-src/tests/classes/__call_005.phpt:1.4 
php-src/tests/classes/__call_005.phpt:1.5
--- php-src/tests/classes/__call_005.phpt:1.4   Tue Jun  3 13:55:47 2008
+++ php-src/tests/classes/__call_005.phpt       Sun Jun  7 15:45:46 2009
@@ -22,4 +22,4 @@
 $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
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__call_007.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/classes/__call_007.phpt
diff -u php-src/tests/classes/__call_007.phpt:1.1 
php-src/tests/classes/__call_007.phpt:1.2
--- php-src/tests/classes/__call_007.phpt:1.1   Fri Dec  5 22:12:03 2008
+++ php-src/tests/classes/__call_007.phpt       Sun Jun  7 15:45:46 2009
@@ -52,4 +52,4 @@
 ?>
 ==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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to