"Undefined variable: %s" noticies were fixed to use one space

diff --git a/Zend/tests/bug22836.phpt b/Zend/tests/bug22836.phpt
index 1edcaa5c17a3c3357d5868eab10127d26d1708af..ceaf6414b639635070084e83ef77c5ad6b7893f6 100644 (file)
--- a/Zend/tests/bug22836.phpt
+++ b/Zend/tests/bug22836.phpt
@@ -19,55 +19,55 @@ for ($i = 0; $i < 8; $i++) {
 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
 

diff --git a/Zend/tests/unset_cv01.phpt b/Zend/tests/unset_cv01.phpt
index c7d1161325c8596491c7e989ed39050523b4d3a5..99af118d10c244206337c3ba7ec8c3d7776801f6 100644 (file)
--- a/Zend/tests/unset_cv01.phpt
+++ b/Zend/tests/unset_cv01.phpt
@@ -10,4 +10,4 @@ echo $x;
 --EXPECTF--
 ok
 
-Notice: Undefined variable:  x in %sunset_cv01.php on line %d
+Notice: Undefined variable: x in %sunset_cv01.php on line %d

diff --git a/Zend/tests/unset_cv02.phpt b/Zend/tests/unset_cv02.phpt
index a6a0a8d2561838c8677b9b1c031ee06a20488c6e..cb2475350c226bbdb0b85a384eb94a1982babeb7 100644 (file)
--- a/Zend/tests/unset_cv02.phpt
+++ b/Zend/tests/unset_cv02.phpt
@@ -10,4 +10,4 @@ echo $x;
 --EXPECTF--
 ok
 
-Notice: Undefined variable:  x in %sunset_cv02.php on line %d
+Notice: Undefined variable: x in %sunset_cv02.php on line %d

diff --git a/Zend/tests/unset_cv03.phpt b/Zend/tests/unset_cv03.phpt
index 874f7ea7df8185494def777b0bcc4c1e235a9ac9..221abe2d884c60beb8d91b4c823e5e5e10df4f3a 100644 (file)
--- a/Zend/tests/unset_cv03.phpt
+++ b/Zend/tests/unset_cv03.phpt
@@ -10,4 +10,4 @@ echo $x;
 --EXPECTF--
 ok
 
-Notice: Undefined variable:  x in %sunset_cv03.php on line %d
+Notice: Undefined variable: x in %sunset_cv03.php on line %d

diff --git a/Zend/tests/unset_cv04.phpt b/Zend/tests/unset_cv04.phpt
index 4267c3cb7c5860970a7854a0a39fe1e8dd94cfe4..5044cb1c8d73b760c36721fe8e7d87f0e5c4b900 100644 (file)
--- a/Zend/tests/unset_cv04.phpt
+++ b/Zend/tests/unset_cv04.phpt
@@ -13,4 +13,4 @@ f();
 --EXPECTF--
 ok
 
-Notice: Undefined variable:  x in %sunset_cv04.php on line %d
+Notice: Undefined variable: x in %sunset_cv04.php on line %d

diff --git a/Zend/tests/unset_cv06.phpt b/Zend/tests/unset_cv06.phpt
index c7454b8dbc66aa7a99dedd3ed28861339b14377c..fd5c6886ae74ee3d0bdbe60378bf08ee9885e000 100644 (file)
--- a/Zend/tests/unset_cv06.phpt
+++ b/Zend/tests/unset_cv06.phpt
@@ -20,5 +20,5 @@ echo "ok\n";
 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

diff --git a/Zend/tests/unset_cv08.phpt b/Zend/tests/unset_cv08.phpt
index 66864081becc456993dc955c414e672352c6761a..f1b61bf827846506fcf0dacd2eb341fb34c1673f 100644 (file)
--- a/Zend/tests/unset_cv08.phpt
+++ b/Zend/tests/unset_cv08.phpt
@@ -12,5 +12,5 @@ echo "ok\n";
 --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

diff --git a/Zend/tests/unset_cv09.phpt b/Zend/tests/unset_cv09.phpt
index 4129446e2ee040b75c0cf025f41f55b4f8c2d4f5..a5407ad64e939581769dcea167823716f629dc6b 100644 (file)
--- a/Zend/tests/unset_cv09.phpt
+++ b/Zend/tests/unset_cv09.phpt
@@ -10,5 +10,5 @@ echo "ok\n";
 --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

diff --git a/Zend/tests/unset_cv10.phpt b/Zend/tests/unset_cv10.phpt
index bfc03f78eff6b489e6f68620185e01d91a6bbf15..0eb41922c5002bfe9643db106b06b8c4c9a82649 100644 (file)
--- a/Zend/tests/unset_cv10.phpt
+++ b/Zend/tests/unset_cv10.phpt
@@ -14,5 +14,5 @@ echo "ok\n";
 --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

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index f16a2af035baf56054dfc2f2dfa6ef09aeacc2eb..b249b37871a0ed4f7ff5ed452305660d93226548 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -211,13 +211,13 @@ static inline zval *_get_zval_ptr(znode *node, temp_variable *Ts, zend_free_op *
                                        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 @@ static inline zval **_get_zval_ptr_ptr(znode *node, temp_variable *Ts, zend_free
                                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 @@ static inline zval *_get_zval_ptr_cv(znode *node, temp_variable *Ts, zend_free_o
                        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 @@ static inline zval **_get_zval_ptr_ptr_cv(znode *node, temp_variable *Ts, zend_f
                        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);

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 5aa2d28512ab1607de1d3ae6374c0b150e4c3f95..10c13814e00d20f3baa3390c14698c6b7a011be4 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -882,13 +882,13 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMP|VAR|CV, ANY, int type
                        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);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 2103541000ab31c132cecc834647f7c9e09197b2..f65f57e3341857a1904227fc3f77196285b91246 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1312,13 +1312,13 @@ static int zend_fetch_var_address_helper_SPEC_CONST(int type, ZEND_OPCODE_HANDLE
                        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 @@ static int zend_fetch_var_address_helper_SPEC_TMP(int type, ZEND_OPCODE_HANDLER_
                        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 @@ static int zend_fetch_var_address_helper_SPEC_VAR(int type, ZEND_OPCODE_HANDLER_
                        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 @@ static int zend_fetch_var_address_helper_SPEC_CV(int type, ZEND_OPCODE_HANDLER_A
                        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 @@ static int zend_fetch_var_address_helper(int type, ZEND_OPCODE_HANDLER_ARGS)
                        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);

diff --git a/tests/classes/static_this.phpt b/tests/classes/static_this.phpt
index 3b1bb3e6042bd8a4a6a6bc4a29cf3ca98061d8a9..12f4b6389b3d177ea39fdde749b8c8b8e19032be 100755 (executable)
--- a/tests/classes/static_this.phpt
+++ b/tests/classes/static_this.phpt
@@ -29,10 +29,10 @@ TestClass::Test2(new stdClass);
 ===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) {
 }