cvs: php-src /tests/classes static_this.phpt ZendEngine2 zend_execute.c zend_vm_def.h zend_vm_execute.h ZendEngine2/tests bug22836.phpt
unset_cv01.phpt unset_cv02.phpt unset_cv03.phpt unset_cv04.phpt unset_cv06.phpt unset_cv08.phpt unset_cv09.phpt unset_cv10.phpt
| From: | Dmitry Stogov | Date: | Mon, 27 Dec 2004 13:43:26 +0000 |
| Subject: | cvs: php-src /tests/classes static_this.phpt ZendEngine2 zend_execute.c zend_vm_def.h zend_vm_execute.h ZendEngine2/tests bug22836.phpt unset_cv01.phpt unset_cv02.phpt unset_cv03.phpt unset_cv04.phpt unset_cv06.phpt unset_cv08.phpt unset_cv09.phpt unset_cv10.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29669@lists.php.net to get a copy of this message | ||
dmitry Mon Dec 27 08:43:26 2004 EDT
Modified files:
/ZendEngine2 zend_execute.c zend_vm_def.h zend_vm_execute.h
/ZendEngine2/tests bug22836.phpt unset_cv01.phpt unset_cv02.phpt
unset_cv03.phpt unset_cv04.phpt unset_cv06.phpt
unset_cv08.phpt unset_cv09.phpt unset_cv10.phpt
/php-src/tests/classes static_this.phpt
Log:
"Undefined variable: %s" noticies were fixed to use one space
http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.686&r2=1.687&ty=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.686 ZendEngine2/zend_execute.c:1.687 --- ZendEngine2/zend_execute.c:1.686 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/zend_execute.c Mon Dec 27 08:43:25 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.686 2004/12/24 08:24:55 dmitry Exp $ */ +/* $Id: zend_execute.c,v 1.687 2004/12/27 13:43:25 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); @@ -245,13 +245,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_ptr); 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); @@ -390,13 +390,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_ptr); 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/zend_vm_def.h?r1=1.5&r2=1.6&ty=u Index: ZendEngine2/zend_vm_def.h diff -u ZendEngine2/zend_vm_def.h:1.5 ZendEngine2/zend_vm_def.h:1.6 --- ZendEngine2/zend_vm_def.h:1.5 Fri Dec 24 04:00:29 2004 +++ ZendEngine2/zend_vm_def.h Mon Dec 27 08:43:25 2004 @@ -882,13 +882,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); http://cvs.php.net/diff.php/ZendEngine2/zend_vm_execute.h?r1=1.6&r2=1.7&ty=u Index: ZendEngine2/zend_vm_execute.h diff -u ZendEngine2/zend_vm_execute.h:1.6 ZendEngine2/zend_vm_execute.h:1.7 --- ZendEngine2/zend_vm_execute.h:1.6 Fri Dec 24 04:00:29 2004 +++ ZendEngine2/zend_vm_execute.h Mon Dec 27 08:43:25 2004 @@ -1312,13 +1312,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); @@ -3699,13 +3699,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); @@ -6666,13 +6666,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); @@ -17425,13 +17425,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); @@ -28496,13 +28496,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); http://cvs.php.net/diff.php/ZendEngine2/tests/bug22836.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug22836.phpt diff -u ZendEngine2/tests/bug22836.phpt:1.2 ZendEngine2/tests/bug22836.phpt:1.3 --- ZendEngine2/tests/bug22836.phpt:1.2 Tue Feb 10 04:15:01 2004 +++ ZendEngine2/tests/bug22836.phpt Mon Dec 27 08:43:26 2004 @@ -19,55 +19,55 @@ string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv01.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv01.phpt diff -u ZendEngine2/tests/unset_cv01.phpt:1.2 ZendEngine2/tests/unset_cv01.phpt:1.3 --- ZendEngine2/tests/unset_cv01.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv01.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv02.phpt diff -u ZendEngine2/tests/unset_cv02.phpt:1.2 ZendEngine2/tests/unset_cv02.phpt:1.3 --- ZendEngine2/tests/unset_cv02.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv02.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv03.phpt diff -u ZendEngine2/tests/unset_cv03.phpt:1.2 ZendEngine2/tests/unset_cv03.phpt:1.3 --- ZendEngine2/tests/unset_cv03.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv03.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv04.phpt diff -u ZendEngine2/tests/unset_cv04.phpt:1.2 ZendEngine2/tests/unset_cv04.phpt:1.3 --- ZendEngine2/tests/unset_cv04.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv04.phpt Mon Dec 27 08:43:26 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.3&r2=1.4&ty=u Index: ZendEngine2/tests/unset_cv06.phpt diff -u ZendEngine2/tests/unset_cv06.phpt:1.3 ZendEngine2/tests/unset_cv06.phpt:1.4 --- ZendEngine2/tests/unset_cv06.phpt:1.3 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv06.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv08.phpt diff -u ZendEngine2/tests/unset_cv08.phpt:1.2 ZendEngine2/tests/unset_cv08.phpt:1.3 --- ZendEngine2/tests/unset_cv08.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv08.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv09.phpt diff -u ZendEngine2/tests/unset_cv09.phpt:1.2 ZendEngine2/tests/unset_cv09.phpt:1.3 --- ZendEngine2/tests/unset_cv09.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv09.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv10.phpt diff -u ZendEngine2/tests/unset_cv10.phpt:1.2 ZendEngine2/tests/unset_cv10.phpt:1.3 --- ZendEngine2/tests/unset_cv10.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv10.phpt Mon Dec 27 08:43:26 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 http://cvs.php.net/diff.php/php-src/tests/classes/static_this.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/tests/classes/static_this.phpt diff -u php-src/tests/classes/static_this.phpt:1.1 php-src/tests/classes/static_this.phpt:1.2 --- php-src/tests/classes/static_this.phpt:1.1 Mon Oct 4 13:30:53 2004 +++ php-src/tests/classes/static_this.phpt Mon Dec 27 08:43:26 2004 @@ -29,10 +29,10 @@ ===DONE=== --EXPECTF-- -Notice: Undefined variable: this in %sstatic_this.php on line %d +Notice: Undefined variable: this in %sstatic_this.php on line %d NULL -Notice: Undefined variable: this in %sstatic_this.php on line %d +Notice: Undefined variable: this in %sstatic_this.php on line %d NULL object(stdClass)#%d (0) { }
http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.686&r2=1.687&ty=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.686 ZendEngine2/zend_execute.c:1.687 --- ZendEngine2/zend_execute.c:1.686 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/zend_execute.c Mon Dec 27 08:43:25 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.686 2004/12/24 08:24:55 dmitry Exp $ */ +/* $Id: zend_execute.c,v 1.687 2004/12/27 13:43:25 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); @@ -245,13 +245,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_ptr); 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); @@ -390,13 +390,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_ptr); 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/zend_vm_def.h?r1=1.5&r2=1.6&ty=u Index: ZendEngine2/zend_vm_def.h diff -u ZendEngine2/zend_vm_def.h:1.5 ZendEngine2/zend_vm_def.h:1.6 --- ZendEngine2/zend_vm_def.h:1.5 Fri Dec 24 04:00:29 2004 +++ ZendEngine2/zend_vm_def.h Mon Dec 27 08:43:25 2004 @@ -882,13 +882,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); http://cvs.php.net/diff.php/ZendEngine2/zend_vm_execute.h?r1=1.6&r2=1.7&ty=u Index: ZendEngine2/zend_vm_execute.h diff -u ZendEngine2/zend_vm_execute.h:1.6 ZendEngine2/zend_vm_execute.h:1.7 --- ZendEngine2/zend_vm_execute.h:1.6 Fri Dec 24 04:00:29 2004 +++ ZendEngine2/zend_vm_execute.h Mon Dec 27 08:43:25 2004 @@ -1312,13 +1312,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); @@ -3699,13 +3699,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); @@ -6666,13 +6666,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); @@ -17425,13 +17425,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); @@ -28496,13 +28496,13 @@ switch (type) { case BP_VAR_R: case BP_VAR_UNSET: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); http://cvs.php.net/diff.php/ZendEngine2/tests/bug22836.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug22836.phpt diff -u ZendEngine2/tests/bug22836.phpt:1.2 ZendEngine2/tests/bug22836.phpt:1.3 --- ZendEngine2/tests/bug22836.phpt:1.2 Tue Feb 10 04:15:01 2004 +++ ZendEngine2/tests/bug22836.phpt Mon Dec 27 08:43:26 2004 @@ -19,55 +19,55 @@ string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv01.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv01.phpt diff -u ZendEngine2/tests/unset_cv01.phpt:1.2 ZendEngine2/tests/unset_cv01.phpt:1.3 --- ZendEngine2/tests/unset_cv01.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv01.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv02.phpt diff -u ZendEngine2/tests/unset_cv02.phpt:1.2 ZendEngine2/tests/unset_cv02.phpt:1.3 --- ZendEngine2/tests/unset_cv02.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv02.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv03.phpt diff -u ZendEngine2/tests/unset_cv03.phpt:1.2 ZendEngine2/tests/unset_cv03.phpt:1.3 --- ZendEngine2/tests/unset_cv03.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv03.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv04.phpt diff -u ZendEngine2/tests/unset_cv04.phpt:1.2 ZendEngine2/tests/unset_cv04.phpt:1.3 --- ZendEngine2/tests/unset_cv04.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv04.phpt Mon Dec 27 08:43:26 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.3&r2=1.4&ty=u Index: ZendEngine2/tests/unset_cv06.phpt diff -u ZendEngine2/tests/unset_cv06.phpt:1.3 ZendEngine2/tests/unset_cv06.phpt:1.4 --- ZendEngine2/tests/unset_cv06.phpt:1.3 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv06.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv08.phpt diff -u ZendEngine2/tests/unset_cv08.phpt:1.2 ZendEngine2/tests/unset_cv08.phpt:1.3 --- ZendEngine2/tests/unset_cv08.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv08.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv09.phpt diff -u ZendEngine2/tests/unset_cv09.phpt:1.2 ZendEngine2/tests/unset_cv09.phpt:1.3 --- ZendEngine2/tests/unset_cv09.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv09.phpt Mon Dec 27 08:43:26 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.2&r2=1.3&ty=u Index: ZendEngine2/tests/unset_cv10.phpt diff -u ZendEngine2/tests/unset_cv10.phpt:1.2 ZendEngine2/tests/unset_cv10.phpt:1.3 --- ZendEngine2/tests/unset_cv10.phpt:1.2 Fri Dec 24 03:24:55 2004 +++ ZendEngine2/tests/unset_cv10.phpt Mon Dec 27 08:43:26 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 http://cvs.php.net/diff.php/php-src/tests/classes/static_this.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/tests/classes/static_this.phpt diff -u php-src/tests/classes/static_this.phpt:1.1 php-src/tests/classes/static_this.phpt:1.2 --- php-src/tests/classes/static_this.phpt:1.1 Mon Oct 4 13:30:53 2004 +++ php-src/tests/classes/static_this.phpt Mon Dec 27 08:43:26 2004 @@ -29,10 +29,10 @@ ===DONE=== --EXPECTF-- -Notice: Undefined variable: this in %sstatic_this.php on line %d +Notice: Undefined variable: this in %sstatic_this.php on line %d NULL -Notice: Undefined variable: this in %sstatic_this.php on line %d +Notice: Undefined variable: this in %sstatic_this.php on line %d NULL object(stdClass)#%d (0) { }