From: Felipe Pena <felipe@php.net>
Date: Mon, 4 Feb 2008 12:37:15 +0000 (+0000)
Subject: Fix tests (new error message)
X-Git-Tag: RELEASE_2_0_0a1~636
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76dab1562f9c5f6adbd325ba6aa468ba02e3e2eb;p=php

Fix tests (new error message)
---

diff --git a/ext/standard/tests/array/array_map_object2.phpt b/ext/standard/tests/array/array_map_object2.phpt
index 8f0e4b74ab..bf004973f8 100644
--- a/ext/standard/tests/array/array_map_object2.phpt
+++ b/ext/standard/tests/array/array_map_object2.phpt
@@ -37,21 +37,21 @@ echo "Done";
 *** Testing array_map() :  with non-existent class and method ***
 -- with non-existent class --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, first array member is not a valid class name in %s on line %d
 NULL
 -- with existent class and non-existent method --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, class 'SimpleClass' does not have a method 'non-existent' in %s on line %d
 NULL
 Done
 --UEXPECTF--
 *** Testing array_map() :  with non-existent class and method ***
 -- with non-existent class --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, first array member is not a valid class name in %s on line %d
 NULL
 -- with existent class and non-existent method --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, class 'SimpleClass' does not have a method 'non-existent' in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_map_object3.phpt b/ext/standard/tests/array/array_map_object3.phpt
