Convert some notices to warnings

Part of https://wiki.php.net/rfc/engine_warnings.

15 files changed, 53 insertions, 53 deletions

diff --git a/tests/basic/025.phpt b/tests/basic/025.phpt
index 37561a2a2e..30d50c805d 100644
--- a/tests/basic/025.phpt
+++ b/tests/basic/025.phpt
@@ -15,7 +15,7 @@ Warning: Unknown: POST Content-Length of 2050 bytes exceeds the limit of 1024 by
 
 Warning: Cannot modify header information - headers already sent in Unknown on line 0
 
-Notice: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d
+Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d
 array(0) {
 }
 NULL
diff --git a/tests/basic/enable_post_data_reading_01.phpt b/tests/basic/enable_post_data_reading_01.phpt
index 19ee5d583f..d717b2b0b0 100644
--- a/tests/basic/enable_post_data_reading_01.phpt
+++ b/tests/basic/enable_post_data_reading_01.phpt
@@ -18,7 +18,7 @@ array(0) {
 array(0) {
 }
 
-Notice: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d
+Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d
 NULL
 string(9) "a=1&b=ZYX"
 string(9) "a=1&b=ZYX"
diff --git a/tests/basic/enable_post_data_reading_03.phpt b/tests/basic/enable_post_data_reading_03.phpt
index 6a62282ea2..5982f61c91 100644
--- a/tests/basic/enable_post_data_reading_03.phpt
+++ b/tests/basic/enable_post_data_reading_03.phpt
@@ -19,7 +19,7 @@ array(0) {
 array(0) {
 }
 
-Notice: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d
+Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d
 NULL
 string(9) "a=1&b=ZYX"
 string(9) "a=1&b=ZYX"
diff --git a/tests/basic/enable_post_data_reading_04.phpt b/tests/basic/enable_post_data_reading_04.phpt
index a7c7e496d8..17432e9298 100644
--- a/tests/basic/enable_post_data_reading_04.phpt
+++ b/tests/basic/enable_post_data_reading_04.phpt
@@ -19,7 +19,7 @@ array(0) {
 array(0) {
 }
 
-Notice: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d
+Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d
 NULL
 string(9) "a=1&b=ZYX"
 string(9) "a=1&b=ZYX"
diff --git a/tests/classes/bug27468.phpt b/tests/classes/bug27468.phpt
index 58a7b6cb16..1c54fa61ce 100644
--- a/tests/classes/bug27468.phpt
+++ b/tests/classes/bug27468.phpt
@@ -11,7 +11,7 @@ new foo();
 echo 'OK';
 ?>
 --EXPECTF--
-Notice: Undefined property: foo::$x in %sbug27468.php on line 4
+Warning: Undefined property: foo::$x in %s on line %d
 
 Warning: Invalid argument supplied for foreach() in %sbug27468.php on line 4
 OK
diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt
index 38da2dfde0..af9915c277 100644
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -55,7 +55,7 @@ Class constant declarations
   echo "\nYou should not see this.";
 ?>
 --EXPECTF--
-Notice: Undefined variable: undef in %s on line 5
+Warning: Undefined variable: undef in %s on line %d
 
 Attempt to access various kinds of class constants:
 int(1)
diff --git a/tests/classes/constants_basic_002.phpt b/tests/classes/constants_basic_002.phpt
index def661ec45..88c66aaee8 100644
--- a/tests/classes/constants_basic_002.phpt
+++ b/tests/classes/constants_basic_002.phpt
@@ -23,7 +23,7 @@ string(5) "hello"
 
 Fail to read class constant from instance.
 
-Notice: Undefined property: aclass::$myConst in %s on line 12
+Warning: Undefined property: aclass::$myConst in %s on line %d
 NULL
 
 Class constant not visible in object var_dump.
diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt
index 89c26d3dd3..64641c47c5 100644
--- a/tests/classes/static_properties_003.phpt
+++ b/tests/classes/static_properties_003.phpt
@@ -34,7 +34,7 @@ Notice: Accessing static property C::$x as non static in %s on line 11
 
 Notice: Accessing static property C::$x as non static in %s on line 12
 
-Notice: Undefined property: C::$x in %s on line 12
+Warning: Undefined property: C::$x in %s on line %d
 
 Notice: Accessing static property C::$x as non static in %s on line 13
 
diff --git a/tests/lang/bison1.phpt b/tests/lang/bison1.phpt
index 3571576fb8..f77cce0055 100644
--- a/tests/lang/bison1.phpt
+++ b/tests/lang/bison1.phpt
@@ -2,8 +2,8 @@
 Bison weirdness
 --FILE--
 <?php
-error_reporting(E_ALL & ~E_NOTICE);
 echo "blah-$foo\n";
 ?>
---EXPECT--
+--EXPECTF--
+Warning: Undefined variable: foo in %s on line %d
 blah-
diff --git a/tests/lang/bug23584.phpt b/tests/lang/bug23584.phpt
index 417cfb0856..b9dc10ac67 100644
--- a/tests/lang/bug23584.phpt
+++ b/tests/lang/bug23584.phpt
@@ -9,5 +9,5 @@ error_reporting(E_ALL);
 echo $foo;
 
 ?>
---EXPECTREGEX--
-Notice: Undefined variable:.*foo in .* on line 6
+--EXPECTF--
+Warning: Undefined variable: foo in %s on line 6
diff --git a/tests/lang/bug27439.phpt b/tests/lang/bug27439.phpt
index 4bcadb78fd..de4bcd05a7 100644
--- a/tests/lang/bug27439.phpt
+++ b/tests/lang/bug27439.phpt
@@ -65,7 +65,7 @@ echo "===DONE===";
 ?>
 --EXPECTF--
 123
-Notice: Undefined property: test::$foobar in %s on line %d
+Warning: Undefined property: test::$foobar in %s on line %d
 
 Warning: Invalid argument supplied for foreach() in %s on line %d
 
diff --git a/tests/lang/foreachLoopObjects.004.phpt b/tests/lang/foreachLoopObjects.004.phpt
index 01e4e9fd9a..283e6be90c 100644
--- a/tests/lang/foreachLoopObjects.004.phpt
+++ b/tests/lang/foreachLoopObjects.004.phpt
@@ -34,13 +34,13 @@ Removing the current element from an iterated object.
 string(10) "Original a"
 string(10) "Original b"
 
-Notice: Undefined property: C::$b in %s on line %d
+Warning: Undefined property: C::$b in %s on line %d
 string(10) "Original c"
 
-Notice: Undefined property: C::$b in %s on line %d
+Warning: Undefined property: C::$b in %s on line %d
 string(10) "Original d"
 
-Notice: Undefined property: C::$b in %s on line %d
+Warning: Undefined property: C::$b in %s on line %d
 string(10) "Original e"
 object(C)#%d (4) {
   ["a"]=>
diff --git a/tests/lang/passByReference_003.phpt b/tests/lang/passByReference_003.phpt
index ad9e1e39de..de9ac09d8d 100644
--- a/tests/lang/passByReference_003.phpt
+++ b/tests/lang/passByReference_003.phpt
@@ -25,16 +25,16 @@ var_dump($undef2)
 --EXPECTF--
 Passing undefined by value
 
-Notice: Undefined variable: undef1 in %s on line %d
+Warning: Undefined variable: undef1 in %s on line %d
 
-Notice: Trying to access array offset on value of type null in %s on line %d
+Warning: Trying to access array offset on value of type null in %s on line %d
 
 Inside passbyVal call:
 NULL
 
 After call
 
-Notice: Undefined variable: undef1 in %s on line %d
+Warning: Undefined variable: undef1 in %s on line %d
 NULL
 
 Passing undefined by reference
diff --git a/tests/lang/passByReference_005.phpt b/tests/lang/passByReference_005.phpt
index ffa5de589f..82b79b684f 100644
--- a/tests/lang/passByReference_005.phpt
+++ b/tests/lang/passByReference_005.phpt
@@ -170,31 +170,31 @@ var_dump($u1, $u2);
 --EXPECTF--
 ---- Pass by ref / pass by val: functions ----
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 NULL
 string(11) "Ref changed"
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 NULL
 NULL
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 NULL
 string(11) "Ref changed"
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 string(11) "Ref changed"
 NULL
 string(12) "Ref1 changed"
@@ -203,31 +203,31 @@ string(12) "Ref2 changed"
 
  ---- Pass by ref / pass by val: static method calls ----
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 NULL
 string(11) "Ref changed"
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 NULL
 NULL
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 NULL
 string(11) "Ref changed"
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 string(11) "Ref changed"
 NULL
 string(12) "Ref1 changed"
@@ -236,37 +236,37 @@ string(12) "Ref2 changed"
 
  ---- Pass by ref / pass by val: instance method calls ----
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 NULL
 string(11) "Ref changed"
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 NULL
 string(11) "Ref changed"
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 NULL
 NULL
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 
-Notice: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable: u1 in %s on line %d
 NULL
 string(11) "Ref changed"
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 
-Notice: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable: u2 in %s on line %d
 string(11) "Ref changed"
 NULL
 string(12) "Ref1 changed"
diff --git a/tests/lang/short_tags.004.phpt b/tests/lang/short_tags.004.phpt
index 6df8af1c2a..9bf73b064b 100644
--- a/tests/lang/short_tags.004.phpt
+++ b/tests/lang/short_tags.004.phpt
@@ -29,6 +29,6 @@ This gets echoed twice
 <? $b=3; ?>
 
 
-Notice: Undefined variable: b in %s on line %d
+Warning: Undefined variable: b in %s on line %d
 
-Notice: Undefined variable: b in %s on line %d
+Warning: Undefined variable: b in %s on line %d