cvs: ZendEngine2 / zend_execute.c /tests unset_cv01.phpt unset_cv02.phpt unset_cv03.phpt unset_cv04.phpt unset_cv06.phpt unset_cv08.phpt
unset_cv09.phpt unset_cv10.phpt

dmitry Fri Dec 24 03:24:55 2004 EDT Modified files: /ZendEngine2 zend_execute.c /ZendEngine2/tests unset_cv01.phpt unset_cv02.phpt unset_cv03.phpt unset_cv04.phpt unset_cv06.phpt unset_cv08.phpt unset_cv09.phpt unset_cv10.phpt Log: "Undefined variable: %s" noticies were fixed to be compatible with PHP_5_0 http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.685&r2=1.686&ty=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.685 ZendEngine2/zend_execute.c:1.686 --- ZendEngine2/zend_execute.c:1.685 Wed Nov 3 18:05:18 2004 +++ ZendEngine2/zend_execute.c Fri Dec 24 03:24:55 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.685 2004/11/03 23:05:18 moriyoshi Exp $ */ +/* $Id: zend_execute.c,v 1.686 2004/12/24 08:24:55 dmitry Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -211,13 +211,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE, "Undefined variable: %s", cv->name); + zend_error(E_NOTICE, "Undefined variable: %s", cv->name); /* break missing intentionally */ case BP_VAR_IS: return &EG(uninitialized_zval); break; case BP_VAR_RW: - zend_error(E_NOTICE, "Undefined variable: %s", cv->name); + zend_error(E_NOTICE, "Undefined variable: %s", cv->name); /* break missing intentionally */ case BP_VAR_W: zend_get_cv_address(cv, ptr, Ts TSRMLS_CC); @@ -331,13 +331,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE, "Undefined variable: %s", cv->name); + zend_error(E_NOTICE, "Undefined variable: %s", cv->name); /* break missing intentionally */ case BP_VAR_IS: return &EG(uninitialized_zval); break; case BP_VAR_RW: - zend_error(E_NOTICE, "Undefined variable: %s", cv->name); + zend_error(E_NOTICE, "Undefined variable: %s", cv->name); /* break missing intentionally */ case BP_VAR_W: zend_get_cv_address(cv, ptr, Ts TSRMLS_CC); http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv01.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/unset_cv01.phpt diff -u ZendEngine2/tests/unset_cv01.phpt:1.1 ZendEngine2/tests/unset_cv01.phpt:1.2 --- ZendEngine2/tests/unset_cv01.phpt:1.1 Tue Oct 5 02:53:39 2004 +++ ZendEngine2/tests/unset_cv01.phpt Fri Dec 24 03:24:55 2004 @@ -10,4 +10,4 @@ --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv01.php on line %d +Notice: Undefined variable: x in %sunset_cv01.php on line %d http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv02.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/unset_cv02.phpt diff -u ZendEngine2/tests/unset_cv02.phpt:1.1 ZendEngine2/tests/unset_cv02.phpt:1.2 --- ZendEngine2/tests/unset_cv02.phpt:1.1 Tue Oct 5 02:53:39 2004 +++ ZendEngine2/tests/unset_cv02.phpt Fri Dec 24 03:24:55 2004 @@ -10,4 +10,4 @@ --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv02.php on line %d +Notice: Undefined variable: x in %sunset_cv02.php on line %d http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv03.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/unset_cv03.phpt diff -u ZendEngine2/tests/unset_cv03.phpt:1.1 ZendEngine2/tests/unset_cv03.phpt:1.2 --- ZendEngine2/tests/unset_cv03.phpt:1.1 Tue Oct 5 02:53:39 2004 +++ ZendEngine2/tests/unset_cv03.phpt Fri Dec 24 03:24:55 2004 @@ -10,4 +10,4 @@ --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv03.php on line %d +Notice: Undefined variable: x in %sunset_cv03.php on line %d http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv04.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/unset_cv04.phpt diff -u ZendEngine2/tests/unset_cv04.phpt:1.1 ZendEngine2/tests/unset_cv04.phpt:1.2 --- ZendEngine2/tests/unset_cv04.phpt:1.1 Tue Oct 5 02:53:39 2004 +++ ZendEngine2/tests/unset_cv04.phpt Fri Dec 24 03:24:55 2004 @@ -13,4 +13,4 @@ --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv04.php on line %d +Notice: Undefined variable: x in %sunset_cv04.php on line %d http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv06.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv06.phpt diff -u ZendEngine2/tests/unset_cv06.phpt:1.2 ZendEngine2/tests/unset_cv06.phpt:1.3 --- ZendEngine2/tests/unset_cv06.phpt:1.2 Tue Oct 5 09:21:06 2004 +++ ZendEngine2/tests/unset_cv06.phpt Fri Dec 24 03:24:55 2004 @@ -20,5 +20,5 @@ 1 2 -Notice: Undefined variable: x in %sunset_cv06.php on line %d +Notice: Undefined variable: x in %sunset_cv06.php on line %d ok http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv08.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/unset_cv08.phpt diff -u ZendEngine2/tests/unset_cv08.phpt:1.1 ZendEngine2/tests/unset_cv08.phpt:1.2 --- ZendEngine2/tests/unset_cv08.phpt:1.1 Tue Oct 5 02:53:39 2004 +++ ZendEngine2/tests/unset_cv08.phpt Fri Dec 24 03:24:55 2004 @@ -12,5 +12,5 @@ --EXPECTF-- ok -Notice: Undefined variable: b in %sunset_cv08.php on line %d +Notice: Undefined variable: b in %sunset_cv08.php on line %d ok http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv09.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/unset_cv09.phpt diff -u ZendEngine2/tests/unset_cv09.phpt:1.1 ZendEngine2/tests/unset_cv09.phpt:1.2 --- ZendEngine2/tests/unset_cv09.phpt:1.1 Tue Oct 5 02:53:39 2004 +++ ZendEngine2/tests/unset_cv09.phpt Fri Dec 24 03:24:55 2004 @@ -10,5 +10,5 @@ --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv09.php on line %d +Notice: Undefined variable: x in %sunset_cv09.php on line %d ok http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv10.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/unset_cv10.phpt diff -u ZendEngine2/tests/unset_cv10.phpt:1.1 ZendEngine2/tests/unset_cv10.phpt:1.2 --- ZendEngine2/tests/unset_cv10.phpt:1.1 Tue Oct 5 02:53:39 2004 +++ ZendEngine2/tests/unset_cv10.phpt Fri Dec 24 03:24:55 2004 @@ -14,5 +14,5 @@ --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv10.php on line %d +Notice: Undefined variable: x in %sunset_cv10.php on line %d ok