index 337b260625..66e1c99414 100644
--- a/ext/standard/tests/array/array_map_object3.phpt
+++ b/ext/standard/tests/array/array_map_object3.phpt
@@ -74,7 +74,7 @@ array(3) {
 }
 -- accessing child method from parent class --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, class 'ParentClass' does not have a method 'staticchild' in %s on line %d
 NULL
 -- accessing parent method using child class object --
 array(3) {
@@ -87,7 +87,7 @@ array(3) {
 }
 -- accessing child method using parent class object --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, class 'ParentClass' does not have a method 'staticchild' in %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -103,7 +103,7 @@ array(3) {
 }
 -- accessing child method from parent class --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, class 'ParentClass' does not have a method 'staticchild' in %s on line %d
 NULL
 -- accessing parent method using child class object --
 array(3) {
@@ -116,6 +116,6 @@ array(3) {
 }
 -- accessing child method using parent class object --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, class 'ParentClass' does not have a method 'staticchild' in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_map_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt
index fbd4c8e8ec..4d187baac1 100644
--- a/ext/standard/tests/array/array_map_variation12.phpt
+++ b/ext/standard/tests/array/array_map_variation12.phpt
@@ -40,11 +40,11 @@ array(3) {
 }
 -- with built-in function 'pow' and one parameter --
 
-Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d%d
+Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d
 
-Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d%d
+Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d
 
-Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d%d
+Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d
 array(3) {
   [0]=>
   NULL
@@ -55,7 +55,7 @@ array(3) {
 }
 -- with language construct --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -86,6 +86,6 @@ array(3) {
 }
 -- with language construct --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_map_variation14.phpt b/ext/standard/tests/array/array_map_variation14.phpt
index 7db4c97327..a673277043 100644
--- a/ext/standard/tests/array/array_map_variation14.phpt
+++ b/ext/standard/tests/array/array_map_variation14.phpt
@@ -116,11 +116,11 @@ array(2) {
 }
 -- with empty string --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- with empty array --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -132,7 +132,7 @@ array(2) {
     [0]=>
     int(1)
     [1]=>
-    unicode(3) "one"
+    string(3) "one"
     [2]=>
     float(1.1)
   }
@@ -141,7 +141,7 @@ array(2) {
     [0]=>
     int(2)
     [1]=>
-    unicode(3) "two"
+    string(3) "two"
     [2]=>
     float(2.2)
   }
@@ -152,7 +152,7 @@ array(2) {
     [0]=>
     int(1)
     [1]=>
-    unicode(3) "one"
+    string(3) "one"
     [2]=>
     float(1.1)
   }
@@ -161,7 +161,7 @@ array(2) {
     [0]=>
     int(2)
     [1]=>
-    unicode(3) "two"
+    string(3) "two"
     [2]=>
     float(2.2)
   }
@@ -173,7 +173,7 @@ array(2) {
     [0]=>
     int(1)
     [1]=>
-    unicode(3) "one"
+    string(3) "one"
     [2]=>
     float(1.1)
   }
@@ -182,7 +182,7 @@ array(2) {
     [0]=>
     int(2)
     [1]=>
-    unicode(3) "two"
+    string(3) "two"
     [2]=>
     float(2.2)
   }
@@ -196,10 +196,10 @@ array(2) {
 }
 -- with empty string --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- with empty array --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_map_variation15.phpt b/ext/standard/tests/array/array_map_variation15.phpt
index 869645a3f6..c164bbfec5 100644
--- a/ext/standard/tests/array/array_map_variation15.phpt
+++ b/ext/standard/tests/array/array_map_variation15.phpt
@@ -25,12 +25,12 @@ echo "Done";
 --EXPECTF--
 *** Testing array_map() : non existent 'callback' function ***
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 Done
 --UEXPECTF--
 *** Testing array_map() : non existent 'callback' function ***
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_map_variation16.phpt b/ext/standard/tests/array/array_map_variation16.phpt
index 200a0151a0..e3f4bcc1aa 100644
--- a/ext/standard/tests/array/array_map_variation16.phpt
+++ b/ext/standard/tests/array/array_map_variation16.phpt
@@ -40,69 +40,69 @@ echo "Done";
 *** Testing array_map() : non-permmited built-in functions ***
 -- Iteration 1 --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'array' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'empty' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'eval' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'isset' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'list' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'print' not found or invalid function name in %s on line %d
 NULL
 Done
 --UEXPECTF--
 *** Testing array_map() : non-permmited built-in functions ***
 -- Iteration 1 --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'array' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'empty' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'eval' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'isset' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'list' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'print' not found or invalid function name in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt
index 99c9167c91..305c1e9563 100644
--- a/ext/standard/tests/array/array_map_variation17.phpt
+++ b/ext/standard/tests/array/array_map_variation17.phpt
@@ -77,165 +77,165 @@ echo "Done";
 *** Testing array_map() : unexpected values for 'callback' argument ***
 
 -- Iteration 1 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 2 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 3 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 4 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 5 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 6 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 7 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 8 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 9 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 10 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 11 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 12 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 13 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 14 --
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
 -- Iteration 15 --
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
 -- Iteration 16 --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
 -- Iteration 17 --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
 -- Iteration 18 --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
 -- Iteration 19 --
-Warning: array_map() expects parameter 1 to be valid callback, object given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 20 --
-Warning: array_map() expects parameter 1 to be valid callback, resource given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
 --UEXPECTF--
 *** Testing array_map() : unexpected values for 'callback' argument ***
 
 -- Iteration 1 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 2 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 3 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 4 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 5 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 6 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 7 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 8 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 9 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 10 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 11 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 12 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 13 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 14 --
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
 -- Iteration 15 --
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
 -- Iteration 16 --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
 -- Iteration 17 --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
 -- Iteration 18 --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
 -- Iteration 19 --
-Warning: array_map() expects parameter 1 to be valid callback, object given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 20 --
-Warning: array_map() expects parameter 1 to be valid callback, resource given in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt
index 3c9b1b8f93..8891f85af2 100644
--- a/ext/standard/tests/array/array_walk.phpt
+++ b/ext/standard/tests/array/array_walk.phpt
@@ -34,10 +34,10 @@ echo "Done\n";
 Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 int(1)
 int(0)
@@ -52,10 +52,10 @@ Done
 Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 int(1)
 int(0)
diff --git a/ext/standard/tests/array/array_walk_error1.phpt b/ext/standard/tests/array/array_walk_error1.phpt
index 398d2046c6..4b17023a95 100644
--- a/ext/standard/tests/array/array_walk_error1.phpt
+++ b/ext/standard/tests/array/array_walk_error1.phpt
@@ -43,7 +43,7 @@ Warning: array_walk() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 -- Testing array_walk() function with non existent callback function  --
 
-Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -58,6 +58,6 @@ Warning: array_walk() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 -- Testing array_walk() function with non existent callback function  --
 
-Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt
index ba275346e7..ef7c8fdd6d 100644
--- a/ext/standard/tests/array/array_walk_recursive1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive1.phpt
@@ -34,10 +34,10 @@ echo "Done\n";
 Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 int(1)
 int(0)
@@ -58,10 +58,10 @@ Done
 Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 int(1)
 int(0)
diff --git a/ext/standard/tests/general_functions/010.phpt b/ext/standard/tests/general_functions/010.phpt
index 8d1075f842..8fb2b11079 100644
--- a/ext/standard/tests/general_functions/010.phpt
+++ b/ext/standard/tests/general_functions/010.phpt
@@ -15,11 +15,5 @@ var_dump(register_shutdown_function(array("test","__call")));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-Strict Standards: Non-static method test::__call() cannot be called statically in %s on line %d
-NULL
-Done
-
-Strict Standards: Non-static method test::__call() cannot be called statically in Unknown on line 0
-
-Fatal error: Non-static method test::__call() cannot be called statically in Unknown on line 0
+--EXPECTF--
+Fatal error: Non-static method test::__call() cannot be called statically in %s on line %d
diff --git a/ext/standard/tests/general_functions/bug32647.phpt b/ext/standard/tests/general_functions/bug32647.phpt
index 677e6b26f7..9becfd86a5 100644
--- a/ext/standard/tests/general_functions/bug32647.phpt
+++ b/ext/standard/tests/general_functions/bug32647.phpt
@@ -49,13 +49,13 @@ Warning: register_shutdown_function(): Invalid shutdown callback 'Array' passed
 
 Warning: register_shutdown_function(): Invalid shutdown callback 'bar' passed in %s on line %d
 
-Strict Standards: Non-static method bar::barfoo() cannot be called statically in %sbug32647.php on line %d
+Strict Standards: Non-static method bar::barfoo() should not be called statically in %s on line %d
 
-Warning: register_shutdown_function(): Invalid shutdown callback 'bar::foobar' passed in %sbug32647.php on line %d
+Warning: register_shutdown_function(): Invalid shutdown callback 'bar::foobar' passed in %s on line %d
 foo!
 
-Strict Standards: Non-static method bar::barfoo() cannot be called statically in Unknown on line 0
+Strict Standards: Non-static method bar::barfoo() should not be called statically in Unknown on line 0
 
-Strict Standards: Non-static method bar::barfoo() cannot be called statically in Unknown on line 0
+Strict Standards: Non-static method bar::barfoo() should not be called statically in Unknown on line 0
 bar!
 bar!