felipe          Mon Feb  4 15:22:09 2008 UTC

  Modified files:              
    /php-src/ext/standard/tests/array   array_filter_error.phpt 
                                        array_filter_variation2.phpt 
                                        array_filter_variation9.phpt 
                                        array_map_object1.phpt 
                                        array_intersect_variation9.phpt 
                                        array_filter.phpt 
    /php-src/ext/standard/tests/assert  assert_variation.phpt 
    /php-src/ext/standard/tests/general_functions       bug40398.phpt 
    /php-src/ext/sqlite/tests   sqlite_oo_030.phpt 
    /php-src/ext/spl/tests      bug38325.phpt 
  Log:
  Fix tests (new error message)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_filter_error.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_filter_error.phpt
diff -u php-src/ext/standard/tests/array/array_filter_error.phpt:1.2 
php-src/ext/standard/tests/array/array_filter_error.phpt:1.3
--- php-src/ext/standard/tests/array/array_filter_error.phpt:1.2        Fri Oct 
19 18:22:55 2007
+++ php-src/ext/standard/tests/array/array_filter_error.phpt    Mon Feb  4 
15:22:08 2008
@@ -45,7 +45,7 @@
 Warning: array_filter() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 -- Testing array_filter() function with incorrect callback --
-Warning: array_filter() expects parameter 2 to be valid callback, string given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'even' not found or invalid function name in %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -57,6 +57,6 @@
 Warning: array_filter() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 -- Testing array_filter() function with incorrect callback --
-Warning: array_filter() expects parameter 2 to be valid callback, Unicode 
string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'even' not found or invalid function name in %s on line %d
 NULL
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_filter_variation2.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_filter_variation2.phpt
diff -u php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.2 
php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.3
--- php-src/ext/standard/tests/array/array_filter_variation2.phpt:1.2   Fri Oct 
19 18:22:55 2007
+++ php-src/ext/standard/tests/array/array_filter_variation2.phpt       Mon Feb 
 4 15:22:08 2008
@@ -98,174 +98,174 @@
 --EXPECTF--
 *** Testing array_filter() : usage variations - unexpected values for 
'callback' function***
 -- Iteration 1 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 2 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 3 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 4 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 5 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 6 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 7 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 8 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 9 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 10 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must 
have exactly two members in %s on line %d
 NULL
 -- Iteration 11 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must 
have exactly two members in %s on line %d
 NULL
 -- Iteration 12 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must 
have exactly two members in %s on line %d
 NULL
 -- Iteration 13 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, second 
array member is not a valid method in %s on line %d
 NULL
 -- Iteration 14 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, first 
array member is not a valid class name or object in %s on line %d
 NULL
 -- Iteration 15 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 16 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 17 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 18 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 19 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 20 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 21 --
-Warning: array_filter() expects parameter 2 to be valid callback, string given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 22 --
-Warning: array_filter() expects parameter 2 to be valid callback, string given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 23 --
-Warning: array_filter() expects parameter 2 to be valid callback, string given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'string' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 24 --
-Warning: array_filter() expects parameter 2 to be valid callback, string given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'string' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 25 --
-Warning: array_filter() expects parameter 2 to be valid callback, object given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 26 --
-Warning: array_filter() expects parameter 2 to be valid callback, resource 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 27 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 28 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 Done
 --UEXPECTF--
 *** Testing array_filter() : usage variations - unexpected values for 
'callback' function***
 -- Iteration 1 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 2 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 3 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 4 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 5 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 6 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 7 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 8 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 9 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 10 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must 
have exactly two members in %s on line %d
 NULL
 -- Iteration 11 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must 
have exactly two members in %s on line %d
 NULL
 -- Iteration 12 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must 
have exactly two members in %s on line %d
 NULL
 -- Iteration 13 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, second 
array member is not a valid method in %s on line %d
 NULL
 -- Iteration 14 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, first 
array member is not a valid class name or object in %s on line %d
 NULL
 -- Iteration 15 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 16 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 17 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 18 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 19 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 20 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 21 --
