cvs: php-src /ext/standard/tests/array sort_variation10.phpt sort_variation11.phpt sort_variation2.phpt sort_variation3.phpt sort_variation4.phpt
sort_variation5.phpt sort_variation6.phpt sort_variation7.phpt sort_variation8.phpt sort_variation9.phpt uasort_basic1.phpt uasort_basic2.phpt
uasort_error.phpt uasort_object1.phpt uasort_object2.phpt uasort_variation1.phpt uasort_variation10.phpt uasort_variation11.phpt
uasort_variation2.phpt uasort_variation3.phpt uasort_variation4.phpt uasort_variation5.phpt uasort_variation6.phpt uasort_variation7.phpt
uasort_variation8.phpt uasort_variation9.phpt

sfox Mon May 26 23:36:10 2008 UTC Modified files: /php-src/ext/standard/tests/array sort_variation10.phpt sort_variation11.phpt sort_variation2.phpt sort_variation3.phpt sort_variation4.phpt sort_variation5.phpt sort_variation6.phpt sort_variation7.phpt sort_variation8.phpt sort_variation9.phpt uasort_basic1.phpt uasort_basic2.phpt uasort_error.phpt uasort_object1.phpt uasort_object2.phpt uasort_variation1.phpt uasort_variation10.phpt uasort_variation11.phpt uasort_variation2.phpt uasort_variation3.phpt uasort_variation4.phpt uasort_variation5.phpt uasort_variation6.phpt uasort_variation7.phpt uasort_variation8.phpt uasort_variation9.phpt Log: - killed off UEXPECT - could someone please fix var_export2.phpt? NUL is corrupted, can't fix here

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_variation10.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/array/sort_variation10.phpt diff -u php-src/ext/standard/tests/array/sort_variation10.phpt:1.1 php-src/ext/standard/tests/array/sort_variation10.phpt:1.2 --- php-src/ext/standard/tests/array/sort_variation10.phpt:1.1 Mon Nov 5 15:17:10 2007 +++ php-src/ext/standard/tests/array/sort_variation10.phpt Mon May 26 23:36:10 2008 @@ -11,7 +11,7 @@ /* * testing sort() by providing different octal array for $array argument * with following flag values - * 1.flag value as defualt + * 1.flag value as default * 2.SORT_REGULAR - compare items normally * 3.SORT_NUMERIC - compare items numerically */ @@ -21,7 +21,7 @@ // an array containing unsorted octal values $unsorted_oct_array = array(01235, 0321, 0345, 066, 0772, 077, -066, -0345, 0); -echo "\n-- Testing sort() by supplying octal value array, 'flag' value is defualt --\n"; +echo "\n-- Testing sort() by supplying octal value array, 'flag' value is default --\n"; $temp_array = $unsorted_oct_array; var_dump(sort($temp_array) ); // expecting : bool(true) var_dump($temp_array); @@ -38,82 +38,10 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** --- Testing sort() by supplying octal value array, 'flag' value is defualt -- -bool(true) -array(9) { - [0]=> - int(-229) - [1]=> - int(-54) - [2]=> - int(0) - [3]=> - int(54) - [4]=> - int(63) - [5]=> - int(209) - [6]=> - int(229) - [7]=> - int(506) - [8]=> - int(669) -} - --- Testing sort() by supplying octal value array, 'flag' value is SORT_REGULAR -- -bool(true) -array(9) { - [0]=> - int(-229) - [1]=> - int(-54) - [2]=> - int(0) - [3]=> - int(54) - [4]=> - int(63) - [5]=> - int(209) - [6]=> - int(229) - [7]=> - int(506) - [8]=> - int(669) -} - --- Testing sort() by supplying octal value array, 'flag' value is SORT_NUMERIC -- -bool(true) -array(9) { - [0]=> - int(-229) - [1]=> - int(-54) - [2]=> - int(0) - [3]=> - int(54) - [4]=> - int(63) - [5]=> - int(209) - [6]=> - int(229) - [7]=> - int(506) - [8]=> - int(669) -} -Done ---UEXPECTF-- -*** Testing sort() : usage variations *** - --- Testing sort() by supplying octal value array, 'flag' value is defualt -- +-- Testing sort() by supplying octal value array, 'flag' value is default -- bool(true) array(9) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_variation11.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/array/sort_variation11.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_variation2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/array/sort_variation2.phpt diff -u php-src/ext/standard/tests/array/sort_variation2.phpt:1.1 php-src/ext/standard/tests/array/sort_variation2.phpt:1.2 --- php-src/ext/standard/tests/array/sort_variation2.phpt:1.1 Mon Nov 5 15:17:10 2007 +++ php-src/ext/standard/tests/array/sort_variation2.phpt Mon May 26 23:36:10 2008 @@ -214,227 +214,6 @@ } -- Iteration 13 -- -Warning: sort() expects parameter 2 to be long, string given in %s on line %d -bool(false) -array(3) { - [0]=> - int(10) - [1]=> - int(2) - [2]=> - int(45) -} --- Iteration 14 -- - -Warning: sort() expects parameter 2 to be long, string given in %s on line %d -bool(false) -array(3) { - [0]=> - int(10) - [1]=> - int(2) - [2]=> - int(45) -} --- Iteration 15 -- - -Warning: sort() expects parameter 2 to be long, string given in %s on line %d -bool(false) -array(3) { - [0]=> - int(10) - [1]=> - int(2) - [2]=> - int(45) -} --- Iteration 16 -- - -Warning: sort() expects parameter 2 to be long, string given in %s on line %d -bool(false) -array(3) { - [0]=> - int(10) - [1]=> - int(2) - [2]=> - int(45) -} --- Iteration 17 -- - -Warning: sort() expects parameter 2 to be long, object given in %s on line %d -bool(false) -array(3) { - [0]=> - int(10) - [1]=> - int(2) - [2]=> - int(45) -} --- Iteration 18 -- - -Warning: sort() expects parameter 2 to be long, string given in %s on line %d -bool(false) -array(3) { - [0]=> - int(10) - [1]=> - int(2) - [2]=> - int(45) -} --- Iteration 19 -- - -Warning: sort() expects parameter 2 to be long, string given in %s on line %d -bool(false) -array(3) { - [0]=> - int(10) - [1]=> - int(2) - [2]=> - int(45) -} --- Iteration 20 -- - -Warning: sort() expects parameter 2 to be long, resource given in %s on line %d -bool(false) -array(3) { - [0]=> - int(10) - [1]=> - int(2) - [2]=> - int(45) -} -Done ---UEXPECTF-- -*** Testing sort() : usage variations *** - --- Testing sort() by supplying different unexpected values for 'flag' argument -- --- Iteration 1 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 2 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 3 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 4 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 5 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 6 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 7 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 8 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 9 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 10 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 11 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 12 -- -bool(true) -array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(45) -} --- Iteration 13 -- - Warning: sort() expects parameter 2 to be long, Unicode string given in %s on line %d bool(false) array(3) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/sort_variation3.phpt diff -u php-src/ext/standard/tests/array/sort_variation3.phpt:1.2 php-src/ext/standard/tests/array/sort_variation3.phpt:1.3 --- php-src/ext/standard/tests/array/sort_variation3.phpt:1.2 Wed Nov 7 12:05:55 2007 +++ php-src/ext/standard/tests/array/sort_variation3.phpt Mon May 26 23:36:10 2008 @@ -11,7 +11,7 @@ /* * Testing sort() by providing different integer/float value arrays for $array argument * with following flag values - * 1. flag value as defualt + * 1. flag value as default * 2. SORT_REGULAR - compare items normally * 3. SORT_NUMERIC - compare items numerically * 4. SORT_STRING - compare items as strings @@ -44,7 +44,7 @@ foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With Defualt sort flag -\n"; + echo "- With default sort flag -\n"; $temp_array = $array; var_dump(sort($temp_array) ); var_dump($temp_array); @@ -67,7 +67,7 @@ -- Testing sort() by supplying various integer/float arrays -- -- Iteration 1 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(9) { [0]=> @@ -135,7 +135,7 @@ } -- Iteration 2 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(7) { [0]=> @@ -191,7 +191,7 @@ } -- Iteration 3 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(11) { [0]=> @@ -271,272 +271,7 @@ } -- Iteration 4 -- -- With Defualt sort flag - -bool(true) -array(7) { - [0]=> - %s(-2147483649) - [1]=> - %s(-2147483648) - [2]=> - int(-2147483647) - [3]=> - int(0) - [4]=> - int(0) - [5]=> - int(2147483647) - [6]=> - %s(2147483648) -} -- Sort flag = SORT_REGULAR - -bool(true) -array(7) { - [0]=> - %s(-2147483649) - [1]=> - %s(-2147483648) - [2]=> - int(-2147483647) - [3]=> - int(0) - [4]=> - int(0) - [5]=> - int(2147483647) - [6]=> - %s(2147483648) -} -- Sort flag = SORT_NUMERIC - -bool(true) -array(7) { - [0]=> - %s(-2147483649) - [1]=> - %s(-2147483648) - [2]=> - int(-2147483647) - [3]=> - int(0) - [4]=> - int(0) - [5]=> - int(2147483647) - [6]=> - %s(2147483648) -} -Done ---UEXPECTF-- -*** Testing sort() : usage variations *** - --- Testing sort() by supplying various integer/float arrays -- - --- Iteration 1 -- -- With Defualt sort flag - -bool(true) -array(9) { - [0]=> - int(-41) - [1]=> - int(-31) - [2]=> - int(-21) - [3]=> - int(-11) - [4]=> - int(0) - [5]=> - int(11) - [6]=> - int(21) - [7]=> - int(31) - [8]=> - int(41) -} -- Sort flag = SORT_REGULAR - -bool(true) -array(9) { - [0]=> - int(-41) - [1]=> - int(-31) - [2]=> - int(-21) - [3]=> - int(-11) - [4]=> - int(0) - [5]=> - int(11) - [6]=> - int(21) - [7]=> - int(31) - [8]=> - int(41) -} -- Sort flag = SORT_NUMERIC - -bool(true) -array(9) { - [0]=> - int(-41) - [1]=> - int(-31) - [2]=> - int(-21) - [3]=> - int(-11) - [4]=> - int(0) - [5]=> - int(11) - [6]=> - int(21) - [7]=> - int(31) - [8]=> - int(41) -} - --- Iteration 2 -- -- With Defualt sort flag - -bool(true) -array(7) { - [0]=> - float(-10.5) - [1]=> - float(-0.1) - [2]=> - float(0.01) - [3]=> - float(0.106) - [4]=> - float(0.5) - [5]=> - float(10.5) - [6]=> - float(1050) -} -- Sort flag = SORT_REGULAR - -bool(true) -array(7) { - [0]=> - float(-10.5) - [1]=> - float(-0.1) - [2]=> - float(0.01) - [3]=> - float(0.106) - [4]=> - float(0.5) - [5]=> - float(10.5) - [6]=> - float(1050) -} -- Sort flag = SORT_NUMERIC - -bool(true) -array(7) { - [0]=> - float(-10.5) - [1]=> - float(-0.1) - [2]=> - float(0.01) - [3]=> - float(0.106) - [4]=> - float(0.5) - [5]=> - float(10.5) - [6]=> - float(1050) -} - --- Iteration 3 -- -- With Defualt sort flag - -bool(true) -array(11) { - [0]=> - int(-1) - [1]=> - float(-0.9) - [2]=> - float(-0.106) - [3]=> - float(-0.01) - [4]=> - int(0) - [5]=> - float(0.0001) - [6]=> - float(0.0021) - [7]=> - float(0.09) - [8]=> - float(0.106) - [9]=> - int(2) - [10]=> - int(33) -} -- Sort flag = SORT_REGULAR - -bool(true) -array(11) { - [0]=> - int(-1) - [1]=> - float(-0.9) - [2]=> - float(-0.106) - [3]=> - float(-0.01) - [4]=> - int(0) - [5]=> - float(0.0001) - [6]=> - float(0.0021) - [7]=> - float(0.09) - [8]=> - float(0.106) - [9]=> - int(2) - [10]=> - int(33) -} -- Sort flag = SORT_NUMERIC - -bool(true) -array(11) { - [0]=> - int(-1) - [1]=> - float(-0.9) - [2]=> - float(-0.106) - [3]=> - float(-0.01) - [4]=> - int(0) - [5]=> - float(0.0001) - [6]=> - float(0.0021) - [7]=> - float(0.09) - [8]=> - float(0.106) - [9]=> - int(2) - [10]=> - int(33) -} - --- Iteration 4 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(7) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_variation4.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/array/sort_variation4.phpt diff -u php-src/ext/standard/tests/array/sort_variation4.phpt:1.1 php-src/ext/standard/tests/array/sort_variation4.phpt:1.2 --- php-src/ext/standard/tests/array/sort_variation4.phpt:1.1 Mon Nov 5 15:17:10 2007 +++ php-src/ext/standard/tests/array/sort_variation4.phpt Mon May 26 23:36:10 2008 @@ -10,7 +10,7 @@ /* * Testing sort() by providing reference variable array with following flag values - * flag value as defualt + * flag value as default * SORT_REGULAR - compare items normally * SORT_NUMERIC - compare items numerically */ @@ -24,7 +24,7 @@ // an array containing integer references $unsorted_numerics = array( &$value1 , &$value2, &$value3); -echo "\n-- Testing sort() by supplying reference variable array, 'flag' value is defualt --\n"; +echo "\n-- Testing sort() by supplying reference variable array, 'flag' value is default --\n"; $temp_array = $unsorted_numerics; var_dump( sort($temp_array) ); // expecting : bool(true) var_dump( $temp_array); @@ -41,46 +41,10 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() :usage variations *** --- Testing sort() by supplying reference variable array, 'flag' value is defualt -- -bool(true) -array(3) { - [0]=> - &int(33) - [1]=> - &int(100) - [2]=> - &int(555) -} - --- Testing sort() by supplying reference variable array, 'flag' = SORT_REGULAR -- -bool(true) -array(3) { - [0]=> - &int(33) - [1]=> - &int(100) - [2]=> - &int(555) -} - --- Testing sort() by supplying reference variable array, 'flag' = SORT_NUMERIC -- -bool(true) -array(3) { - [0]=> - &int(33) - [1]=> - &int(100) - [2]=> - &int(555) -} -Done ---UEXPECTF-- -*** Testing sort() :usage variations *** - --- Testing sort() by supplying reference variable array, 'flag' value is defualt -- +-- Testing sort() by supplying reference variable array, 'flag' value is default -- bool(true) array(3) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_variation5.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/array/sort_variation5.phpt diff -u php-src/ext/standard/tests/array/sort_variation5.phpt:1.1 php-src/ext/standard/tests/array/sort_variation5.phpt:1.2 --- php-src/ext/standard/tests/array/sort_variation5.phpt:1.1 Mon Nov 5 15:17:10 2007 +++ php-src/ext/standard/tests/array/sort_variation5.phpt Mon May 26 23:36:10 2008 @@ -11,7 +11,7 @@ /* * testing sort() by providing different string arrays for $array argument with * following flag values - * flag value as defualt + * flag value as default * SORT_REGULAR - compare items normally * SORT_STRING - compare items as strings */ @@ -52,187 +52,7 @@ echo "Done\n"; ?> ---EXPECTF-- -*** Testing sort() : usage variations *** - --- Testing sort() by supplying various string arrays -- - --- Iteration 1 -- -- With Default sort flag - -bool(true) -array(12) { - [0]=> - NULL - [1]=> - NULL - [2]=> - string(1) " " - [3]=> - string(1) " -" - [4]=> - string(1) "" - [5]=> - string(1) "" - [6]=> - string(1) "" - [7]=> - string(2) "\a" - [8]=> - string(3) "\cx" - [9]=> - string(4) "\ddd" - [10]=> - string(2) "\e" - [11]=> - string(4) "\xhh" -} -- Sort flag = SORT_REGULAR - -bool(true) -array(12) { - [0]=> - NULL - [1]=> - NULL - [2]=> - string(1) " " - [3]=> - string(1) " -" - [4]=> - string(1) "" - [5]=> - string(1) "" - [6]=> - string(1) "" - [7]=> - string(2) "\a" - [8]=> - string(3) "\cx" - [9]=> - string(4) "\ddd" - [10]=> - string(2) "\e" - [11]=> - string(4) "\xhh" -} -- Sort flag = SORT_STRING - -bool(true) -array(12) { - [0]=> - NULL - [1]=> - NULL - [2]=> - string(1) " " - [3]=> - string(1) " -" - [4]=> - string(1) "" - [5]=> - string(1) "" - [6]=> - string(1) "" - [7]=> - string(2) "\a" - [8]=> - string(3) "\cx" - [9]=> - string(4) "\ddd" - [10]=> - string(2) "\e" - [11]=> - string(4) "\xhh" -} - --- Iteration 2 -- -- With Default sort flag - -bool(true) -array(12) { - [0]=> - string(6) "BANANA" - [1]=> - string(6) "Orange" - [2]=> - string(4) "TTTT" - [3]=> - string(4) "Test" - [4]=> - string(1) "X" - [5]=> - string(5) "apple" - [6]=> - string(6) "banana" - [7]=> - string(5) "lemoN" - [8]=> - string(6) "oraNGe" - [9]=> - string(3) "ttt" - [10]=> - string(2) "ww" - [11]=> - string(1) "x" -} -- Sort flag = SORT_REGULAR - -bool(true) -array(12) { - [0]=> - string(6) "BANANA" - [1]=> - string(6) "Orange" - [2]=> - string(4) "TTTT" - [3]=> - string(4) "Test" - [4]=> - string(1) "X" - [5]=> - string(5) "apple" - [6]=> - string(6) "banana" - [7]=> - string(5) "lemoN" - [8]=> - string(6) "oraNGe" - [9]=> - string(3) "ttt" - [10]=> - string(2) "ww" - [11]=> - string(1) "x" -} -- Sort flag = SORT_STRING - -bool(true) -array(12) { - [0]=> - string(6) "BANANA" - [1]=> - string(6) "Orange" - [2]=> - string(4) "TTTT" - [3]=> - string(4) "Test" - [4]=> - string(1) "X" - [5]=> - string(5) "apple" - [6]=> - string(6) "banana" - [7]=> - string(5) "lemoN" - [8]=> - string(6) "oraNGe" - [9]=> - string(3) "ttt" - [10]=> - string(2) "ww" - [11]=> - string(1) "x" -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various string arrays -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_variation6.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/array/sort_variation6.phpt diff -u php-src/ext/standard/tests/array/sort_variation6.phpt:1.1 php-src/ext/standard/tests/array/sort_variation6.phpt:1.2 --- php-src/ext/standard/tests/array/sort_variation6.phpt:1.1 Mon Nov 5 15:17:10 2007 +++ php-src/ext/standard/tests/array/sort_variation6.phpt Mon May 26 23:36:10 2008 @@ -11,7 +11,7 @@ /* * testing sort() by providing different hexa-decimal array for $array argument * with following flag values - * flag value as defualt + * flag value as default * SORT_REGULAR - compare items normally * SORT_NUMERIC - compare items numerically */ @@ -21,7 +21,7 @@ // an array contains unsorted hexadecimal values $unsorted_hex_array = array(0x1AB, 0xFFF, 0xF, 0xFF, 0x2AA, 0xBB, 0x1ab, 0xff, -0xFF, 0, -0x2aa); -echo "\n-- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt --\n"; +echo "\n-- Testing sort() by supplying hexadecimal value array, 'flag' value is default --\n"; $temp_array = $unsorted_hex_array; var_dump(sort($temp_array) ); // expecting : bool(true) var_dump($temp_array); @@ -38,94 +38,10 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** --- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt -- -bool(true) -array(11) { - [0]=> - int(-682) - [1]=> - int(-255) - [2]=> - int(0) - [3]=> - int(15) - [4]=> - int(187) - [5]=> - int(255) - [6]=> - int(255) - [7]=> - int(427) - [8]=> - int(427) - [9]=> - int(682) - [10]=> - int(4095) -} - --- Testing sort() by supplying hexadecimal value array, 'flag' value is SORT_REGULAR -- -bool(true) -array(11) { - [0]=> - int(-682) - [1]=> - int(-255) - [2]=> - int(0) - [3]=> - int(15) - [4]=> - int(187) - [5]=> - int(255) - [6]=> - int(255) - [7]=> - int(427) - [8]=> - int(427) - [9]=> - int(682) - [10]=> - int(4095) -} - --- Testing sort() by supplying hexadecimal value array, 'flag' value is SORT_NUMERIC -- -bool(true) -array(11) { - [0]=> - int(-682) - [1]=> - int(-255) - [2]=> - int(0) - [3]=> - int(15) - [4]=> - int(187) - [5]=> - int(255) - [6]=> - int(255) - [7]=> - int(427) - [8]=> - int(427) - [9]=> - int(682) - [10]=> - int(4095) -} -Done ---UEXPECTF-- -*** Testing sort() : usage variations *** - --- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt -- +-- Testing sort() by supplying hexadecimal value array, 'flag' value is default -- bool(true) array(11) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_variation7.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/array/sort_variation7.phpt diff -u php-src/ext/standard/tests/array/sort_variation7.phpt:1.1 php-src/ext/standard/tests/array/sort_variation7.phpt:1.2 --- php-src/ext/standard/tests/array/sort_variation7.phpt:1.1 Mon Nov 5 15:17:10 2007 +++ php-src/ext/standard/tests/array/sort_variation7.phpt Mon May 26 23:36:10 2008 @@ -10,7 +10,7 @@ /* * testing sort() by providing bool value array for $array argument with following flag values. - * flag value as defualt + * flag value as default * SORT_REGULAR - compare items normally */ @@ -19,7 +19,7 @@ // bool value array $bool_values = array (true, false, TRUE, FALSE); -echo "\n-- Testing sort() by supplying bool value array, 'flag' value is defualt --\n"; +echo "\n-- Testing sort() by supplying bool value array, 'flag' value is default --\n"; $temp_array = $bool_values; var_dump(sort($temp_array) ); var_dump($temp_array); @@ -41,65 +41,10 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** --- Testing sort() by supplying bool value array, 'flag' value is defualt -- -bool(true) -array(4) { - [0]=> - bool(false) - [1]=> - bool(false) - [2]=> - bool(true) - [3]=> - bool(true) -} - --- Testing sort() by supplying bool value array, 'flag' value is SORT_REGULAR -- -bool(true) -array(4) { - [0]=> - bool(false) - [1]=> - bool(false) - [2]=> - bool(true) - [3]=> - bool(true) -} - --- Testing sort() by supplying bool value array, 'flag' value is SORT_NUMERIC -- -bool(true) -array(4) { - [0]=> - bool(false) - [1]=> - bool(false) - [2]=> - bool(true) - [3]=> - bool(true) -} - --- Testing sort() by supplying bool value array, 'flag' value is SORT_STRING -- -bool(true) -array(4) { - [0]=> - bool(false) - [1]=> - bool(false) - [2]=> - bool(true) - [3]=> - bool(true) -} -Done ---UEXPECTF-- -*** Testing sort() : usage variations *** - --- Testing sort() by supplying bool value array, 'flag' value is defualt -- +-- Testing sort() by supplying bool value array, 'flag' value is default -- bool(true) array(4) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_variation8.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/array/sort_variation8.phpt diff -u php-src/ext/standard/tests/array/sort_variation8.phpt:1.1 php-src/ext/standard/tests/array/sort_variation8.phpt:1.2 --- php-src/ext/standard/tests/array/sort_variation8.phpt:1.1 Mon Nov 5 15:17:10 2007 +++ php-src/ext/standard/tests/array/sort_variation8.phpt Mon May 26 23:36:10 2008 @@ -1,5 +1,5 @@ --TEST-- -Test sort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as defualt/SORT_REGULAR +Test sort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as default/SORT_REGULAR --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) @@ -10,7 +10,7 @@ /* * testing sort() by providing arrays contains sub arrays for $array argument with flowing flag values - * flag value as defualt + * flag value as default * SORT_REGULAR - compare items normally */ @@ -39,8 +39,8 @@ foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - // testing sort() function by supplying different arrays, flag value is defualt - echo "- With Defualt sort flag -\n"; + // testing sort() function by supplying different arrays, flag value is default + echo "- With default sort flag -\n"; $temp_array = $array; var_dump(sort($temp_array) ); var_dump($temp_array); @@ -55,13 +55,13 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various arrays containing sub arrays -- -- Iteration 1 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(0) { } @@ -71,7 +71,7 @@ } -- Iteration 2 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(1) { [0]=> @@ -87,7 +87,7 @@ } -- Iteration 3 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(3) { [0]=> @@ -119,128 +119,7 @@ } -- Iteration 4 -- -- With Defualt sort flag - -bool(true) -array(4) { - [0]=> - array(0) { - } - [1]=> - array(1) { - [0]=> - int(11) - } - [2]=> - array(2) { - [0]=> - int(22) - [1]=> - int(-55) - } - [3]=> - array(3) { - [0]=> - int(33) - [1]=> - int(-5) - [2]=> - int(6) - } -} -- Sort flag = SORT_REGULAR - -bool(true) -array(4) { - [0]=> - array(0) { - } - [1]=> - array(1) { - [0]=> - int(11) - } - [2]=> - array(2) { - [0]=> - int(22) - [1]=> - int(-55) - } - [3]=> - array(3) { - [0]=> - int(33) - [1]=> - int(-5) - [2]=> - int(6) - } -} -Done ---UEXPECTF-- -*** Testing sort() : usage variations *** - --- Testing sort() by supplying various arrays containing sub arrays -- - --- Iteration 1 -- -- With Defualt sort flag - -bool(true) -array(0) { -} -- Sort flag = SORT_REGULAR - -bool(true) -array(0) { -} - --- Iteration 2 -- -- With Defualt sort flag - -bool(true) -array(1) { - [0]=> - array(0) { - } -} -- Sort flag = SORT_REGULAR - -bool(true) -array(1) { - [0]=> - array(0) { - } -} - --- Iteration 3 -- -- With Defualt sort flag - -bool(true) -array(3) { - [0]=> - int(11) - [1]=> - int(44) - [2]=> - array(2) { - [0]=> - int(64) - [1]=> - int(61) - } -} -- Sort flag = SORT_REGULAR - -bool(true) -array(3) { - [0]=> - int(11) - [1]=> - int(44) - [2]=> - array(2) { - [0]=> - int(64) - [1]=> - int(61) - } -} - --- Iteration 4 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(4) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_variation9.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/array/sort_variation9.phpt diff -u php-src/ext/standard/tests/array/sort_variation9.phpt:1.1 php-src/ext/standard/tests/array/sort_variation9.phpt:1.2 --- php-src/ext/standard/tests/array/sort_variation9.phpt:1.1 Mon Nov 5 15:17:10 2007 +++ php-src/ext/standard/tests/array/sort_variation9.phpt Mon May 26 23:36:10 2008 @@ -1,5 +1,5 @@ --TEST-- -Test sort() function : usage variations - sort diff. associative arrays, 'sort_flags' as defualt/SORT_REGULAR +Test sort() function : usage variations - sort diff. associative arrays, 'sort_flags' as default/SORT_REGULAR --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) @@ -11,7 +11,7 @@ /* * Testing sort() by providing arrays with key values for $array argument * with following flag values. - * 1.flag value as defualt + * 1.flag value as default * 2.SORT_REGULAR - compare items normally * To test the new keys for the elements in the sorted array. */ @@ -38,7 +38,7 @@ foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With Defualt sort flag -\n"; + echo "- With default sort flag -\n"; $temp_array = $array; var_dump(sort($temp_array) ); var_dump($temp_array); @@ -52,13 +52,13 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various arrays with key values -- -- Iteration 1 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(5) { [0]=> @@ -88,212 +88,7 @@ } -- Iteration 2 -- -- With Defualt sort flag - -bool(true) -array(3) { - [0]=> - array(3) { - [0]=> - string(5) "first" - [5]=> - string(6) "second" - [6]=> - string(5) "third" - } - [1]=> - array(3) { - ["a"]=> - string(6) "orange" - ["b"]=> - string(6) "banana" - ["c"]=> - string(5) "apple" - } - [2]=> - array(6) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - } -} -- Sort flag = SORT_REGULAR - -bool(true) -array(3) { - [0]=> - array(3) { - [0]=> - string(5) "first" - [5]=> - string(6) "second" - [6]=> - string(5) "third" - } - [1]=> - array(3) { - ["a"]=> - string(6) "orange" - ["b"]=> - string(6) "banana" - ["c"]=> - string(5) "apple" - } - [2]=> - array(6) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - int(4) - [4]=> - int(5) - [5]=> - int(6) - } -} - --- Iteration 3 -- -- With Defualt sort flag - -bool(true) -array(6) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - int(1) - [3]=> - int(1) - [4]=> - int(13) - [5]=> - int(19) -} -- Sort flag = SORT_REGULAR - -bool(true) -array(6) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - int(1) - [3]=> - int(1) - [4]=> - int(13) - [5]=> - int(19) -} - --- Iteration 4 -- -- With Defualt sort flag - -bool(true) -array(2) { - [0]=> - string(3) "baz" - [1]=> - int(1) -} -- Sort flag = SORT_REGULAR - -bool(true) -array(2) { - [0]=> - string(3) "baz" - [1]=> - int(1) -} - --- Iteration 5 -- -- With Defualt sort flag - -bool(true) -array(4) { - [0]=> - int(1) - [1]=> - int(5) - [2]=> - array(1) { - ["g"]=> - int(4) - } - [3]=> - array(2) { - ["e"]=> - int(2) - ["f"]=> - int(3) - } -} -- Sort flag = SORT_REGULAR - -bool(true) -array(4) { - [0]=> - int(1) - [1]=> - int(5) - [2]=> - array(1) { - ["g"]=> - int(4) - } - [3]=> - array(2) { - ["e"]=> - int(2) - ["f"]=> - int(3) - } -} -Done ---UEXPECTF-- -*** Testing sort() : usage variations *** - --- Testing sort() by supplying various arrays with key values -- - --- Iteration 1 -- -- With Defualt sort flag - -bool(true) -array(5) { - [0]=> - int(11) - [1]=> - int(22) - [2]=> - int(33) - [3]=> - int(55) - [4]=> - int(66) -} -- Sort flag = SORT_REGULAR - -bool(true) -array(5) { - [0]=> - int(11) - [1]=> - int(22) - [2]=> - int(33) - [3]=> - int(55) - [4]=> - int(66) -} - --- Iteration 2 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(3) { [0]=> @@ -369,7 +164,7 @@ } -- Iteration 3 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(6) { [0]=> @@ -403,7 +198,7 @@ } -- Iteration 4 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(2) { [0]=> @@ -421,7 +216,7 @@ } -- Iteration 5 -- -- With Defualt sort flag - +- With default sort flag - bool(true) array(4) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_basic1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_basic1.phpt diff -u php-src/ext/standard/tests/array/uasort_basic1.phpt:1.2 php-src/ext/standard/tests/array/uasort_basic1.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_basic1.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_basic1.phpt Mon May 26 23:36:10 2008 @@ -55,66 +55,7 @@ echo "Done" ?> ---EXPECTF-- -*** Testing uasort() : basic functionality *** --- Numeric array with default keys -- -bool(true) -array(7) { - [0]=> - int(1) - [4]=> - int(2) - [3]=> - int(3) - [5]=> - int(6) - [6]=> - int(7) - [1]=> - int(8) - [2]=> - int(9) -} --- String array with default keys -- -bool(true) -array(4) { - [0]=> - string(4) "This" - [2]=> - string(1) "a" - [1]=> - string(2) "is" - [3]=> - string(4) "test" -} --- Associative array with numeric keys -- -bool(true) -array(5) { - [1]=> - int(1) - [2]=> - int(2) - [5]=> - int(4) - [3]=> - int(7) - [4]=> - int(9) -} --- Associative array with string keys -- -bool(true) -array(4) { - ["three"]=> - int(1) - ["two"]=> - int(2) - ["one"]=> - int(4) - ["four"]=> - int(10) -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing uasort() : basic functionality *** -- Numeric array with default keys -- bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_basic2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_basic2.phpt diff -u php-src/ext/standard/tests/array/uasort_basic2.phpt:1.2 php-src/ext/standard/tests/array/uasort_basic2.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_basic2.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_basic2.phpt Mon May 26 23:36:10 2008 @@ -49,58 +49,7 @@ echo "Done" ?> ---EXPECTF-- -*** Testing uasort() : basic functionality with duplicate values *** --- Numeric array with increasing values -- -bool(true) -array(6) { - [0]=> - int(1) - [1]=> - int(1) - [3]=> - int(2) - [2]=> - int(2) - [5]=> - int(3) - [4]=> - int(3) -} --- Numeric array with decreasing values -- -bool(true) -array(6) { - [4]=> - int(1) - [5]=> - int(1) - [3]=> - int(2) - [2]=> - int(2) - [1]=> - int(3) - [0]=> - int(3) -} --- Numeric array with increasing and decreasing values -- -bool(true) -array(6) { - [5]=> - int(1) - [0]=> - int(1) - [1]=> - int(2) - [4]=> - int(2) - [2]=> - int(3) - [3]=> - int(3) -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing uasort() : basic functionality with duplicate values *** -- Numeric array with increasing values -- bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/array/uasort_error.phpt diff -u php-src/ext/standard/tests/array/uasort_error.phpt:1.3 php-src/ext/standard/tests/array/uasort_error.phpt:1.4 --- php-src/ext/standard/tests/array/uasort_error.phpt:1.3 Mon Feb 4 13:08:27 2008 +++ php-src/ext/standard/tests/array/uasort_error.phpt Mon May 26 23:36:10 2008 @@ -79,26 +79,3 @@ Warning: uasort() expects exactly 2 parameters, 3 given in %s on line %d NULL Done ---UEXPECTF-- -*** Testing uasort() : error conditions *** --- Testing uasort() function with Zero argument -- - -Warning: uasort() expects exactly 2 parameters, 0 given in %s on line %d -NULL --- Testing uasort() function with more than expected no. of arguments -- - -Warning: uasort() expects exactly 2 parameters, 3 given in %s on line %d -NULL --- Testing uasort() function with less than expected no. of arguments -- - -Warning: uasort() expects exactly 2 parameters, 1 given in %s on line %d -NULL --- Testing uasort() function with non-existent compare function -- - -Warning: uasort() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d -NULL --- Testing uasort() function with non-existent compare function and extra argument -- - -Warning: uasort() expects exactly 2 parameters, 3 given in %s on line %d -NULL -Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_object1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_object1.phpt diff -u php-src/ext/standard/tests/array/uasort_object1.phpt:1.2 php-src/ext/standard/tests/array/uasort_object1.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_object1.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_object1.phpt Mon May 26 23:36:10 2008 @@ -92,63 +92,7 @@ echo "Done" ?> ---EXPECTF-- -*** Testing uasort() : object functionality *** -bool(true) -array(4) { - [1]=> - object(SimpleClass1)#2 (1) { - ["int_value":"SimpleClass1":private]=> - int(1) - } - [0]=> - object(SimpleClass1)#1 (1) { - ["int_value":"SimpleClass1":private]=> - int(10) - } - [3]=> - object(SimpleClass1)#4 (1) { - ["int_value":"SimpleClass1":private]=> - int(50) - } - [2]=> - object(SimpleClass1)#3 (1) { - ["int_value":"SimpleClass1":private]=> - int(100) - } -} -bool(true) -array(3) { - [0]=> - object(SimpleClass2)#5 (3) { - ["int_value":"SimpleClass2":private]=> - int(2) - ["float_value":protected]=> - float(3.4) - ["string_value"]=> - string(5) "mango" - } - [2]=> - object(SimpleClass2)#7 (3) { - ["int_value":"SimpleClass2":private]=> - int(5) - ["float_value":protected]=> - float(2.5) - ["string_value"]=> - string(6) "orange" - } - [1]=> - object(SimpleClass2)#6 (3) { - ["int_value":"SimpleClass2":private]=> - int(10) - ["float_value":protected]=> - float(1.2) - ["string_value"]=> - string(5) "apple" - } -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing uasort() : object functionality *** bool(true) array(4) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_object2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_object2.phpt diff -u php-src/ext/standard/tests/array/uasort_object2.phpt:1.2 php-src/ext/standard/tests/array/uasort_object2.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_object2.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_object2.phpt Mon May 26 23:36:10 2008 @@ -124,73 +124,6 @@ bool(true) array(4) { [3]=> - object(StaticClass)#%d (0) { - } - [2]=> - object(StaticClass)#%d (0) { - } - [1]=> - object(StaticClass)#%d (0) { - } - [0]=> - object(StaticClass)#%d (0) { - } -} --- Testing uasort() with EmptyClass objects -- -bool(true) -array(4) { - [3]=> - object(EmptyClass)#%d (0) { - } - [2]=> - object(EmptyClass)#%d (0) { - } - [1]=> - object(EmptyClass)#%d (0) { - } - [0]=> - object(EmptyClass)#%d (0) { - } -} --- Testing uasort() with ChildClass objects -- -bool(true) -array(4) { - [2]=> - object(ChildClass)#%d (2) { - ["child_value"]=> - int(15) - ["pub_value"]=> - NULL - } - [0]=> - object(ChildClass)#%d (2) { - ["child_value"]=> - int(20) - ["pub_value"]=> - NULL - } - [1]=> - object(ChildClass)#%d (2) { - ["child_value"]=> - int(500) - ["pub_value"]=> - NULL - } - [3]=> - object(ChildClass)#%d (2) { - ["child_value"]=> - int(700) - ["pub_value"]=> - NULL - } -} -Done ---UEXPECTF-- -*** Testing uasort() : object functionality *** --- Testing uasort() with StaticClass objects -- -bool(true) -array(4) { - [3]=> object(StaticClass)#4 (0) { } [2]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation1.phpt diff -u php-src/ext/standard/tests/array/uasort_variation1.phpt:1.2 php-src/ext/standard/tests/array/uasort_variation1.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_variation1.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_variation1.phpt Mon May 26 23:36:10 2008 @@ -159,97 +159,6 @@ NULL -- Iteration 16 -- -Warning: uasort() expects parameter 1 to be array, string given in %s on line %d -NULL --- Iteration 17 -- - -Warning: uasort() expects parameter 1 to be array, string given in %s on line %d -NULL --- Iteration 18 -- - -Warning: uasort() expects parameter 1 to be array, string given in %s on line %d -NULL --- Iteration 19 -- - -Warning: uasort() expects parameter 1 to be array, string given in %s on line %d -NULL --- Iteration 20 -- - -Warning: uasort() expects parameter 1 to be array, resource given in %s on line %d -NULL --- Iteration 21 -- - -Warning: uasort() expects parameter 1 to be array, null given in %s on line %d -NULL --- Iteration 22 -- - -Warning: uasort() expects parameter 1 to be array, null given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing uasort() : unexpected values for 'array_arg' *** --- Iteration 1 -- - -Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d -NULL --- Iteration 2 -- - -Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d -NULL --- Iteration 3 -- - -Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d -NULL --- Iteration 4 -- - -Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d -NULL --- Iteration 5 -- - -Warning: uasort() expects parameter 1 to be array, double given in %s on line %d -NULL --- Iteration 6 -- - -Warning: uasort() expects parameter 1 to be array, double given in %s on line %d -NULL --- Iteration 7 -- - -Warning: uasort() expects parameter 1 to be array, double given in %s on line %d -NULL --- Iteration 8 -- - -Warning: uasort() expects parameter 1 to be array, double given in %s on line %d -NULL --- Iteration 9 -- - -Warning: uasort() expects parameter 1 to be array, double given in %s on line %d -NULL --- Iteration 10 -- - -Warning: uasort() expects parameter 1 to be array, null given in %s on line %d -NULL --- Iteration 11 -- - -Warning: uasort() expects parameter 1 to be array, null given in %s on line %d -NULL --- Iteration 12 -- - -Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d -NULL --- Iteration 13 -- - -Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d -NULL --- Iteration 14 -- - -Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d -NULL --- Iteration 15 -- - -Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d -NULL --- Iteration 16 -- - Warning: uasort() expects parameter 1 to be array, Unicode string given in %s on line %d NULL -- Iteration 17 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation10.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation10.phpt diff -u php-src/ext/standard/tests/array/uasort_variation10.phpt:1.2 php-src/ext/standard/tests/array/uasort_variation10.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_variation10.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_variation10.phpt Mon May 26 23:36:10 2008 @@ -55,24 +55,7 @@ echo "Done" ?> ---EXPECTF-- -*** Testing uasort() : 'array_arg' with elements as reference *** --- Sorting 'array_arg' containing different references -- -bool(true) -array(5) { - [1]=> - &int(-5) - [4]=> - &int(0) - [0]=> - int(10) - [2]=> - &int(100) - [3]=> - int(200) -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing uasort() : 'array_arg' with elements as reference *** -- Sorting 'array_arg' containing different references -- bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation11.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation11.phpt diff -u php-src/ext/standard/tests/array/uasort_variation11.phpt:1.2 php-src/ext/standard/tests/array/uasort_variation11.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_variation11.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_variation11.phpt Mon May 26 23:36:10 2008 @@ -47,40 +47,7 @@ echo "Done" ?> ---EXPECTF-- -*** Testing uasort() : Sorting different associative arrays *** --- Array with duplicate keys -- -bool(true) -array(7) { - [0]=> - int(1) - [5]=> - int(2) - ["z"]=> - int(3) - [3]=> - int(3) - ["o"]=> - int(6) - ["a"]=> - int(8) - ["d"]=> - int(9) -} --- Array with default/assigned keys -- -bool(true) -array(4) { - [2]=> - string(5) "Apple" - [0]=> - string(6) "Banana" - [1]=> - string(5) "Mango" - [3]=> - string(9) "Pineapple" -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing uasort() : Sorting different associative arrays *** -- Array with duplicate keys -- bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation2.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation2.phpt diff -u php-src/ext/standard/tests/array/uasort_variation2.phpt:1.4 php-src/ext/standard/tests/array/uasort_variation2.phpt:1.5 --- php-src/ext/standard/tests/array/uasort_variation2.phpt:1.4 Thu May 8 16:58:43 2008 +++ php-src/ext/standard/tests/array/uasort_variation2.phpt Mon May 26 23:36:10 2008 @@ -211,118 +211,3 @@ Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d NULL Done ---UEXPECTF-- -*** Testing uasort() : Unexpected values in place of comparison function *** --- Iteration 1 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 2 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 3 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 4 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 5 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 6 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 7 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 8 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 9 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 10 -- - -Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d -NULL --- Iteration 11 -- - -Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d -NULL --- Iteration 12 -- - -Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d -NULL --- Iteration 13 -- - -Warning: uasort() 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 14 -- - -Warning: uasort() 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: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 16 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 17 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 18 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 19 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 20 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 21 -- - -Warning: uasort() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d -NULL --- Iteration 22 -- - -Warning: uasort() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d -NULL --- Iteration 23 -- - -Warning: uasort() 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: uasort() 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: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 26 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 27 -- - -Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d -NULL --- Iteration 28 -- - -Warning: uasort() 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/uasort_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation4.phpt diff -u php-src/ext/standard/tests/array/uasort_variation4.phpt:1.2 php-src/ext/standard/tests/array/uasort_variation4.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_variation4.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_variation4.phpt Mon May 26 23:36:10 2008 @@ -67,88 +67,7 @@ echo "Done" ?> ---EXPECTF-- -*** Testing uasort() : different numeric arrays as 'array_arg' *** --- Sorting Integer array -- -bool(true) -array(9) { - [9]=> - int(-1200) - [8]=> - int(-3) - [7]=> - int(0) - [1]=> - int(2) - [0]=> - int(3) - [5]=> - int(25) - [3]=> - int(100) - [4]=> - int(150) - [6]=> - int(350) -} --- Sorting Octal array -- -bool(true) -array(7) { - [4]=> - int(-37) - [6]=> - int(-7) - [2]=> - int(0) - [5]=> - int(1) - [3]=> - int(13) - [1]=> - int(19) - [0]=> - int(46) -} --- Sorting Hex array -- -bool(true) -array(6) { - [5]=> - int(-242) - [3]=> - int(-207) - [2]=> - int(16) - [4]=> - int(18) - [1]=> - int(43) - [0]=> - int(174) -} --- Sorting Float array -- -bool(true) -array(7) { - [2]=> - float(-3.4) - [6]=> - float(-0.0934) - [3]=> - int(0) - [4]=> - float(0.5) - [1]=> - float(2.4) - [0]=> - float(10.2) - [5]=> - float(7300) -} --- Sorting empty array -- -bool(true) -array(0) { -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing uasort() : different numeric arrays as 'array_arg' *** -- Sorting Integer array -- bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation5.phpt diff -u php-src/ext/standard/tests/array/uasort_variation5.phpt:1.2 php-src/ext/standard/tests/array/uasort_variation5.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_variation5.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_variation5.phpt Mon May 26 23:36:10 2008 @@ -79,71 +79,7 @@ echo "Done" ?> ---EXPECTF-- -*** Testing uasort() : different string arrays as 'array_arg' *** --- Sorting Single Quoted String values -- -bool(true) -array(10) { - [5]=> - string(0) "" - [0]=> - string(1) " " - [9]=> - string(1) "'" - [7]=> - string(1) "0" - [8]=> - string(8) "123Hello" - [10]=> - string(4) "@#$%" - [4]=> - string(5) "HELLO" - [3]=> - string(5) "Hello" - [6]=> - string(2) "\t" - [1]=> - string(4) "test" -} --- Sorting Double Quoted String values -- -bool(true) -array(10) { - [5]=> - string(0) "" - [6]=> - string(1) " " - [0]=> - string(1) " " - [9]=> - string(1) """ - [7]=> - string(1) "0" - [8]=> - string(8) "123Hello" - [10]=> - string(4) "@#$%" - [4]=> - string(5) "HELLO" - [3]=> - string(5) "Hello" - [1]=> - string(4) "test" -} --- Sorting Heredoc String values -- -bool(true) -array(4) { - [0]=> - string(0) "" - [2]=> - string(7) "HEREDOC" - [1]=> - string(7) "Heredoc" - [3]=> - string(43) "heredoc string with!@# and 123 -Test this!!!" -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing uasort() : different string arrays as 'array_arg' *** -- Sorting Single Quoted String values -- bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation6.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation6.phpt diff -u php-src/ext/standard/tests/array/uasort_variation6.phpt:1.2 php-src/ext/standard/tests/array/uasort_variation6.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_variation6.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_variation6.phpt Mon May 26 23:36:10 2008 @@ -51,71 +51,7 @@ echo "Done" ?> ---EXPECTF-- -*** Testing uasort() : Array with different subarrays *** -bool(true) -array(8) { - [2]=> - array(0) { - } - [4]=> - array(1) { - [0]=> - int(-1) - } - [6]=> - array(1) { - [0]=> - string(0) "" - } - [3]=> - array(1) { - [0]=> - int(0) - } - [1]=> - array(1) { - [0]=> - int(100) - } - [0]=> - array(3) { - [0]=> - int(2) - [1]=> - int(10) - [2]=> - int(-1) - } - [5]=> - array(5) { - [0]=> - int(-9) - [1]=> - int(34) - [2]=> - int(54) - [3]=> - int(0) - [4]=> - int(20) - } - [7]=> - array(5) { - [0]=> - string(5) "apple" - [1]=> - string(5) "Apple" - [2]=> - string(5) "APPLE" - [3]=> - string(5) "aPPle" - [4]=> - string(5) "aPpLe" - } -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing uasort() : Array with different subarrays *** bool(true) array(8) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation7.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation7.phpt diff -u php-src/ext/standard/tests/array/uasort_variation7.phpt:1.2 php-src/ext/standard/tests/array/uasort_variation7.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_variation7.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_variation7.phpt Mon May 26 23:36:10 2008 @@ -30,36 +30,7 @@ echo "Done" ?> ---EXPECTF-- -*** Testing uasort() : anonymous function as 'cmp_function' *** --- Anonymous 'cmp_function' with parameters passed by value -- -bool(true) -array(5) { - [2]=> - int(-70) - [1]=> - int(3) - [3]=> - int(24) - [4]=> - int(90) - [0]=> - int(100) -} --- Anonymous 'cmp_function' with parameters passed by reference -- -bool(true) -array(4) { - ["a"]=> - string(5) "Apple" - ["b"]=> - string(6) "Banana" - ["m"]=> - string(5) "Mango" - ["p"]=> - string(9) "Pineapple" -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing uasort() : anonymous function as 'cmp_function' *** -- Anonymous 'cmp_function' with parameters passed by value -- bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation8.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation8.phpt diff -u php-src/ext/standard/tests/array/uasort_variation8.phpt:1.3 php-src/ext/standard/tests/array/uasort_variation8.phpt:1.4 --- php-src/ext/standard/tests/array/uasort_variation8.phpt:1.3 Mon Feb 4 13:08:27 2008 +++ php-src/ext/standard/tests/array/uasort_variation8.phpt Mon May 26 23:36:10 2008 @@ -42,45 +42,6 @@ -- Testing uasort() with built-in 'cmp_function': strcasecmp() -- bool(true) array(5) { - ["a"]=> - string(5) "apple" - ["b"]=> - string(6) "Banana" - ["m"]=> - string(5) "Mango" - ["o"]=> - string(6) "orange" - ["p"]=> - string(9) "Pineapple" -} --- Testing uasort() with built-in 'cmp_function': strcmp() -- -bool(true) -array(5) { - ["b"]=> - string(6) "Banana" - ["m"]=> - string(5) "Mango" - ["p"]=> - string(9) "Pineapple" - ["a"]=> - string(5) "apple" - ["o"]=> - string(6) "orange" -} --- Testing uasort() with language construct as 'cmp_function' -- - -Warning: uasort() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d -NULL --- Testing uasort() with language construct as 'cmp_function' -- - -Warning: uasort() expects parameter 2 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing uasort() : built in function as 'cmp_function' *** --- Testing uasort() with built-in 'cmp_function': strcasecmp() -- -bool(true) -array(5) { [u"a"]=> unicode(5) "apple" [u"b"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation9.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/array/uasort_variation9.phpt diff -u php-src/ext/standard/tests/array/uasort_variation9.phpt:1.2 php-src/ext/standard/tests/array/uasort_variation9.phpt:1.3 --- php-src/ext/standard/tests/array/uasort_variation9.phpt:1.2 Wed Nov 14 17:21:09 2007 +++ php-src/ext/standard/tests/array/uasort_variation9.phpt Mon May 26 23:36:10 2008 @@ -47,40 +47,7 @@ echo "Done" ?> ---EXPECTF-- -*** Testing uasort() : 'cmp_function' with reference arguments *** --- Passing integer values to 'cmp_function' -- -bool(true) -array(7) { - [0]=> - int(1) - [4]=> - int(2) - [3]=> - int(3) - [5]=> - int(6) - [6]=> - int(7) - [1]=> - int(8) - [2]=> - int(9) -} --- Passing string values to 'cmp_function' -- -bool(true) -array(4) { - [1]=> - string(5) "Apple" - [3]=> - string(6) "Banana" - [0]=> - string(5) "Mango" - [2]=> - string(6) "Orange" -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing uasort() : 'cmp_function' with reference arguments *** -- Passing integer values to 'cmp_function' -- bool(true)