mattwil Sun Jun 7 15:46:58 2009 UTC
Modified files: (Branch: PHP_5_3)
/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:
MFH: 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.647.2.27.2.41.2.108&r2=1.647.2.27.2.41.2.109&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.108
ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.109
--- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.108 Thu Jun 4 18:20:42 2009
+++ ZendEngine2/zend_compile.c Sun Jun 7 15:46:51 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.108 2009/06/04 18:20:42 mattwil Exp
$ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.109 2009/06/07 15:46:51 mattwil Exp
$ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -1211,7 +1211,7 @@
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 @@
}
} 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 @@
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 @@
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)) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.59.2.29.2.48.2.94&r2=1.59.2.29.2.48.2.95&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.94
ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.95
--- ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.94 Fri Jun 5 11:21:31 2009
+++ ZendEngine2/zend_vm_def.h Sun Jun 7 15:46:51 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.94 2009/06/05 11:21:31 lbarnaud Exp $
*/
+/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.95 2009/06/07 15:46:51 mattwil Exp $
*/
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
@@ -2031,7 +2031,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
%s::__construct()", ce->name);
@@ -3543,7 +3543,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.62.2.30.2.49.2.94&r2=1.62.2.30.2.49.2.95&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.94
ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.95
--- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.94 Fri Jun 5 11:21:31 2009
+++ ZendEngine2/zend_vm_execute.h Sun Jun 7 15:46:51 2009
@@ -2080,7 +2080,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);
}
@@ -2677,7 +2677,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
%s::__construct()", ce->name);
@@ -3248,7 +3248,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
%s::__construct()", ce->name);
@@ -3714,7 +3714,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
%s::__construct()", ce->name);
@@ -3936,7 +3936,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
%s::__construct()", ce->name);
@@ -4370,7 +4370,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
%s::__construct()", ce->name);
@@ -5342,7 +5342,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);
}
@@ -8687,7 +8687,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);
}
@@ -10423,7 +10423,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
%s::__construct()", ce->name);
@@ -12228,7 +12228,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
%s::__construct()", ce->name);
@@ -14028,7 +14028,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
%s::__construct()", ce->name);
@@ -14922,7 +14922,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
%s::__construct()", ce->name);
@@ -16415,7 +16415,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
%s::__construct()", ce->name);
@@ -22527,7 +22527,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.1.2.3&r2=1.1.2.4&diff_format=u
Index: ZendEngine2/tests/call_static_006.phpt
diff -u ZendEngine2/tests/call_static_006.phpt:1.1.2.3
ZendEngine2/tests/call_static_006.phpt:1.1.2.4
--- ZendEngine2/tests/call_static_006.phpt:1.1.2.3 Tue Jun 3 17:10:21 2008
+++ ZendEngine2/tests/call_static_006.phpt Sun Jun 7 15:46:54 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.2.3&r2=1.1.2.4&diff_format=u
Index: ZendEngine2/tests/magic_methods_002.phpt
diff -u ZendEngine2/tests/magic_methods_002.phpt:1.1.2.3
ZendEngine2/tests/magic_methods_002.phpt:1.1.2.4
--- ZendEngine2/tests/magic_methods_002.phpt:1.1.2.3 Tue Jun 10 23:09:09 2008
+++ ZendEngine2/tests/magic_methods_002.phpt Sun Jun 7 15:46:54 2009
@@ -11,4 +11,4 @@
?>
--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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_003.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: ZendEngine2/tests/magic_methods_003.phpt
diff -u ZendEngine2/tests/magic_methods_003.phpt:1.1.2.3
ZendEngine2/tests/magic_methods_003.phpt:1.1.2.4
--- ZendEngine2/tests/magic_methods_003.phpt:1.1.2.3 Tue Jun 10 23:09:09 2008
+++ ZendEngine2/tests/magic_methods_003.phpt Sun Jun 7 15:46:54 2009
@@ -11,4 +11,4 @@
?>
--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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_004.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: ZendEngine2/tests/magic_methods_004.phpt
diff -u ZendEngine2/tests/magic_methods_004.phpt:1.1.2.3
ZendEngine2/tests/magic_methods_004.phpt:1.1.2.4
--- ZendEngine2/tests/magic_methods_004.phpt:1.1.2.3 Tue Jun 10 23:09:09 2008
+++ ZendEngine2/tests/magic_methods_004.phpt Sun Jun 7 15:46:54 2009
@@ -11,4 +11,4 @@
?>
--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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_005.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: ZendEngine2/tests/magic_methods_005.phpt
diff -u ZendEngine2/tests/magic_methods_005.phpt:1.1.2.3
ZendEngine2/tests/magic_methods_005.phpt:1.1.2.4
--- ZendEngine2/tests/magic_methods_005.phpt:1.1.2.3 Tue Jun 10 23:09:09 2008
+++ ZendEngine2/tests/magic_methods_005.phpt Sun Jun 7 15:46:54 2009
@@ -9,4 +9,4 @@
?>
--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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_007.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: ZendEngine2/tests/magic_methods_007.phpt
diff -u ZendEngine2/tests/magic_methods_007.phpt:1.1.2.3
ZendEngine2/tests/magic_methods_007.phpt:1.1.2.4
--- ZendEngine2/tests/magic_methods_007.phpt:1.1.2.3 Tue Jun 10 23:09:09 2008
+++ ZendEngine2/tests/magic_methods_007.phpt Sun Jun 7 15:46:54 2009
@@ -9,6 +9,6 @@
?>
--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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_008.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: ZendEngine2/tests/magic_methods_008.phpt
diff -u ZendEngine2/tests/magic_methods_008.phpt:1.1.2.3
ZendEngine2/tests/magic_methods_008.phpt:1.1.2.4
--- ZendEngine2/tests/magic_methods_008.phpt:1.1.2.3 Tue Jun 10 23:09:09 2008
+++ ZendEngine2/tests/magic_methods_008.phpt Sun Jun 7 15:46:54 2009
@@ -14,6 +14,6 @@
?>
--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
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/magic_methods_010.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: ZendEngine2/tests/magic_methods_010.phpt
diff -u ZendEngine2/tests/magic_methods_010.phpt:1.1.2.3
ZendEngine2/tests/magic_methods_010.phpt:1.1.2.4
--- ZendEngine2/tests/magic_methods_010.phpt:1.1.2.3 Tue Jun 10 23:09:09 2008
+++ ZendEngine2/tests/magic_methods_010.phpt Sun Jun 7 15:46:54 2009
@@ -10,6 +10,6 @@
?>
--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
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__call_005.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index: php-src/tests/classes/__call_005.phpt
diff -u php-src/tests/classes/__call_005.phpt:1.1.4.4
php-src/tests/classes/__call_005.phpt:1.1.4.5
--- php-src/tests/classes/__call_005.phpt:1.1.4.4 Wed Jun 11 06:30:09 2008
+++ php-src/tests/classes/__call_005.phpt Sun Jun 7 15:46:54 2009
@@ -22,7 +22,7 @@
$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) {
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__call_007.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/tests/classes/__call_007.phpt
diff -u php-src/tests/classes/__call_007.phpt:1.1.4.2
php-src/tests/classes/__call_007.phpt:1.1.4.3
--- php-src/tests/classes/__call_007.phpt:1.1.4.2 Fri Dec 5 22:12:07 2008
+++ php-src/tests/classes/__call_007.phpt Sun Jun 7 15:46:54 2009
@@ -52,7 +52,7 @@
?>
==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.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
