Array tests: checked on PHP 5.2.6, 5.3 and 6.0 (Windows, Linux and Linux 64 bit).

diff --git a/ext/standard/tests/array/array_diff_ukey_variation11.phpt b/ext/standard/tests/array/array_diff_ukey_variation11.phpt
index 4882e729b588475d94fd1b3b1d0e2144c8baa908..0ad3fbac5e80cf021ab8e180a3ba071efcd4f92e 100644 (file)
--- a/ext/standard/tests/array/array_diff_ukey_variation11.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation11.phpt
@@ -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 @@ var_dump( array_diff_ukey($array1, $array2, $array3, $value) );
 ===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

diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt
index ba3776e202f73a444710abd748836148c833b870..cf2611aeb9ab160c04e3244cae133306d9470f14 100644 (file)
--- a/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt
@@ -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 @@ var_dump( array_intersect_uassoc($array1, $array2, $array3, $value) );
 ===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

diff --git a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt
index b080eb2300bff234ee0d81918f204eb007dd9a75..69a6500d2f69215ba5fa8606d5f8be9df6915ce1 100644 (file)
--- a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt
@@ -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 @@ var_dump( array_intersect_ukey($array1, $array2, $array3, $value) );
 ===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