-Warning: array_filter() expects parameter 2 to be valid callback, Unicode 
string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 22 --
-Warning: array_filter() expects parameter 2 to be valid callback, Unicode 
string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 23 --
-Warning: array_filter() expects parameter 2 to be valid callback, Unicode 
string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'string' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 24 --
-Warning: array_filter() expects parameter 2 to be valid callback, Unicode 
string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'string' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 25 --
-Warning: array_filter() expects parameter 2 to be valid callback, object given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 26 --
-Warning: array_filter() expects parameter 2 to be valid callback, resource 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 27 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 -- Iteration 28 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_filter_variation9.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_filter_variation9.phpt
diff -u php-src/ext/standard/tests/array/array_filter_variation9.phpt:1.2 
php-src/ext/standard/tests/array/array_filter_variation9.phpt:1.3
--- php-src/ext/standard/tests/array/array_filter_variation9.phpt:1.2   Fri Oct 
19 18:22:55 2007
+++ php-src/ext/standard/tests/array/array_filter_variation9.phpt       Mon Feb 
 4 15:22:08 2008
@@ -64,10 +64,10 @@
   NULL
 }
 
-Warning: array_filter() expects parameter 2 to be valid callback, string given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'echo' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_filter() expects parameter 2 to be valid callback, string given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'exit' not found or invalid function name in %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -105,9 +105,9 @@
   NULL
 }
 
-Warning: array_filter() expects parameter 2 to be valid callback, Unicode 
string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'echo' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_filter() expects parameter 2 to be valid callback, Unicode 
string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 
'exit' not found or invalid function name in %s on line %d
 NULL
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_object1.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_object1.phpt
diff -u php-src/ext/standard/tests/array/array_map_object1.phpt:1.1 
php-src/ext/standard/tests/array/array_map_object1.phpt:1.2
--- php-src/ext/standard/tests/array/array_map_object1.phpt:1.1 Thu Jan  3 
09:35:11 2008
+++ php-src/ext/standard/tests/array/array_map_object1.phpt     Mon Feb  4 
15:22:08 2008
@@ -121,30 +121,57 @@
 *** Testing array_map() : object functionality ***
 -- simple class with public variable and method --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d%d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, 
non-static method SimpleClass::square() should not be called statically in %s 
on line %d
+
+Strict Standards: Non-static method SimpleClass::square() should not be called 
statically in %s on line %d
+
+Strict Standards: Non-static method SimpleClass::square() should not be called 
statically in %s on line %d
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(4)
+}
 
 -- simple class with private variable and 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, cannot access 
private method SimpleClassPri::add() in %s on line %d
 NULL
 
 -- simple class with protected variable and 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, cannot access 
protected method SimpleClassPro::mul() in %s on line %d
 NULL
 
 -- class without members --
-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
 
 -- abstract class --
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d%d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, 
non-static method ChildClass::emptyFunction() should not be called statically 
in %s on line %d
+
+Strict Standards: Non-static method ChildClass::emptyFunction() should not be 
called statically in %s on line %d
+defined in child
+Strict Standards: Non-static method ChildClass::emptyFunction() should not be 
called statically in %s on line %d
+defined in childarray(2) {
+  [0]=>
+  NULL
+  [1]=>
+  NULL
+}
 
 -- class with final method --
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d%d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, 
non-static method FinalClass::finalMethod() should not be called statically in 
%s on line %d
+
+Strict Standards: Non-static method FinalClass::finalMethod() should not be 
called statically in %s on line %d
+This function can't be overloaded
+Strict Standards: Non-static method FinalClass::finalMethod() should not be 
called statically in %s on line %d
+This function can't be overloadedarray(2) {
+  [0]=>
+  NULL
+  [1]=>
+  NULL
+}
 
 -- class with static members --
 array(2) {
@@ -154,10 +181,10 @@
   int(4)
 }
 
-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, cannot access 
private method StaticClass::cube() in %s on line %d
 NULL
 
-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, cannot access 
protected method StaticClass::retVal() in %s on line %d
 NULL
 -- class implementing an interface --
 array(2) {
@@ -171,30 +198,57 @@
 *** Testing array_map() : object functionality ***
 -- simple class with public variable and method --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, 
non-static method SimpleClass::square() should not be called statically in %s 
on line %d
+
+Strict Standards: Non-static method SimpleClass::square() should not be called 
statically in %s on line %d
+
+Strict Standards: Non-static method SimpleClass::square() should not be called 
statically in %s on line %d
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(4)
+}
 
 -- simple class with private variable and 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, cannot access 
private method SimpleClassPri::add() in %s on line %d
 NULL
 
 -- simple class with protected variable and 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, cannot access 
