cvs: php-src(PHP_5_0) /tests/classes static_this.phpt ZendEngine2 zend_execute.c ZendEngine2/tests bug22836.phpt
| From: | Dmitry Stogov | Date: | Mon, 27 Dec 2004 13:04:03 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /tests/classes static_this.phpt ZendEngine2 zend_execute.c ZendEngine2/tests bug22836.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29665@lists.php.net to get a copy of this message | ||
dmitry Mon Dec 27 08:04:03 2004 EDT
Modified files: (Branch: PHP_5_0)
/ZendEngine2 zend_execute.c
/ZendEngine2/tests bug22836.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.652.2.11&r2=1.652.2.12&ty=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.652.2.11 ZendEngine2/zend_execute.c:1.652.2.12
--- ZendEngine2/zend_execute.c:1.652.2.11 Wed Dec 1 09:01:58 2004
+++ ZendEngine2/zend_execute.c Mon Dec 27 08:04:02 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.652.2.11 2004/12/01 14:01:58 dmitry Exp $ */
+/* $Id: zend_execute.c,v 1.652.2.12 2004/12/27 13:04:02 dmitry Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -763,13 +763,13 @@
if (zend_hash_find(target_symbol_table, varname->value.str.val, varname->value.str.len+1,
(void **) &retval) == FAILURE) {
switch (type) {
case BP_VAR_R:
- 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.2.2.1&ty=u
Index: ZendEngine2/tests/bug22836.phpt
diff -u ZendEngine2/tests/bug22836.phpt:1.2 ZendEngine2/tests/bug22836.phpt:1.2.2.1
--- ZendEngine2/tests/bug22836.phpt:1.2 Tue Feb 10 04:15:01 2004
+++ ZendEngine2/tests/bug22836.phpt Mon Dec 27 08:04:02 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/php-src/tests/classes/static_this.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/tests/classes/static_this.phpt
diff -u php-src/tests/classes/static_this.phpt:1.1.2.1
php-src/tests/classes/static_this.phpt:1.1.2.2
--- php-src/tests/classes/static_this.phpt:1.1.2.1 Mon Oct 4 13:31:37 2004
+++ php-src/tests/classes/static_this.phpt Mon Dec 27 08:04:02 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) {
}