"Undefined variable: %s" noticies were fixed to be compatible with PHP_5_0

diff --git a/Zend/tests/unset_cv01.phpt b/Zend/tests/unset_cv01.phpt
index 99af118d10c244206337c3ba7ec8c3d7776801f6..c7d1161325c8596491c7e989ed39050523b4d3a5 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 cb2475350c226bbdb0b85a384eb94a1982babeb7..a6a0a8d2561838c8677b9b1c031ee06a20488c6e 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 221abe2d884c60beb8d91b4c823e5e5e10df4f3a..874f7ea7df8185494def777b0bcc4c1e235a9ac9 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 5044cb1c8d73b760c36721fe8e7d87f0e5c4b900..4267c3cb7c5860970a7854a0a39fe1e8dd94cfe4 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 fd5c6886ae74ee3d0bdbe60378bf08ee9885e000..c7454b8dbc66aa7a99dedd3ed28861339b14377c 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 f1b61bf827846506fcf0dacd2eb341fb34c1673f..66864081becc456993dc955c414e672352c6761a 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 a5407ad64e939581769dcea167823716f629dc6b..4129446e2ee040b75c0cf025f41f55b4f8c2d4f5 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 0eb41922c5002bfe9643db106b06b8c4c9a82649..bfc03f78eff6b489e6f68620185e01d91a6bbf15 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 ede4e5a7622ca4b8210bce9bfd7f9cba092526ed..f16a2af035baf56054dfc2f2dfa6ef09aeacc2eb 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);
@@ -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);