protected method SimpleClassPro::mul() in %s on line %d
 NULL
 
 -- class without members --
-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
 
 -- abstract class --
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, 
non-static method ChildClass::emptyFunction() should not be called statically 
in %s on line %d
+
+Strict Standards: Non-static method ChildClass::emptyFunction() should not be 
called statically in %s on line %d
+defined in child
+Strict Standards: Non-static method ChildClass::emptyFunction() should not be 
called statically in %s on line %d
+defined in childarray(2) {
+  [0]=>
+  NULL
+  [1]=>
+  NULL
+}
 
 -- class with final method --
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, 
non-static method FinalClass::finalMethod() should not be called statically in 
%s on line %d
+
+Strict Standards: Non-static method FinalClass::finalMethod() should not be 
called statically in %s on line %d
+This function can't be overloaded
+Strict Standards: Non-static method FinalClass::finalMethod() should not be 
called statically in %s on line %d
+This function can't be overloadedarray(2) {
+  [0]=>
+  NULL
+  [1]=>
+  NULL
+}
 
 -- class with static members --
 array(2) {
@@ -204,10 +258,10 @@
   int(4)
 }
 
-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, cannot access 
private method StaticClass::cube() in %s on line %d
 NULL
 
-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, cannot access 
protected method StaticClass::retVal() in %s on line %d
 NULL
 -- class implementing an interface --
 array(2) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_variation9.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_intersect_variation9.phpt
diff -u php-src/ext/standard/tests/array/array_intersect_variation9.phpt:1.1 
php-src/ext/standard/tests/array/array_intersect_variation9.phpt:1.2
--- php-src/ext/standard/tests/array/array_intersect_variation9.phpt:1.1        
Sat Oct 27 12:13:05 2007
+++ php-src/ext/standard/tests/array/array_intersect_variation9.phpt    Mon Feb 
 4 15:22:08 2008
