summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2004-12-24 08:24:55 +0000
committerDmitry Stogov <dmitry@php.net>2004-12-24 08:24:55 +0000
commite986a1f47ed301801eaef66c261604a306a42127 (patch)
tree920f11231fadd18fc58f43f0f289180a7e0da0ae
parentc2e70dbe9ef4a3ed28897c84f900e8a5f4b8e8ad (diff)
downloadphp-git-e986a1f47ed301801eaef66c261604a306a42127.tar.gz
"Undefined variable: %s" noticies were fixed to be compatible with PHP_5_0
-rw-r--r--Zend/tests/unset_cv01.phpt2
-rw-r--r--Zend/tests/unset_cv02.phpt2
-rw-r--r--Zend/tests/unset_cv03.phpt2
-rw-r--r--Zend/tests/unset_cv04.phpt2
-rw-r--r--Zend/tests/unset_cv06.phpt2
-rw-r--r--Zend/tests/unset_cv08.phpt2
-rw-r--r--Zend/tests/unset_cv09.phpt2
-rw-r--r--Zend/tests/unset_cv10.phpt2
-rw-r--r--Zend/zend_execute.c8
9 files changed, 12 insertions, 12 deletions
diff --git a/Zend/tests/unset_cv01.phpt b/Zend/tests/unset_cv01.phpt
index 99af118d10..c7d1161325 100644
--- 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 cb2475350c..a6a0a8d256 100644
--- 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 221abe2d88..874f7ea7df 100644
--- 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 5044cb1c8d..4267c3cb7c 100644
--- 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 fd5c6886ae..c7454b8dbc 100644
--- 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 f1b61bf827..66864081be 100644
--- 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 a5407ad64e..4129446e2e 100644
--- 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 0eb41922c5..bfc03f78ef 100644
--- 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 ede4e5a762..f16a2af035 100644
--- 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);