tony2001 Fri Apr 20 21:13:45 2007 UTC
Modified files:
/php-src/ext/standard/tests/array array_merge.phpt array_push.phpt
array_slice.phpt
array_user_key_compare.phpt
count_recursive.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_merge.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_merge.phpt
diff -u php-src/ext/standard/tests/array/array_merge.phpt:1.1
php-src/ext/standard/tests/array/array_merge.phpt:1.2
--- php-src/ext/standard/tests/array/array_merge.phpt:1.1 Wed Apr 11
11:44:37 2007
+++ php-src/ext/standard/tests/array/array_merge.phpt Fri Apr 20 21:13:45 2007
@@ -760,3 +760,678 @@
Warning: array_merge(): Argument #3 is not an array in %s on line %d
NULL
Done
+--UEXPECTF--
+*** Testing array_merge() basic functionality ***
+
+--- Iteration 0 ---
+-- Inner iteration 0 of Iteration 0 --
+Array
+(
+)
+
+-- Inner iteration 1 of Iteration 0 --
+Array
+(
+ [0] => string
+)
+
+-- Inner iteration 2 of Iteration 0 --
+Array
+(
+ [] => string
+)
+
+-- Inner iteration 3 of Iteration 0 --
+Array
+(
+ [0] => 12
+)
+
+-- Inner iteration 4 of Iteration 0 --
+Array
+(
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 0 --
+Array
+(
+ [0] => 1
+ [1] => string
+ [2] =>
+ [3] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 0 --
+Array
+(
+ [0] =>
+ [1] => Hi
+ [string] => hello
+ [2] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+)
+
+
+--- Iteration 1 ---
+-- Inner iteration 0 of Iteration 1 --
+Array
+(
+ [0] => string
+)
+
+-- Inner iteration 1 of Iteration 1 --
+Array
+(
+ [0] => string
+ [1] => string
+)
+
+-- Inner iteration 2 of Iteration 1 --
+Array
+(
+ [0] => string
+ [] => string
+)
+
+-- Inner iteration 3 of Iteration 1 --
+Array
+(
+ [0] => string
+ [1] => 12
+)
+
+-- Inner iteration 4 of Iteration 1 --
+Array
+(
+ [0] => string
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 1 --
+Array
+(
+ [0] => string
+ [1] => 1
+ [2] => string
+ [3] =>
+ [4] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 1 --
+Array
+(
+ [0] => string
+ [1] =>
+ [2] => Hi
+ [string] => hello
+ [3] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+)
+
+
+--- Iteration 2 ---
+-- Inner iteration 0 of Iteration 2 --
+Array
+(
+ [] => string
+)
+
+-- Inner iteration 1 of Iteration 2 --
+Array
+(
+ [] => string
+ [0] => string
+)
+
+-- Inner iteration 2 of Iteration 2 --
+Array
+(
+ [] => string
+)
+
+-- Inner iteration 3 of Iteration 2 --
+Array
+(
+ [] => string
+ [0] => 12
+)
+
+-- Inner iteration 4 of Iteration 2 --
+Array
+(
+ [] => string
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 2 --
+Array
+(
+ [] => string
+ [0] => 1
+ [1] => string
+ [2] =>
+ [3] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 2 --
+Array
+(
+ [] => string
+ [0] =>
+ [1] => Hi
+ [string] => hello
+ [2] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+)
+
+
+--- Iteration 3 ---
+-- Inner iteration 0 of Iteration 3 --
+Array
+(
+ [0] => 12
+)
+
+-- Inner iteration 1 of Iteration 3 --
+Array
+(
+ [0] => 12
+ [1] => string
+)
+
+-- Inner iteration 2 of Iteration 3 --
+Array
+(
+ [0] => 12
+ [] => string
+)
+
+-- Inner iteration 3 of Iteration 3 --
+Array
+(
+ [0] => 12
+ [1] => 12
+)
+
+-- Inner iteration 4 of Iteration 3 --
+Array
+(
+ [0] => 12
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 3 --
+Array
+(
+ [0] => 12
+ [1] => 1
+ [2] => string
+ [3] =>
+ [4] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 3 --
+Array
+(
+ [0] => 12
+ [1] =>
+ [2] => Hi
+ [string] => hello
+ [3] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+)
+
+
+--- Iteration 4 ---
+-- Inner iteration 0 of Iteration 4 --
+Array
+(
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+)
+
+-- Inner iteration 1 of Iteration 4 --
+Array
+(
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+ [0] => string
+)
+
+-- Inner iteration 2 of Iteration 4 --
+Array
+(
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+ [] => string
+)
+
+-- Inner iteration 3 of Iteration 4 --
+Array
+(
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+ [0] => 12
+)
+
+-- Inner iteration 4 of Iteration 4 --
+Array
+(
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 4 --
+Array
+(
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+ [0] => 1
+ [1] => string
+ [2] =>
+ [3] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 4 --
+Array
+(
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+ [0] =>
+ [1] => Hi
+ [string] => hello
+ [2] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+)
+
+
+--- Iteration 5 ---
+-- Inner iteration 0 of Iteration 5 --
+Array
+(
+ [0] => 1
+ [1] => string
+ [2] =>
+ [3] => -2.344
+)
+
+-- Inner iteration 1 of Iteration 5 --
+Array
+(
+ [0] => 1
+ [1] => string
+ [2] =>
+ [3] => -2.344
+ [4] => string
+)
+
+-- Inner iteration 2 of Iteration 5 --
+Array
+(
+ [0] => 1
+ [1] => string
+ [2] =>
+ [3] => -2.344
+ [] => string
+)
+
+-- Inner iteration 3 of Iteration 5 --
+Array
+(
+ [0] => 1
+ [1] => string
+ [2] =>
+ [3] => -2.344
+ [4] => 12
+)
+
+-- Inner iteration 4 of Iteration 5 --
+Array
+(
+ [0] => 1
+ [1] => string
+ [2] =>
+ [3] => -2.344
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 5 --
+Array
+(
+ [0] => 1
+ [1] => string
+ [2] =>
+ [3] => -2.344
+ [4] => 1
+ [5] => string
+ [6] =>
+ [7] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 5 --
+Array
+(
+ [0] => 1
+ [1] => string
+ [2] =>
+ [3] => -2.344
+ [4] =>
+ [5] => Hi
+ [string] => hello
+ [6] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+)
+
+
+--- Iteration 6 ---
+-- Inner iteration 0 of Iteration 6 --
+Array
+(
+ [0] =>
+ [1] => Hi
+ [string] => hello
+ [2] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+)
+
+-- Inner iteration 1 of Iteration 6 --
+Array
+(
+ [0] =>
+ [1] => Hi
+ [string] => hello
+ [2] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+ [3] => string
+)
+
+-- Inner iteration 2 of Iteration 6 --
+Array
+(
+ [0] =>
+ [1] => Hi
+ [string] => hello
+ [2] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+ [] => string
+)
+
+-- Inner iteration 3 of Iteration 6 --
+Array
+(
+ [0] =>
+ [1] => Hi
+ [string] => hello
+ [2] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+ [3] => 12
+)
+
+-- Inner iteration 4 of Iteration 6 --
+Array
+(
+ [0] =>
+ [1] => Hi
+ [string] => hello
+ [2] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+ [a] => 1
+ [b] => string
+ [c] =>
+ [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 6 --
+Array
+(
+ [0] =>
+ [1] => Hi
+ [string] => hello
+ [2] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+ [3] => 1
+ [4] => string
+ [5] =>
+ [6] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 6 --
+Array
+(
+ [0] =>
+ [1] => Hi
+ [string] => hello
+ [2] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+ [3] =>
+ [4] => Hi
+ [5] => Array
+ (
+ [] => World
+ [-2.34] => a
+ [0] => b
+ )
+
+)
+
+*** Testing array_merge() with three or more arrays ***
+array(12) {
+ [0]=>
+ int(1)
+ [1]=>
+ unicode(6) "string"
+ [2]=>
+ NULL
+ [3]=>
+ float(-2.344)
+ [u"a"]=>
+ int(1)
+ [u"b"]=>
+ unicode(6) "string"
+ [u"c"]=>
+ NULL
+ [u"d"]=>
+ float(-2.344)
+ [4]=>
+ NULL
+ [5]=>
+ unicode(2) "Hi"
+ [u"string"]=>
+ unicode(5) "hello"
+ [6]=>
+ array(3) {
+ [u""]=>
+ unicode(5) "World"
+ [u"-2.34"]=>
+ unicode(1) "a"
+ [0]=>
+ unicode(1) "b"
+ }
+}
+array(6) {
+ [0]=>
+ int(1)
+ [1]=>
+ unicode(6) "string"
+ [2]=>
+ NULL
+ [3]=>
+ float(-2.344)
+ [4]=>
+ unicode(12) "array on fly"
+ [u"nullarray"]=>
+ array(0) {
+ }
+}
+
+*** Testing single array argument ***
+array(0) {
+}
+array(4) {
+ [u"a"]=>
+ int(1)
+ [u"b"]=>
+ unicode(6) "string"
+ [u"c"]=>
+ NULL
+ [u"d"]=>
+ float(-2.344)
+}
+array(4) {
+ [0]=>
+ int(1)
+ [1]=>
+ unicode(6) "string"
+ [2]=>
+ NULL
+ [3]=>
+ float(-2.344)
+}
+array(4) {
+ [0]=>
+ NULL
+ [1]=>
+ unicode(2) "Hi"
+ [u"string"]=>
+ unicode(5) "hello"
+ [2]=>
+ array(3) {
+ [u""]=>
+ unicode(5) "World"
+ [u"-2.34"]=>
+ unicode(1) "a"
+ [0]=>
+ unicode(1) "b"
+ }
+}
+
+*** Testing array_merge() with typecasting non-array to array ***
+array(7) {
+ [u"a"]=>
+ int(1)
+ [u"b"]=>
+ unicode(6) "string"
+ [u"c"]=>
+ NULL
+ [u"d"]=>
+ float(-2.344)
+ [0]=>
+ unicode(5) "type1"
+ [1]=>
+ int(10)
+ [2]=>
+ float(12.34)
+}
+
+*** Testing error conditions ***
+Warning: Wrong parameter count for array_merge() in %s on line %d
+NULL
+
+Warning: array_merge(): Argument #1 is not an array in %s on line %d
+
+Warning: array_merge(): Argument #2 is not an array in %s on line %d
+NULL
+
+Warning: array_merge(): Argument #3 is not an array in %s on line %d
+NULL
+
+Notice: Undefined variable: arr4 in %s on line %d
+
+Warning: array_merge(): Argument #3 is not an array in %s on line %d
+NULL
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_push.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_push.phpt
diff -u php-src/ext/standard/tests/array/array_push.phpt:1.1
php-src/ext/standard/tests/array/array_push.phpt:1.2
--- php-src/ext/standard/tests/array/array_push.phpt:1.1 Wed Apr 11
11:44:37 2007
+++ php-src/ext/standard/tests/array/array_push.phpt Fri Apr 20 21:13:45 2007
@@ -280,3 +280,214 @@
}
Done
+--UEXPECTF--
+*** Testing Error Conditions ***
+
+Warning: Wrong parameter count for array_push() in %s on line %d
+NULL
+
+Warning: array_push(): First argument should be an array in %s on line %d
+bool(false)
+
+Warning: array_push(): First argument should be an array in %s on line %d
+bool(false)
+int(11)
+int(1)
+
+*** Testing with various array inputs ***
+
+-- Input Array for Iteration 1 is --
+Array
+(
+)
+
+Output after push is :
+int(2)
+
+-- Input Array for Iteration 2 is --
+Array
+(
+ [0] => 1
+ [1] => 2
+ [2] => 3
+ [3] => 4
+ [4] => 5
+ [5] => 6
+ [6] => 7
+ [7] => 8
+ [8] => 9
+ [9] => 1
+ [10] => 2
+)
+
+Output after push is :
+int(13)
+
+-- Input Array for Iteration 3 is --
+Array
+(
+ [0] => One
+ [1] => _Two
+ [2] => Three
+ [3] => Four
+ [4] => Five
+)
+
+Output after push is :
+int(7)
+
+-- Input Array for Iteration 4 is --
+Array
+(
+ [0] => 6
+ [1] => six
+ [2] => 7
+ [3] => seven
+ [4] => 8
+ [5] => eight
+ [6] => 9
+ [7] => nine
+)
+
+Output after push is :
+int(10)
+
+-- Input Array for Iteration 5 is --
+Array
+(
+ [a] => aaa
+ [A] => AAA
+ [c] => ccc
+ [d] => ddd
+ [e] => eee
+)
+
+Output after push is :
+int(7)
+
+-- Input Array for Iteration 6 is --
+Array
+(
+ [1] => one
+ [2] => two
+ [3] => three
+ [4] => four
+ [5] => five
+)
+
+Output after push is :
+int(7)
+
+-- Input Array for Iteration 7 is --
+Array
+(
+ [1] => one
+ [2] => two
+ [3] => 7
+ [4] => four
+ [5] => five
+)
+
+Output after push is :
+int(7)
+
+-- Input Array for Iteration 8 is --
+Array
+(
+ [f] => fff
+ [1] => one
+ [4] => 6
+ [] => 3
+ [2] => float
+ [F] => FFF
+ [blank] =>
+ [3] => 3.7
+ [5] => Five
+ [6] => 8.6
+ [4name] => jonny
+ [a] =>
+)
+
+Output after push is :
+int(14)
+
+-- Input Array for Iteration 9 is --
+Array
+(
+ [0] => 12
+ [1] => name
+ [2] => age
+ [3] => 45
+)
+
+Output after push is :
+int(6)
+
+-- Input Array for Iteration 10 is --
+Array
+(
+ [0] => Array
+ (
+ [0] => oNe
+ [1] => tWo
+ [2] => 4
+ )
+
+ [1] => Array
+ (
+ [0] => 10
+ [1] => 20
+ [2] => 30
+ [3] => 40
+ [4] => 50
+ )
+
+ [2] => Array
+ (
+ )
+
+)
+
+Output after push is :
+int(5)
+
+-- Input Array for Iteration 11 is --
+Array
+(
+ [one] => 2
+ [three] => 3
+ [0] => 3
+ [1] => 4
+ [3] => 33
+ [4] => 44
+ [5] => 57
+ [6] => 6
+ [5.4] => 554
+ [5.7] => 557
+)
+
+Output after push is :
+int(12)
+
+*** Checking for return value and the new array formed from push operation ***
+int(8)
+array(8) {
+ [0]=>
+ unicode(3) "One"
+ [1]=>
+ unicode(4) "_Two"
+ [2]=>
+ unicode(5) "Three"
+ [3]=>
+ unicode(4) "Four"
+ [4]=>
+ unicode(4) "Five"
+ [5]=>
+ int(22)
+ [6]=>
+ int(33)
+ [7]=>
+ unicode(2) "44"
+}
+
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_slice.phpt
diff -u php-src/ext/standard/tests/array/array_slice.phpt:1.1
php-src/ext/standard/tests/array/array_slice.phpt:1.2
--- php-src/ext/standard/tests/array/array_slice.phpt:1.1 Wed Mar 7
13:22:26 2007
+++ php-src/ext/standard/tests/array/array_slice.phpt Fri Apr 20 21:13:45 2007
@@ -109,7 +109,7 @@
*** Output for string Argument ***
-Warning: array_slice() expects parameter %d to be array, string given in /%s
on line %d
+Warning: array_slice() expects parameter %d to be array, string given in %s on
line %d%d
*** Iteration 1 ***
@@ -1459,3 +1459,1372 @@
[0]=>
string(5) "Three"
}
+--UEXPECTF--
+*** Output for Zero Argument ***
+
+Warning: array_slice() expects at least 2 parameters, 0 given in %s on line %d
+
+*** Output for Single array Argument ***
+
+Warning: array_slice() expects at least 2 parameters, 1 given in %s on line %d
+
+*** Output for invalid number of Arguments ***
+
+Warning: array_slice() expects at most 4 parameters, 5 given in %s on line %d
+
+*** Output for scalar Argument ***
+
+Warning: array_slice() expects parameter 1 to be array, integer given in %s on
line %d
+
+*** Output for string Argument ***
+
+Warning: array_slice() expects parameter 1 to be array, Unicode string given
in %s on line %d
+
+*** Iteration 1 ***
+
+*** Variation with first two Arguments ***
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first three Arguments ***
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first two arguments with preserve_key value TRUE ***
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Iteration 2 ***
+
+*** Variation with first two Arguments ***
+array(8) {
+ [0]=>
+ int(2)
+ [1]=>
+ int(3)
+ [2]=>
+ int(4)
+ [3]=>
+ int(5)
+ [4]=>
+ int(6)
+ [5]=>
+ int(7)
+ [6]=>
+ int(8)
+ [7]=>
+ int(9)
+}
+array(9) {
+ [0]=>
+ int(1)
+ [1]=>
+ int(2)
+ [2]=>
+ int(3)
+ [3]=>
+ int(4)
+ [4]=>
+ int(5)
+ [5]=>
+ int(6)
+ [6]=>
+ int(7)
+ [7]=>
+ int(8)
+ [8]=>
+ int(9)
+}
+array(2) {
+ [0]=>
+ int(8)
+ [1]=>
+ int(9)
+}
+
+*** Variation with first three Arguments ***
+array(3) {
+ [0]=>
+ int(2)
+ [1]=>
+ int(3)
+ [2]=>
+ int(4)
+}
+array(0) {
+}
+array(5) {
+ [0]=>
+ int(2)
+ [1]=>
+ int(3)
+ [2]=>
+ int(4)
+ [3]=>
+ int(5)
+ [4]=>
+ int(6)
+}
+array(3) {
+ [0]=>
+ int(1)
+ [1]=>
+ int(2)
+ [2]=>
+ int(3)
+}
+array(0) {
+}
+array(6) {
+ [0]=>
+ int(1)
+ [1]=>
+ int(2)
+ [2]=>
+ int(3)
+ [3]=>
+ int(4)
+ [4]=>
+ int(5)
+ [5]=>
+ int(6)
+}
+array(2) {
+ [0]=>
+ int(8)
+ [1]=>
+ int(9)
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first two arguments with preserve_key value TRUE ***
+array(3) {
+ [1]=>
+ int(2)
+ [2]=>
+ int(3)
+ [3]=>
+ int(4)
+}
+array(0) {
+}
+array(5) {
+ [1]=>
+ int(2)
+ [2]=>
+ int(3)
+ [3]=>
+ int(4)
+ [4]=>
+ int(5)
+ [5]=>
+ int(6)
+}
+array(3) {
+ [0]=>
+ int(1)
+ [1]=>
+ int(2)
+ [2]=>
+ int(3)
+}
+array(0) {
+}
+array(6) {
+ [0]=>
+ int(1)
+ [1]=>
+ int(2)
+ [2]=>
+ int(3)
+ [3]=>
+ int(4)
+ [4]=>
+ int(5)
+ [5]=>
+ int(6)
+}
+array(2) {
+ [7]=>
+ int(8)
+ [8]=>
+ int(9)
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Iteration 3 ***
+
+*** Variation with first two Arguments ***
+array(4) {
+ [0]=>
+ unicode(3) "Two"
+ [1]=>
+ unicode(5) "Three"
+ [2]=>
+ unicode(4) "Four"
+ [3]=>
+ unicode(4) "Five"
+}
+array(5) {
+ [0]=>
+ unicode(3) "One"
+ [1]=>
+ unicode(3) "Two"
+ [2]=>
+ unicode(5) "Three"
+ [3]=>
+ unicode(4) "Four"
+ [4]=>
+ unicode(4) "Five"
+}
+array(2) {
+ [0]=>
+ unicode(4) "Four"
+ [1]=>
+ unicode(4) "Five"
+}
+
+*** Variation with first three Arguments ***
+array(3) {
+ [0]=>
+ unicode(3) "Two"
+ [1]=>
+ unicode(5) "Three"
+ [2]=>
+ unicode(4) "Four"
+}
+array(0) {
+}
+array(1) {
+ [0]=>
+ unicode(3) "Two"
+}
+array(3) {
+ [0]=>
+ unicode(3) "One"
+ [1]=>
+ unicode(3) "Two"
+ [2]=>
+ unicode(5) "Three"
+}
+array(0) {
+}
+array(2) {
+ [0]=>
+ unicode(3) "One"
+ [1]=>
+ unicode(3) "Two"
+}
+array(2) {
+ [0]=>
+ unicode(4) "Four"
+ [1]=>
+ unicode(4) "Five"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first two arguments with preserve_key value TRUE ***
+array(3) {
+ [1]=>
+ unicode(3) "Two"
+ [2]=>
+ unicode(5) "Three"
+ [3]=>
+ unicode(4) "Four"
+}
+array(0) {
+}
+array(1) {
+ [1]=>
+ unicode(3) "Two"
+}
+array(3) {
+ [0]=>
+ unicode(3) "One"
+ [1]=>
+ unicode(3) "Two"
+ [2]=>
+ unicode(5) "Three"
+}
+array(0) {
+}
+array(2) {
+ [0]=>
+ unicode(3) "One"
+ [1]=>
+ unicode(3) "Two"
+}
+array(2) {
+ [3]=>
+ unicode(4) "Four"
+ [4]=>
+ unicode(4) "Five"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Iteration 4 ***
+
+*** Variation with first two Arguments ***
+array(7) {
+ [0]=>
+ unicode(3) "six"
+ [1]=>
+ int(7)
+ [2]=>
+ unicode(5) "seven"
+ [3]=>
+ int(8)
+ [4]=>
+ unicode(5) "eight"
+ [5]=>
+ int(9)
+ [6]=>
+ unicode(4) "nine"
+}
+array(8) {
+ [0]=>
+ int(6)
+ [1]=>
+ unicode(3) "six"
+ [2]=>
+ int(7)
+ [3]=>
+ unicode(5) "seven"
+ [4]=>
+ int(8)
+ [5]=>
+ unicode(5) "eight"
+ [6]=>
+ int(9)
+ [7]=>
+ unicode(4) "nine"
+}
+array(2) {
+ [0]=>
+ int(9)
+ [1]=>
+ unicode(4) "nine"
+}
+
+*** Variation with first three Arguments ***
+array(3) {
+ [0]=>
+ unicode(3) "six"
+ [1]=>
+ int(7)
+ [2]=>
+ unicode(5) "seven"
+}
+array(0) {
+}
+array(4) {
+ [0]=>
+ unicode(3) "six"
+ [1]=>
+ int(7)
+ [2]=>
+ unicode(5) "seven"
+ [3]=>
+ int(8)
+}
+array(3) {
+ [0]=>
+ int(6)
+ [1]=>
+ unicode(3) "six"
+ [2]=>
+ int(7)
+}
+array(0) {
+}
+array(5) {
+ [0]=>
+ int(6)
+ [1]=>
+ unicode(3) "six"
+ [2]=>
+ int(7)
+ [3]=>
+ unicode(5) "seven"
+ [4]=>
+ int(8)
+}
+array(2) {
+ [0]=>
+ int(9)
+ [1]=>
+ unicode(4) "nine"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first two arguments with preserve_key value TRUE ***
+array(3) {
+ [1]=>
+ unicode(3) "six"
+ [2]=>
+ int(7)
+ [3]=>
+ unicode(5) "seven"
+}
+array(0) {
+}
+array(4) {
+ [1]=>
+ unicode(3) "six"
+ [2]=>
+ int(7)
+ [3]=>
+ unicode(5) "seven"
+ [4]=>
+ int(8)
+}
+array(3) {
+ [0]=>
+ int(6)
+ [1]=>
+ unicode(3) "six"
+ [2]=>
+ int(7)
+}
+array(0) {
+}
+array(5) {
+ [0]=>
+ int(6)
+ [1]=>
+ unicode(3) "six"
+ [2]=>
+ int(7)
+ [3]=>
+ unicode(5) "seven"
+ [4]=>
+ int(8)
+}
+array(2) {
+ [6]=>
+ int(9)
+ [7]=>
+ unicode(4) "nine"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Iteration 5 ***
+
+*** Variation with first two Arguments ***
+array(4) {
+ [u"A"]=>
+ unicode(3) "AAA"
+ [u"c"]=>
+ unicode(3) "ccc"
+ [u"d"]=>
+ unicode(3) "ddd"
+ [u"e"]=>
+ unicode(3) "eee"
+}
+array(5) {
+ [u"a"]=>
+ unicode(3) "aaa"
+ [u"A"]=>
+ unicode(3) "AAA"
+ [u"c"]=>
+ unicode(3) "ccc"
+ [u"d"]=>
+ unicode(3) "ddd"
+ [u"e"]=>
+ unicode(3) "eee"
+}
+array(2) {
+ [u"d"]=>
+ unicode(3) "ddd"
+ [u"e"]=>
+ unicode(3) "eee"
+}
+
+*** Variation with first three Arguments ***
+array(3) {
+ [u"A"]=>
+ unicode(3) "AAA"
+ [u"c"]=>
+ unicode(3) "ccc"
+ [u"d"]=>
+ unicode(3) "ddd"
+}
+array(0) {
+}
+array(1) {
+ [u"A"]=>
+ unicode(3) "AAA"
+}
+array(3) {
+ [u"a"]=>
+ unicode(3) "aaa"
+ [u"A"]=>
+ unicode(3) "AAA"
+ [u"c"]=>
+ unicode(3) "ccc"
+}
+array(0) {
+}
+array(2) {
+ [u"a"]=>
+ unicode(3) "aaa"
+ [u"A"]=>
+ unicode(3) "AAA"
+}
+array(2) {
+ [u"d"]=>
+ unicode(3) "ddd"
+ [u"e"]=>
+ unicode(3) "eee"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first two arguments with preserve_key value TRUE ***
+array(3) {
+ [u"A"]=>
+ unicode(3) "AAA"
+ [u"c"]=>
+ unicode(3) "ccc"
+ [u"d"]=>
+ unicode(3) "ddd"
+}
+array(0) {
+}
+array(1) {
+ [u"A"]=>
+ unicode(3) "AAA"
+}
+array(3) {
+ [u"a"]=>
+ unicode(3) "aaa"
+ [u"A"]=>
+ unicode(3) "AAA"
+ [u"c"]=>
+ unicode(3) "ccc"
+}
+array(0) {
+}
+array(2) {
+ [u"a"]=>
+ unicode(3) "aaa"
+ [u"A"]=>
+ unicode(3) "AAA"
+}
+array(2) {
+ [u"d"]=>
+ unicode(3) "ddd"
+ [u"e"]=>
+ unicode(3) "eee"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Iteration 6 ***
+
+*** Variation with first two Arguments ***
+array(4) {
+ [0]=>
+ unicode(3) "two"
+ [1]=>
+ unicode(5) "three"
+ [2]=>
+ unicode(4) "four"
+ [3]=>
+ unicode(4) "five"
+}
+array(5) {
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ unicode(3) "two"
+ [2]=>
+ unicode(5) "three"
+ [3]=>
+ unicode(4) "four"
+ [4]=>
+ unicode(4) "five"
+}
+array(2) {
+ [0]=>
+ unicode(4) "four"
+ [1]=>
+ unicode(4) "five"
+}
+
+*** Variation with first three Arguments ***
+array(3) {
+ [0]=>
+ unicode(3) "two"
+ [1]=>
+ unicode(5) "three"
+ [2]=>
+ unicode(4) "four"
+}
+array(0) {
+}
+array(1) {
+ [0]=>
+ unicode(3) "two"
+}
+array(3) {
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ unicode(3) "two"
+ [2]=>
+ unicode(5) "three"
+}
+array(0) {
+}
+array(2) {
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ unicode(3) "two"
+}
+array(2) {
+ [0]=>
+ unicode(4) "four"
+ [1]=>
+ unicode(4) "five"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first two arguments with preserve_key value TRUE ***
+array(3) {
+ [2]=>
+ unicode(3) "two"
+ [3]=>
+ unicode(5) "three"
+ [4]=>
+ unicode(4) "four"
+}
+array(0) {
+}
+array(1) {
+ [2]=>
+ unicode(3) "two"
+}
+array(3) {
+ [1]=>
+ unicode(3) "one"
+ [2]=>
+ unicode(3) "two"
+ [3]=>
+ unicode(5) "three"
+}
+array(0) {
+}
+array(2) {
+ [1]=>
+ unicode(3) "one"
+ [2]=>
+ unicode(3) "two"
+}
+array(2) {
+ [4]=>
+ unicode(4) "four"
+ [5]=>
+ unicode(4) "five"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Iteration 7 ***
+
+*** Variation with first two Arguments ***
+array(4) {
+ [0]=>
+ unicode(3) "two"
+ [1]=>
+ int(7)
+ [2]=>
+ unicode(4) "four"
+ [3]=>
+ unicode(4) "five"
+}
+array(5) {
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ unicode(3) "two"
+ [2]=>
+ int(7)
+ [3]=>
+ unicode(4) "four"
+ [4]=>
+ unicode(4) "five"
+}
+array(2) {
+ [0]=>
+ unicode(4) "four"
+ [1]=>
+ unicode(4) "five"
+}
+
+*** Variation with first three Arguments ***
+array(3) {
+ [0]=>
+ unicode(3) "two"
+ [1]=>
+ int(7)
+ [2]=>
+ unicode(4) "four"
+}
+array(0) {
+}
+array(1) {
+ [0]=>
+ unicode(3) "two"
+}
+array(3) {
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ unicode(3) "two"
+ [2]=>
+ int(7)
+}
+array(0) {
+}
+array(2) {
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ unicode(3) "two"
+}
+array(2) {
+ [0]=>
+ unicode(4) "four"
+ [1]=>
+ unicode(4) "five"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first two arguments with preserve_key value TRUE ***
+array(3) {
+ [2]=>
+ unicode(3) "two"
+ [3]=>
+ int(7)
+ [4]=>
+ unicode(4) "four"
+}
+array(0) {
+}
+array(1) {
+ [2]=>
+ unicode(3) "two"
+}
+array(3) {
+ [1]=>
+ unicode(3) "one"
+ [2]=>
+ unicode(3) "two"
+ [3]=>
+ int(7)
+}
+array(0) {
+}
+array(2) {
+ [1]=>
+ unicode(3) "one"
+ [2]=>
+ unicode(3) "two"
+}
+array(2) {
+ [4]=>
+ unicode(4) "four"
+ [5]=>
+ unicode(4) "five"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Iteration 8 ***
+
+*** Variation with first two Arguments ***
+array(9) {
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ int(6)
+ [u""]=>
+ unicode(5) "blank"
+ [2]=>
+ unicode(5) "float"
+ [u"F"]=>
+ unicode(3) "FFF"
+ [u"blank"]=>
+ unicode(0) ""
+ [3]=>
+ float(3.7)
+ [4]=>
+ unicode(4) "Five"
+ [5]=>
+ float(8.6)
+}
+array(10) {
+ [u"f"]=>
+ unicode(3) "fff"
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ int(6)
+ [u""]=>
+ unicode(5) "blank"
+ [2]=>
+ unicode(5) "float"
+ [u"F"]=>
+ unicode(3) "FFF"
+ [u"blank"]=>
+ unicode(0) ""
+ [3]=>
+ float(3.7)
+ [4]=>
+ unicode(4) "Five"
+ [5]=>
+ float(8.6)
+}
+array(2) {
+ [0]=>
+ unicode(4) "Five"
+ [1]=>
+ float(8.6)
+}
+
+*** Variation with first three Arguments ***
+array(3) {
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ int(6)
+ [u""]=>
+ unicode(5) "blank"
+}
+array(0) {
+}
+array(6) {
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ int(6)
+ [u""]=>
+ unicode(5) "blank"
+ [2]=>
+ unicode(5) "float"
+ [u"F"]=>
+ unicode(3) "FFF"
+ [u"blank"]=>
+ unicode(0) ""
+}
+array(3) {
+ [u"f"]=>
+ unicode(3) "fff"
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ int(6)
+}
+array(0) {
+}
+array(7) {
+ [u"f"]=>
+ unicode(3) "fff"
+ [0]=>
+ unicode(3) "one"
+ [1]=>
+ int(6)
+ [u""]=>
+ unicode(5) "blank"
+ [2]=>
+ unicode(5) "float"
+ [u"F"]=>
+ unicode(3) "FFF"
+ [u"blank"]=>
+ unicode(0) ""
+}
+array(2) {
+ [0]=>
+ unicode(4) "Five"
+ [1]=>
+ float(8.6)
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first two arguments with preserve_key value TRUE ***
+array(3) {
+ [1]=>
+ unicode(3) "one"
+ [4]=>
+ int(6)
+ [u""]=>
+ unicode(5) "blank"
+}
+array(0) {
+}
+array(6) {
+ [1]=>
+ unicode(3) "one"
+ [4]=>
+ int(6)
+ [u""]=>
+ unicode(5) "blank"
+ [2]=>
+ unicode(5) "float"
+ [u"F"]=>
+ unicode(3) "FFF"
+ [u"blank"]=>
+ unicode(0) ""
+}
+array(3) {
+ [u"f"]=>
+ unicode(3) "fff"
+ [1]=>
+ unicode(3) "one"
+ [4]=>
+ int(6)
+}
+array(0) {
+}
+array(7) {
+ [u"f"]=>
+ unicode(3) "fff"
+ [1]=>
+ unicode(3) "one"
+ [4]=>
+ int(6)
+ [u""]=>
+ unicode(5) "blank"
+ [2]=>
+ unicode(5) "float"
+ [u"F"]=>
+ unicode(3) "FFF"
+ [u"blank"]=>
+ unicode(0) ""
+}
+array(2) {
+ [5]=>
+ unicode(4) "Five"
+ [6]=>
+ float(8.6)
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Iteration 9 ***
+
+*** Variation with first two Arguments ***
+array(3) {
+ [0]=>
+ unicode(4) "name"
+ [1]=>
+ unicode(3) "age"
+ [2]=>
+ unicode(2) "45"
+}
+array(4) {
+ [0]=>
+ int(12)
+ [1]=>
+ unicode(4) "name"
+ [2]=>
+ unicode(3) "age"
+ [3]=>
+ unicode(2) "45"
+}
+array(2) {
+ [0]=>
+ unicode(3) "age"
+ [1]=>
+ unicode(2) "45"
+}
+
+*** Variation with first three Arguments ***
+array(3) {
+ [0]=>
+ unicode(4) "name"
+ [1]=>
+ unicode(3) "age"
+ [2]=>
+ unicode(2) "45"
+}
+array(0) {
+}
+array(0) {
+}
+array(3) {
+ [0]=>
+ int(12)
+ [1]=>
+ unicode(4) "name"
+ [2]=>
+ unicode(3) "age"
+}
+array(0) {
+}
+array(1) {
+ [0]=>
+ int(12)
+}
+array(2) {
+ [0]=>
+ unicode(3) "age"
+ [1]=>
+ unicode(2) "45"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first two arguments with preserve_key value TRUE ***
+array(3) {
+ [1]=>
+ unicode(4) "name"
+ [2]=>
+ unicode(3) "age"
+ [3]=>
+ unicode(2) "45"
+}
+array(0) {
+}
+array(0) {
+}
+array(3) {
+ [0]=>
+ int(12)
+ [1]=>
+ unicode(4) "name"
+ [2]=>
+ unicode(3) "age"
+}
+array(0) {
+}
+array(1) {
+ [0]=>
+ int(12)
+}
+array(2) {
+ [2]=>
+ unicode(3) "age"
+ [3]=>
+ unicode(2) "45"
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Iteration 10 ***
+
+*** Variation with first two Arguments ***
+array(2) {
+ [0]=>
+ array(5) {
+ [0]=>
+ int(10)
+ [1]=>
+ int(20)
+ [2]=>
+ int(30)
+ [3]=>
+ int(40)
+ [4]=>
+ int(50)
+ }
+ [1]=>
+ array(0) {
+ }
+}
+array(3) {
+ [0]=>
+ array(3) {
+ [0]=>
+ unicode(3) "oNe"
+ [1]=>
+ unicode(3) "tWo"
+ [2]=>
+ int(4)
+ }
+ [1]=>
+ array(5) {
+ [0]=>
+ int(10)
+ [1]=>
+ int(20)
+ [2]=>
+ int(30)
+ [3]=>
+ int(40)
+ [4]=>
+ int(50)
+ }
+ [2]=>
+ array(0) {
+ }
+}
+array(2) {
+ [0]=>
+ array(5) {
+ [0]=>
+ int(10)
+ [1]=>
+ int(20)
+ [2]=>
+ int(30)
+ [3]=>
+ int(40)
+ [4]=>
+ int(50)
+ }
+ [1]=>
+ array(0) {
+ }
+}
+
+*** Variation with first three Arguments ***
+array(2) {
+ [0]=>
+ array(5) {
+ [0]=>
+ int(10)
+ [1]=>
+ int(20)
+ [2]=>
+ int(30)
+ [3]=>
+ int(40)
+ [4]=>
+ int(50)
+ }
+ [1]=>
+ array(0) {
+ }
+}
+array(0) {
+}
+array(0) {
+}
+array(3) {
+ [0]=>
+ array(3) {
+ [0]=>
+ unicode(3) "oNe"
+ [1]=>
+ unicode(3) "tWo"
+ [2]=>
+ int(4)
+ }
+ [1]=>
+ array(5) {
+ [0]=>
+ int(10)
+ [1]=>
+ int(20)
+ [2]=>
+ int(30)
+ [3]=>
+ int(40)
+ [4]=>
+ int(50)
+ }
+ [2]=>
+ array(0) {
+ }
+}
+array(0) {
+}
+array(0) {
+}
+array(2) {
+ [0]=>
+ array(5) {
+ [0]=>
+ int(10)
+ [1]=>
+ int(20)
+ [2]=>
+ int(30)
+ [3]=>
+ int(40)
+ [4]=>
+ int(50)
+ }
+ [1]=>
+ array(0) {
+ }
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Variation with first two arguments with preserve_key value TRUE ***
+array(2) {
+ [1]=>
+ array(5) {
+ [0]=>
+ int(10)
+ [1]=>
+ int(20)
+ [2]=>
+ int(30)
+ [3]=>
+ int(40)
+ [4]=>
+ int(50)
+ }
+ [2]=>
+ array(0) {
+ }
+}
+array(0) {
+}
+array(0) {
+}
+array(3) {
+ [0]=>
+ array(3) {
+ [0]=>
+ unicode(3) "oNe"
+ [1]=>
+ unicode(3) "tWo"
+ [2]=>
+ int(4)
+ }
+ [1]=>
+ array(5) {
+ [0]=>
+ int(10)
+ [1]=>
+ int(20)
+ [2]=>
+ int(30)
+ [3]=>
+ int(40)
+ [4]=>
+ int(50)
+ }
+ [2]=>
+ array(0) {
+ }
+}
+array(0) {
+}
+array(0) {
+}
+array(2) {
+ [1]=>
+ array(5) {
+ [0]=>
+ int(10)
+ [1]=>
+ int(20)
+ [2]=>
+ int(30)
+ [3]=>
+ int(40)
+ [4]=>
+ int(50)
+ }
+ [2]=>
+ array(0) {
+ }
+}
+array(0) {
+}
+array(0) {
+}
+
+*** Typical Variation of offset and length Arguments ***
+array(1) {
+ [1]=>
+ unicode(3) "Two"
+}
+array(1) {
+ [0]=>
+ unicode(3) "Two"
+}
+array(1) {
+ [2]=>
+ unicode(5) "Three"
+}
+array(1) {
+ [0]=>
+ unicode(5) "Three"
+}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_user_key_compare.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_user_key_compare.phpt
diff -u php-src/ext/standard/tests/array/array_user_key_compare.phpt:1.2
php-src/ext/standard/tests/array/array_user_key_compare.phpt:1.3
--- php-src/ext/standard/tests/array/array_user_key_compare.phpt:1.2 Fri Mar
16 20:16:05 2007
+++ php-src/ext/standard/tests/array/array_user_key_compare.phpt Fri Apr
20 21:13:45 2007
@@ -17,3 +17,5 @@
?>
--EXPECTF--
string(1) "A"
+--UEXPECTF--
+unicode(1) "A"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/count_recursive.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/tests/array/count_recursive.phpt
diff -u php-src/ext/standard/tests/array/count_recursive.phpt:1.5
php-src/ext/standard/tests/array/count_recursive.phpt:1.6
--- php-src/ext/standard/tests/array/count_recursive.phpt:1.5 Wed Apr 11
11:44:37 2007
+++ php-src/ext/standard/tests/array/count_recursive.phpt Fri Apr 20
21:13:45 2007
@@ -1,5 +1,7 @@
--TEST--
Test count() function
+--SKIPIF--
+<?php if (!extension_loaded("spl")) die("skip no SPL extension"); ?>
--FILE--
<?php
/* Prototype: int count ( mixed $var [, int $mode] );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