@@ -72,6 +72,30 @@
 Notice: Array to string conversion in %s on line %d
 
 Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
 array(4) {
   [0]=>
   array(4) {
@@ -136,6 +160,41 @@
 
 Notice: Array to string conversion in %s on line %d
 
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
 array(4) {
   [0]=>
   array(4) {
@@ -210,6 +269,30 @@
 Notice: Array to string conversion in %s on line %d
 
 Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
 array(4) {
   [0]=>
   array(4) {
@@ -273,6 +356,42 @@
 Notice: Array to string conversion in %s on line %d
 
 Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
 array(4) {
   [0]=>
   array(4) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_filter.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_filter.phpt
diff -u php-src/ext/standard/tests/array/array_filter.phpt:1.2 
php-src/ext/standard/tests/array/array_filter.phpt:1.3
--- php-src/ext/standard/tests/array/array_filter.phpt:1.2      Tue Aug  8 
20:13:27 2006
+++ php-src/ext/standard/tests/array/array_filter.phpt  Mon Feb  4 15:22:08 2008
@@ -82,13 +82,13 @@
 array(0) {
 }
 
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must 
have exactly two members in %s on line %d
 NULL
 
 Warning: array_filter() expects parameter 1 to be array, string given in %s on 
line %d
 NULL
 
-Warning: array_filter() expects parameter 2 to be valid callback, integer 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 == DONE ==
 --UEXPECTF--
@@ -141,12 +141,12 @@
 array(0) {
 }
 
-Warning: array_filter() expects parameter 2 to be valid callback, array given 
in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must 
have exactly two members in %s on line %d
 NULL
 
-Warning: array_filter() expects parameter 1 to be array, Unicode string given 
in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, string given in %s on 
line %d
 NULL
 
-Warning: array_filter() expects parameter 2 to be valid callback, integer 
given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array 
or string given in %s on line %d
 NULL
 == DONE ==
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_variation.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/assert/assert_variation.phpt
diff -u php-src/ext/standard/tests/assert/assert_variation.phpt:1.1 
php-src/ext/standard/tests/assert/assert_variation.phpt:1.2
--- php-src/ext/standard/tests/assert/assert_variation.phpt:1.1 Fri Jul 13 
15:17:28 2007
+++ php-src/ext/standard/tests/assert/assert_variation.phpt     Mon Feb  4 
15:22:08 2008
@@ -107,7 +107,7 @@
 ini.get("assert.callback") => [f2]
 
 
-Strict Standards: Non-static method c1::assert() cannot be called statically 
in %s on line 53
+Strict Standards: Non-static method c1::assert() should not be called 
statically in %s on line %d
 Class assertion failed 53, "0 != 0"
 NULL
 
@@ -166,7 +166,7 @@
 ini.get("assert.callback") => [f2]
 
 
-Strict Standards: Non-static method c1::assert() cannot be called statically 
in %s on line 53
+Strict Standards: Non-static method c1::assert() should not be called 
statically in %s on line %d
 Class assertion failed 53, "0 != 0"
 NULL
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug40398.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug40398.phpt
diff -u php-src/ext/standard/tests/general_functions/bug40398.phpt:1.3 
php-src/ext/standard/tests/general_functions/bug40398.phpt:1.4
--- php-src/ext/standard/tests/general_functions/bug40398.phpt:1.3      Wed Feb 
14 19:29:33 2007
+++ php-src/ext/standard/tests/general_functions/bug40398.phpt  Mon Feb  4 
15:22:08 2008
@@ -78,23 +78,31 @@
 Base::__construct(1)
 Base::__construct(2)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, 
string given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid 
callback, non-static method Base::__construct() cannot be called statically, 
assuming $this from compatible context Derived_3 in %s on line %d
+Base::__construct(3)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, 
string given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid 
callback, non-static method Base::__construct() cannot be called statically, 
assuming $this from compatible context Derived_4 in %s on line %d
+Base::__construct(4)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, 
array given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid 
callback, non-static method Base::__construct() cannot be called statically, 
assuming $this from compatible context Derived_5 in %s on line %d
+Base::__construct(5)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, 
array given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid 
callback, non-static method Base::__construct() cannot be called statically, 
assuming $this from compatible context Derived_6 in %s on line %d
+Base::__construct(6)
 ===DONE===
 --UEXPECTF--
 Base::__construct(1)
 Base::__construct(2)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, 
Unicode string given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid 
callback, non-static method Base::__construct() cannot be called statically, 
assuming $this from compatible context Derived_3 in %s on line %d
+Base::__construct(3)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, 
Unicode string given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid 
callback, non-static method Base::__construct() cannot be called statically, 
assuming $this from compatible context Derived_4 in %s on line %d
+Base::__construct(4)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, 
array given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid 
callback, non-static method Base::__construct() cannot be called statically, 
assuming $this from compatible context Derived_5 in %s on line %d
+Base::__construct(5)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, 
array given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid 
callback, non-static method Base::__construct() cannot be called statically, 
assuming $this from compatible context Derived_6 in %s on line %d
+Base::__construct(6)
 ===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/tests/sqlite_oo_030.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/sqlite/tests/sqlite_oo_030.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.7 
php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.8
--- php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.7     Tue Aug 16 15:09:51 2005
+++ php-src/ext/sqlite/tests/sqlite_oo_030.phpt Mon Feb  4 15:22:08 2008
@@ -39,7 +39,9 @@
 string(1) "1"
 string(3) "PHP"
 
-Fatal error: Call to undefined method foo::bar("php")() in %ssqlite_oo_030.php 
on line %d
+Warning: SQLiteDatabase::singleQuery(): function `foo::bar("PHP")' is not a 
function name in %s on line %d
+bool(false)
+===DONE===
 --UEXPECTF--
 NULL
 unicode(1) "1"
@@ -48,4 +50,6 @@
 unicode(1) "1"
 unicode(3) "PHP"
 
-Fatal error: Call to undefined method foo::bar("php")() in %ssqlite_oo_030.php 
on line %d
+Warning: SQLiteDatabase::singleQuery(): function `foo::bar("PHP")' is not a 
function name in %s on line %d
+bool(false)
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug38325.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/bug38325.phpt
diff -u php-src/ext/spl/tests/bug38325.phpt:1.2 
php-src/ext/spl/tests/bug38325.phpt:1.3
--- php-src/ext/spl/tests/bug38325.phpt:1.2     Tue Nov  6 15:29:32 2007
+++ php-src/ext/spl/tests/bug38325.phpt Mon Feb  4 15:22:08 2008
@@ -8,4 +8,4 @@
 new Foo();
 ?>
 --EXPECTF--
-Fatal error: spl_autoload(): Class Foo could not be loaded in %s on line 3
+Fatal error: Class 'Foo' not found in %s on line %d

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to