ant             Fri Dec  5 12:42:15 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard/tests/array   array_diff_ukey_variation11.phpt 
                                        array_intersect_uassoc_variation11.phpt 
                                        array_intersect_ukey_variation10.phpt 
  Log:
  Array tests: checked on PHP 5.2.6, 5.3 and 6.0 (Windows, Linux and Linux 64 
bit).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_diff_ukey_variation11.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_diff_ukey_variation11.phpt
diff -u 
php-src/ext/standard/tests/array/array_diff_ukey_variation11.phpt:1.1.2.2 
php-src/ext/standard/tests/array/array_diff_ukey_variation11.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_diff_ukey_variation11.phpt:1.1.2.2   
Tue Dec  2 13:32:53 2008
+++ php-src/ext/standard/tests/array/array_diff_ukey_variation11.phpt   Fri Dec 
 5 12:42:15 2008
@@ -1,12 +1,5 @@
 --TEST--
 Test array_diff_ukey() function : usage variation - Passing class without 
string to callback (Handling fatal error)
---SKIPIF--
-<?php
-$php_version = phpversion();
-if(stristr($php_version, "5.2" ) == FALSE){
-  die('skip Test is applicable only for PHP5.2');
-}
-?>
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], 
callback key_comp_func)
@@ -44,10 +37,8 @@
 ===DONE===
 --EXPECTF--
 *** Testing array_diff_ukey() : usage variation ***
-Error: 4096 - Object of class classWithoutToString could not be converted to 
string, %s(%d)
-Error: 2 - array_diff_ukey(): Not a valid callback , %s(%d)
+Error: 2 - array_diff_ukey() expects parameter 3 to be a valid callback, no 
array or string given, %s(%d)
 NULL
-Error: 4096 - Object of class classWithoutToString could not be converted to 
string, %s(%d)
-Error: 2 - array_diff_ukey(): Not a valid callback , %s(%d)
+Error: 2 - array_diff_ukey() expects parameter 4 to be a valid callback, no 
array or string given, %s(%d)
 NULL
 ===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt
diff -u 
php-src/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt:1.1.2.2
 
php-src/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt:1.1.2.3
--- 
php-src/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt:1.1.2.2
    Tue Dec  2 13:32:52 2008
+++ php-src/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt    
Fri Dec  5 12:42:15 2008
@@ -1,12 +1,5 @@
 --TEST--
 Test array_intersect_uassoc() function : usage variation - Passing class 
without string to callback (Handling fatal error)
---SKIPIF--
-<?php
-$php_version = phpversion();
-if(stristr($php_version, "5.2" ) == FALSE){
-  die('skip Test is applicable only for PHP5.2');
-}
-?>
 --FILE--
 <?php
 /* Prototype  : array array_intersect_uassoc(array arr1, array arr2 [, array 
...], callback key_compare_func)
@@ -42,10 +35,8 @@
 ===DONE===
 --EXPECTF--
 *** Testing array_intersect_uassoc() : usage variation ***
-Error: 4096 - Object of class classWithoutToString could not be converted to 
string, %s(%d)
-Error: 2 - array_intersect_uassoc(): Not a valid callback , %s(%d)
+Error: 2 - array_intersect_uassoc() expects parameter 3 to be a valid 
callback, no array or string given, %s(%d)
 NULL
-Error: 4096 - Object of class classWithoutToString could not be converted to 
string, %s(%d)
-Error: 2 - array_intersect_uassoc(): Not a valid callback , %s(%d)
+Error: 2 - array_intersect_uassoc() expects parameter 4 to be a valid 
callback, no array or string given, %s(%d)
 NULL
-===DONE===
+===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_ukey_variation10.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_intersect_ukey_variation10.phpt
diff -u 
php-src/ext/standard/tests/array/array_intersect_ukey_variation10.phpt:1.1.2.2 
php-src/ext/standard/tests/array/array_intersect_ukey_variation10.phpt:1.1.2.3
--- 
php-src/ext/standard/tests/array/array_intersect_ukey_variation10.phpt:1.1.2.2  
    Tue Dec  2 13:32:52 2008
+++ php-src/ext/standard/tests/array/array_intersect_ukey_variation10.phpt      
Fri Dec  5 12:42:15 2008
@@ -1,12 +1,5 @@
 --TEST--
 Test array_intersect_ukey() function : usage variation - Passing class without 
string to callback (Handling fatal error)
---SKIPIF--
-<?php
-$php_version = phpversion();
-if(stristr($php_version, "5.2" ) == FALSE){
-  die('skip Test is applicable only for PHP5.2');
-}
-?>
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array 
...], callback key_compare_func)
@@ -43,10 +36,8 @@
 ===DONE===
 --EXPECTF--
 *** Testing array_intersect_uassoc() : usage variation ***
-Error: 4096 - Object of class classWithoutToString could not be converted to 
string, %s(%d)
-Error: 2 - array_intersect_ukey(): Not a valid callback , %s(%d)
+Error: 2 - array_intersect_ukey() expects parameter 3 to be a valid callback, 
no array or string given, %s(%d)
 NULL
-Error: 4096 - Object of class classWithoutToString could not be converted to 
string, %s(%d)
-Error: 2 - array_intersect_ukey(): Not a valid callback , %s(%d)
+Error: 2 - array_intersect_ukey() expects parameter 4 to be a valid callback, 
no array or string given, %s(%d)
 NULL
 ===DONE===
\ No newline at end of file



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

Reply via email to