rasmus          Sat Feb  2 01:51:17 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard/tests/array   array_map_object1.phpt 
                                        array_map_object2.phpt 
                                        array_map_object3.phpt 
  Log:
  Another batch of fixed tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_object1.phpt?r1=1.1.2.2&r2=1.1.2.3&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.2.2 
php-src/ext/standard/tests/array/array_map_object1.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_map_object1.phpt:1.1.2.2     Thu Jan 
 3 09:43:45 2008
+++ php-src/ext/standard/tests/array/array_map_object1.phpt     Sat Feb  2 
01:51:17 2008
@@ -121,29 +121,35 @@
 *** 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
+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
+
+Warning: array_map() expects parameter 2 to be a valid callback, second array 
member is not a valid method in %s on line %d
 NULL
 
 -- 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
+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
+
+Warning: array_map() expects parameter 2 to be a valid callback, second array 
member is not a valid method in %s on line %d
 NULL
 
 -- class with final method --
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d%d
+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
+
+Warning: array_map() expects parameter 2 to be a valid callback, second array 
member is not a valid method in %s on line %d
 NULL
 
 -- class with static members --
@@ -154,10 +160,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) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_object2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_object2.phpt
diff -u php-src/ext/standard/tests/array/array_map_object2.phpt:1.1.2.2 
php-src/ext/standard/tests/array/array_map_object2.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_map_object2.phpt:1.1.2.2     Thu Jan 
 3 09:43:45 2008
+++ php-src/ext/standard/tests/array/array_map_object2.phpt     Sat Feb  2 
01:51:17 2008
@@ -37,10 +37,10 @@
 *** 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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_object3.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_object3.phpt
diff -u php-src/ext/standard/tests/array/array_map_object3.phpt:1.1.2.2 
php-src/ext/standard/tests/array/array_map_object3.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_map_object3.phpt:1.1.2.2     Thu Jan 
 3 09:43:45 2008
+++ php-src/ext/standard/tests/array/array_map_object3.phpt     Sat Feb  2 
01:51:17 2008
@@ -74,7 +74,7 @@
 }
 -- 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,6 +87,6 @@
 }
 -- 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

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

Reply via email to