diff --git a/ext/standard/tests/array/001.phpt b/ext/standard/tests/array/001.phpt index c88aee367fad7..908f707e4b16d 100644 --- a/ext/standard/tests/array/001.phpt +++ b/ext/standard/tests/array/001.phpt @@ -4,7 +4,7 @@ Test array_merge and array_walk precision=14 --FILE-- null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", - "\ddd" => "\ddd", "\v" => "\v" - ), - - // array contains combination of capital/small letters - array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", - 'T' => "TTTT", 't' => "ttt", 'w' => "ww", 'x' => "x", 'X' => "X", 'o' => "oraNGe", - 'B' => "BANANA" - ) -); - -$flags = array("SORT_REGULAR" => SORT_REGULAR, "SORT_STRING" => SORT_STRING); - -$count = 1; -echo "\n-- Testing arsort() by supplying various string arrays --\n"; - -// loop through to test arsort() with different arrays -foreach ($various_arrays as $array) { - echo "\n-- Iteration $count --\n"; - - echo "- With default sort_flag -\n"; - $temp_array = $array; - var_dump(arsort($temp_array) ); // expecting : bool(true) - var_dump($temp_array); - - // loop through $flags array and setting all possible flag values - foreach($flags as $key => $flag){ - echo "- Sort_flag = $key -\n"; - $temp_array = $array; - var_dump(arsort($temp_array, $flag) ); // expecting : bool(true) - var_dump($temp_array); - } - $count++; -} - -echo "Done\n"; -?> ---EXPECT-- -*** Testing arsort() : usage variations *** - --- Testing arsort() by supplying various string arrays -- - --- Iteration 1 -- -- With default sort_flag - -bool(true) -array(12) { - ["\xhh"]=> - string(4) "\xhh" - ["\ddd"]=> - string(4) "\ddd" - ["\cx"]=> - string(3) "\cx" - ["\a"]=> - string(2) "\a" - [""]=> - string(1) "" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - ["null"]=> - NULL - ["NULL"]=> - NULL -} -- Sort_flag = SORT_REGULAR - -bool(true) -array(12) { - ["\xhh"]=> - string(4) "\xhh" - ["\ddd"]=> - string(4) "\ddd" - ["\cx"]=> - string(3) "\cx" - ["\a"]=> - string(2) "\a" - [""]=> - string(1) "" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - ["null"]=> - NULL - ["NULL"]=> - NULL -} -- Sort_flag = SORT_STRING - -bool(true) -array(12) { - ["\xhh"]=> - string(4) "\xhh" - ["\ddd"]=> - string(4) "\ddd" - ["\cx"]=> - string(3) "\cx" - ["\a"]=> - string(2) "\a" - [""]=> - string(1) "" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - ["null"]=> - NULL - ["NULL"]=> - NULL -} - --- Iteration 2 -- -- With default sort_flag - -bool(true) -array(12) { - ["x"]=> - string(1) "x" - ["w"]=> - string(2) "ww" - ["t"]=> - string(3) "ttt" - ["o"]=> - string(6) "oraNGe" - ["l"]=> - string(5) "lemoN" - ["b"]=> - string(6) "banana" - ["a"]=> - string(5) "apple" - ["X"]=> - string(1) "X" - ["Te"]=> - string(4) "Test" - ["T"]=> - string(4) "TTTT" - ["O"]=> - string(6) "Orange" - ["B"]=> - string(6) "BANANA" -} -- Sort_flag = SORT_REGULAR - -bool(true) -array(12) { - ["x"]=> - string(1) "x" - ["w"]=> - string(2) "ww" - ["t"]=> - string(3) "ttt" - ["o"]=> - string(6) "oraNGe" - ["l"]=> - string(5) "lemoN" - ["b"]=> - string(6) "banana" - ["a"]=> - string(5) "apple" - ["X"]=> - string(1) "X" - ["Te"]=> - string(4) "Test" - ["T"]=> - string(4) "TTTT" - ["O"]=> - string(6) "Orange" - ["B"]=> - string(6) "BANANA" -} -- Sort_flag = SORT_STRING - -bool(true) -array(12) { - ["x"]=> - string(1) "x" - ["w"]=> - string(2) "ww" - ["t"]=> - string(3) "ttt" - ["o"]=> - string(6) "oraNGe" - ["l"]=> - string(5) "lemoN" - ["b"]=> - string(6) "banana" - ["a"]=> - string(5) "apple" - ["X"]=> - string(1) "X" - ["Te"]=> - string(4) "Test" - ["T"]=> - string(4) "TTTT" - ["O"]=> - string(6) "Orange" - ["B"]=> - string(6) "BANANA" -} -Done diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt deleted file mode 100644 index f39c4829b1758..0000000000000 --- a/ext/standard/tests/array/asort_variation5.phpt +++ /dev/null @@ -1,236 +0,0 @@ ---TEST-- -Test asort() function : usage variations - sort strings ---FILE-- - null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", - "\ddd" => "\ddd", "\v" => "\v" - ), - - // array contains combination of capital/small letters - array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", - 'T' => "TTTT", 't' => "ttt", 'w' => "ww", 'x' => "x", 'X' => "X", 'o' => "oraNGe", - 'B' => "BANANA" - ) -); - -$flags = array("SORT_REGULAR" => SORT_REGULAR, "SORT_STRING" => SORT_STRING); - -$count = 1; -echo "\n-- Testing asort() by supplying various string arrays --\n"; - -// loop through to test asort() with different arrays -foreach ($various_arrays as $array) { - echo "\n-- Iteration $count --\n"; - - echo "- With default sort_flag -\n"; - $temp_array = $array; - var_dump(asort($temp_array) ); // expecting : bool(true) - var_dump($temp_array); - - // loop through $flags array and setting all possible flag values - foreach($flags as $key => $flag){ - echo "- Sort_flag = $key -\n"; - $temp_array = $array; - var_dump(asort($temp_array, $flag) ); // expecting : bool(true) - var_dump($temp_array); - } - $count++; -} - -echo "Done\n"; -?> ---EXPECT-- -*** Testing asort() : usage variations *** - --- Testing asort() by supplying various string arrays -- - --- Iteration 1 -- -- With default sort_flag - -bool(true) -array(12) { - ["null"]=> - NULL - ["NULL"]=> - NULL - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [""]=> - string(1) "" - ["\a"]=> - string(2) "\a" - ["\cx"]=> - string(3) "\cx" - ["\ddd"]=> - string(4) "\ddd" - ["\xhh"]=> - string(4) "\xhh" -} -- Sort_flag = SORT_REGULAR - -bool(true) -array(12) { - ["null"]=> - NULL - ["NULL"]=> - NULL - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [""]=> - string(1) "" - ["\a"]=> - string(2) "\a" - ["\cx"]=> - string(3) "\cx" - ["\ddd"]=> - string(4) "\ddd" - ["\xhh"]=> - string(4) "\xhh" -} -- Sort_flag = SORT_STRING - -bool(true) -array(12) { - ["null"]=> - NULL - ["NULL"]=> - NULL - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [""]=> - string(1) "" - ["\a"]=> - string(2) "\a" - ["\cx"]=> - string(3) "\cx" - ["\ddd"]=> - string(4) "\ddd" - ["\xhh"]=> - string(4) "\xhh" -} - --- Iteration 2 -- -- With default sort_flag - -bool(true) -array(12) { - ["B"]=> - string(6) "BANANA" - ["O"]=> - string(6) "Orange" - ["T"]=> - string(4) "TTTT" - ["Te"]=> - string(4) "Test" - ["X"]=> - string(1) "X" - ["a"]=> - string(5) "apple" - ["b"]=> - string(6) "banana" - ["l"]=> - string(5) "lemoN" - ["o"]=> - string(6) "oraNGe" - ["t"]=> - string(3) "ttt" - ["w"]=> - string(2) "ww" - ["x"]=> - string(1) "x" -} -- Sort_flag = SORT_REGULAR - -bool(true) -array(12) { - ["B"]=> - string(6) "BANANA" - ["O"]=> - string(6) "Orange" - ["T"]=> - string(4) "TTTT" - ["Te"]=> - string(4) "Test" - ["X"]=> - string(1) "X" - ["a"]=> - string(5) "apple" - ["b"]=> - string(6) "banana" - ["l"]=> - string(5) "lemoN" - ["o"]=> - string(6) "oraNGe" - ["t"]=> - string(3) "ttt" - ["w"]=> - string(2) "ww" - ["x"]=> - string(1) "x" -} -- Sort_flag = SORT_STRING - -bool(true) -array(12) { - ["B"]=> - string(6) "BANANA" - ["O"]=> - string(6) "Orange" - ["T"]=> - string(4) "TTTT" - ["Te"]=> - string(4) "Test" - ["X"]=> - string(1) "X" - ["a"]=> - string(5) "apple" - ["b"]=> - string(6) "banana" - ["l"]=> - string(5) "lemoN" - ["o"]=> - string(6) "oraNGe" - ["t"]=> - string(3) "ttt" - ["w"]=> - string(2) "ww" - ["x"]=> - string(1) "x" -} -Done diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt deleted file mode 100644 index 7475805f8d4d5..0000000000000 --- a/ext/standard/tests/array/krsort_variation5.phpt +++ /dev/null @@ -1,225 +0,0 @@ ---TEST-- -Test krsort() function : usage variations - sort strings ---FILE-- - null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", - "\ddd" => "\ddd", "\v" => "\v" - ), - - // array containing different strings with key values - array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", - 't' => "TTTT", 'T' => "ttt", 'W' => "ww", 'X' => "x", 'x' => "X", 'O' => "oraNGe", - 'B' => "BANANA" - ) -); - -$flags = array("SORT_REGULAR" => SORT_REGULAR, "SORT_STRING" => SORT_STRING); - -$count = 1; -echo "\n-- Testing krsort() by supplying various string arrays --\n"; - -// loop through to test krsort() with different arrays -foreach ($various_arrays as $array) { - echo "\n-- Iteration $count --\n"; - - echo "- With default sort flag -\n"; - $temp_array = $array; - var_dump(krsort($temp_array) ); // expecting : bool(true) - var_dump($temp_array); - - // loop through $flags array and call krsort() with all possible sort flag values - foreach($flags as $key => $flag){ - echo "- Sort flag = $key -\n"; - $temp_array = $array; - var_dump(krsort($temp_array, $flag) ); // expecting : bool(true) - var_dump($temp_array); - } - $count++; -} - -echo "Done\n"; -?> ---EXPECT-- -*** Testing krsort() : usage variations *** - --- Testing krsort() by supplying various string arrays -- - --- Iteration 1 -- -- With default sort flag - -bool(true) -array(11) { - ["\xhh"]=> - string(4) "\xhh" - ["\ddd"]=> - string(4) "\ddd" - ["\cx"]=> - string(3) "\cx" - ["\a"]=> - string(2) "\a" - [""]=> - string(1) "" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - [""]=> - NULL -} -- Sort flag = SORT_REGULAR - -bool(true) -array(11) { - ["\xhh"]=> - string(4) "\xhh" - ["\ddd"]=> - string(4) "\ddd" - ["\cx"]=> - string(3) "\cx" - ["\a"]=> - string(2) "\a" - [""]=> - string(1) "" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - [""]=> - NULL -} -- Sort flag = SORT_STRING - -bool(true) -array(11) { - ["\xhh"]=> - string(4) "\xhh" - ["\ddd"]=> - string(4) "\ddd" - ["\cx"]=> - string(3) "\cx" - ["\a"]=> - string(2) "\a" - [""]=> - string(1) "" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - [""]=> - NULL -} - --- Iteration 2 -- -- With default sort flag - -bool(true) -array(11) { - ["x"]=> - string(1) "X" - ["te"]=> - string(4) "Test" - ["t"]=> - string(4) "TTTT" - ["o"]=> - string(6) "Orange" - ["X"]=> - string(1) "x" - ["W"]=> - string(2) "ww" - ["T"]=> - string(3) "ttt" - ["O"]=> - string(6) "oraNGe" - ["Lemon"]=> - string(5) "lemoN" - ["B"]=> - string(6) "BANANA" - ["Apple"]=> - string(5) "apple" -} -- Sort flag = SORT_REGULAR - -bool(true) -array(11) { - ["x"]=> - string(1) "X" - ["te"]=> - string(4) "Test" - ["t"]=> - string(4) "TTTT" - ["o"]=> - string(6) "Orange" - ["X"]=> - string(1) "x" - ["W"]=> - string(2) "ww" - ["T"]=> - string(3) "ttt" - ["O"]=> - string(6) "oraNGe" - ["Lemon"]=> - string(5) "lemoN" - ["B"]=> - string(6) "BANANA" - ["Apple"]=> - string(5) "apple" -} -- Sort flag = SORT_STRING - -bool(true) -array(11) { - ["x"]=> - string(1) "X" - ["te"]=> - string(4) "Test" - ["t"]=> - string(4) "TTTT" - ["o"]=> - string(6) "Orange" - ["X"]=> - string(1) "x" - ["W"]=> - string(2) "ww" - ["T"]=> - string(3) "ttt" - ["O"]=> - string(6) "oraNGe" - ["Lemon"]=> - string(5) "lemoN" - ["B"]=> - string(6) "BANANA" - ["Apple"]=> - string(5) "apple" -} -Done diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt deleted file mode 100644 index 0538043744228..0000000000000 --- a/ext/standard/tests/array/ksort_variation5.phpt +++ /dev/null @@ -1,225 +0,0 @@ ---TEST-- -Test ksort() function : usage variations - sort strings ---FILE-- - null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", - "\ddd" => "\ddd", "\v" => "\v" - ), - - // array containing different strings with key values - array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", - 't' => "TTTT", 'T' => "ttt", 'W' => "ww", 'X' => "x", 'x' => "X", 'O' => "oraNGe", - 'B' => "BANANA" - ) -); - -$flags = array("SORT_REGULAR" => SORT_REGULAR, "SORT_STRING" => SORT_STRING); - -$count = 1; -echo "\n-- Testing ksort() by supplying various string arrays --\n"; - -// loop through to test ksort() with different arrays -foreach ($various_arrays as $array) { - echo "\n-- Iteration $count --\n"; - - echo "- With default sort flag -\n"; - $temp_array = $array; - var_dump(ksort($temp_array) ); // expecting : bool(true) - var_dump($temp_array); - - // loop through $flags array and call ksort() with all possible sort flag values - foreach($flags as $key => $flag){ - echo "- Sort flag = $key -\n"; - $temp_array = $array; - var_dump(ksort($temp_array, $flag) ); // expecting : bool(true) - var_dump($temp_array); - } - $count++; -} - -echo "Done\n"; -?> ---EXPECT-- -*** Testing ksort() : usage variations *** - --- Testing ksort() by supplying various string arrays -- - --- Iteration 1 -- -- With default sort flag - -bool(true) -array(11) { - [""]=> - NULL - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [""]=> - string(1) "" - ["\a"]=> - string(2) "\a" - ["\cx"]=> - string(3) "\cx" - ["\ddd"]=> - string(4) "\ddd" - ["\xhh"]=> - string(4) "\xhh" -} -- Sort flag = SORT_REGULAR - -bool(true) -array(11) { - [""]=> - NULL - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [""]=> - string(1) "" - ["\a"]=> - string(2) "\a" - ["\cx"]=> - string(3) "\cx" - ["\ddd"]=> - string(4) "\ddd" - ["\xhh"]=> - string(4) "\xhh" -} -- Sort flag = SORT_STRING - -bool(true) -array(11) { - [""]=> - NULL - [" "]=> - string(1) " " - [" -"]=> - string(1) " -" - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [" "]=> - string(1) " " - [""]=> - string(1) "" - ["\a"]=> - string(2) "\a" - ["\cx"]=> - string(3) "\cx" - ["\ddd"]=> - string(4) "\ddd" - ["\xhh"]=> - string(4) "\xhh" -} - --- Iteration 2 -- -- With default sort flag - -bool(true) -array(11) { - ["Apple"]=> - string(5) "apple" - ["B"]=> - string(6) "BANANA" - ["Lemon"]=> - string(5) "lemoN" - ["O"]=> - string(6) "oraNGe" - ["T"]=> - string(3) "ttt" - ["W"]=> - string(2) "ww" - ["X"]=> - string(1) "x" - ["o"]=> - string(6) "Orange" - ["t"]=> - string(4) "TTTT" - ["te"]=> - string(4) "Test" - ["x"]=> - string(1) "X" -} -- Sort flag = SORT_REGULAR - -bool(true) -array(11) { - ["Apple"]=> - string(5) "apple" - ["B"]=> - string(6) "BANANA" - ["Lemon"]=> - string(5) "lemoN" - ["O"]=> - string(6) "oraNGe" - ["T"]=> - string(3) "ttt" - ["W"]=> - string(2) "ww" - ["X"]=> - string(1) "x" - ["o"]=> - string(6) "Orange" - ["t"]=> - string(4) "TTTT" - ["te"]=> - string(4) "Test" - ["x"]=> - string(1) "X" -} -- Sort flag = SORT_STRING - -bool(true) -array(11) { - ["Apple"]=> - string(5) "apple" - ["B"]=> - string(6) "BANANA" - ["Lemon"]=> - string(5) "lemoN" - ["O"]=> - string(6) "oraNGe" - ["T"]=> - string(3) "ttt" - ["W"]=> - string(2) "ww" - ["X"]=> - string(1) "x" - ["o"]=> - string(6) "Orange" - ["t"]=> - string(4) "TTTT" - ["te"]=> - string(4) "Test" - ["x"]=> - string(1) "X" -} -Done diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/rsort_variation5.phpt deleted file mode 100644 index 6b05443b520bd..0000000000000 --- a/ext/standard/tests/array/rsort_variation5.phpt +++ /dev/null @@ -1,215 +0,0 @@ ---TEST-- -Test rsort() function : usage variations - String values ---FILE-- - SORT_REGULAR, "SORT_STRING" => SORT_STRING); - -$count = 1; -// loop through to test rsort() with different arrays -foreach ($various_arrays as $array) { - echo "\n-- Iteration $count --\n"; - - echo "- With Default sort flag -\n"; - $temp_array = $array; - var_dump(rsort($temp_array) ); - var_dump($temp_array); - - // loop through $flags array and setting all possible flag values - foreach($flags as $key => $flag){ - echo "- Sort flag = $key -\n"; - - $temp_array = $array; - var_dump(rsort($temp_array, $flag) ); - var_dump($temp_array); - } - $count++; -} - -echo "Done"; -?> ---EXPECT-- -*** Testing rsort() : variation *** - --- Iteration 1 -- -- With Default sort flag - -bool(true) -array(11) { - [0]=> - string(4) "\xhh" - [1]=> - string(4) "\ddd" - [2]=> - string(3) "\cx" - [3]=> - string(2) "\a" - [4]=> - string(1) "" - [5]=> - string(1) " " - [6]=> - string(1) " " - [7]=> - string(1) " -" - [8]=> - string(1) " " - [9]=> - NULL - [10]=> - NULL -} -- Sort flag = SORT_REGULAR - -bool(true) -array(11) { - [0]=> - string(4) "\xhh" - [1]=> - string(4) "\ddd" - [2]=> - string(3) "\cx" - [3]=> - string(2) "\a" - [4]=> - string(1) "" - [5]=> - string(1) " " - [6]=> - string(1) " " - [7]=> - string(1) " -" - [8]=> - string(1) " " - [9]=> - NULL - [10]=> - NULL -} -- Sort flag = SORT_STRING - -bool(true) -array(11) { - [0]=> - string(4) "\xhh" - [1]=> - string(4) "\ddd" - [2]=> - string(3) "\cx" - [3]=> - string(2) "\a" - [4]=> - string(1) "" - [5]=> - string(1) " " - [6]=> - string(1) " " - [7]=> - string(1) " -" - [8]=> - string(1) " " - [9]=> - NULL - [10]=> - NULL -} - --- Iteration 2 -- -- With Default sort flag - -bool(true) -array(12) { - [0]=> - string(1) "x" - [1]=> - string(2) "ww" - [2]=> - string(3) "ttt" - [3]=> - string(6) "oraNGe" - [4]=> - string(5) "lemoN" - [5]=> - string(6) "banana" - [6]=> - string(5) "apple" - [7]=> - string(1) "X" - [8]=> - string(4) "Test" - [9]=> - string(4) "TTTT" - [10]=> - string(6) "Orange" - [11]=> - string(6) "BANANA" -} -- Sort flag = SORT_REGULAR - -bool(true) -array(12) { - [0]=> - string(1) "x" - [1]=> - string(2) "ww" - [2]=> - string(3) "ttt" - [3]=> - string(6) "oraNGe" - [4]=> - string(5) "lemoN" - [5]=> - string(6) "banana" - [6]=> - string(5) "apple" - [7]=> - string(1) "X" - [8]=> - string(4) "Test" - [9]=> - string(4) "TTTT" - [10]=> - string(6) "Orange" - [11]=> - string(6) "BANANA" -} -- Sort flag = SORT_STRING - -bool(true) -array(12) { - [0]=> - string(1) "x" - [1]=> - string(2) "ww" - [2]=> - string(3) "ttt" - [3]=> - string(6) "oraNGe" - [4]=> - string(5) "lemoN" - [5]=> - string(6) "banana" - [6]=> - string(5) "apple" - [7]=> - string(1) "X" - [8]=> - string(4) "Test" - [9]=> - string(4) "TTTT" - [10]=> - string(6) "Orange" - [11]=> - string(6) "BANANA" -} -Done diff --git a/ext/standard/tests/array/array_multisort_basic1.phpt b/ext/standard/tests/array/sort/array_multisort_basic1.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_basic1.phpt rename to ext/standard/tests/array/sort/array_multisort_basic1.phpt diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/sort/array_multisort_basic2.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_basic2.phpt rename to ext/standard/tests/array/sort/array_multisort_basic2.phpt diff --git a/ext/standard/tests/array/array_multisort_case.phpt b/ext/standard/tests/array/sort/array_multisort_case.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_case.phpt rename to ext/standard/tests/array/sort/array_multisort_case.phpt diff --git a/ext/standard/tests/array/array_multisort_error.phpt b/ext/standard/tests/array/sort/array_multisort_error.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_error.phpt rename to ext/standard/tests/array/sort/array_multisort_error.phpt diff --git a/ext/standard/tests/array/array_multisort_incase.phpt b/ext/standard/tests/array/sort/array_multisort_incase.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_incase.phpt rename to ext/standard/tests/array/sort/array_multisort_incase.phpt diff --git a/ext/standard/tests/array/array_multisort_natural.phpt b/ext/standard/tests/array/sort/array_multisort_natural.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_natural.phpt rename to ext/standard/tests/array/sort/array_multisort_natural.phpt diff --git a/ext/standard/tests/array/array_multisort_natural_case.phpt b/ext/standard/tests/array/sort/array_multisort_natural_case.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_natural_case.phpt rename to ext/standard/tests/array/sort/array_multisort_natural_case.phpt diff --git a/ext/standard/tests/array/array_multisort_natural_incase.phpt b/ext/standard/tests/array/sort/array_multisort_natural_incase.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_natural_incase.phpt rename to ext/standard/tests/array/sort/array_multisort_natural_incase.phpt diff --git a/ext/standard/tests/array/array_multisort_stability.phpt b/ext/standard/tests/array/sort/array_multisort_stability.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_stability.phpt rename to ext/standard/tests/array/sort/array_multisort_stability.phpt diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/sort/array_multisort_variation1.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation1.phpt rename to ext/standard/tests/array/sort/array_multisort_variation1.phpt diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/sort/array_multisort_variation10.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation10.phpt rename to ext/standard/tests/array/sort/array_multisort_variation10.phpt diff --git a/ext/standard/tests/array/array_multisort_variation11.phpt b/ext/standard/tests/array/sort/array_multisort_variation11.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation11.phpt rename to ext/standard/tests/array/sort/array_multisort_variation11.phpt diff --git a/ext/standard/tests/array/array_multisort_variation2.phpt b/ext/standard/tests/array/sort/array_multisort_variation2.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation2.phpt rename to ext/standard/tests/array/sort/array_multisort_variation2.phpt diff --git a/ext/standard/tests/array/array_multisort_variation3.phpt b/ext/standard/tests/array/sort/array_multisort_variation3.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation3.phpt rename to ext/standard/tests/array/sort/array_multisort_variation3.phpt diff --git a/ext/standard/tests/array/array_multisort_variation4.phpt b/ext/standard/tests/array/sort/array_multisort_variation4.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation4.phpt rename to ext/standard/tests/array/sort/array_multisort_variation4.phpt diff --git a/ext/standard/tests/array/array_multisort_variation5.phpt b/ext/standard/tests/array/sort/array_multisort_variation5.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation5.phpt rename to ext/standard/tests/array/sort/array_multisort_variation5.phpt diff --git a/ext/standard/tests/array/array_multisort_variation6.phpt b/ext/standard/tests/array/sort/array_multisort_variation6.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation6.phpt rename to ext/standard/tests/array/sort/array_multisort_variation6.phpt diff --git a/ext/standard/tests/array/array_multisort_variation7.phpt b/ext/standard/tests/array/sort/array_multisort_variation7.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation7.phpt rename to ext/standard/tests/array/sort/array_multisort_variation7.phpt diff --git a/ext/standard/tests/array/array_multisort_variation8.phpt b/ext/standard/tests/array/sort/array_multisort_variation8.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation8.phpt rename to ext/standard/tests/array/sort/array_multisort_variation8.phpt diff --git a/ext/standard/tests/array/array_multisort_variation9.phpt b/ext/standard/tests/array/sort/array_multisort_variation9.phpt similarity index 100% rename from ext/standard/tests/array/array_multisort_variation9.phpt rename to ext/standard/tests/array/sort/array_multisort_variation9.phpt diff --git a/ext/standard/tests/array/array_shuffle_basic.phpt b/ext/standard/tests/array/sort/array_shuffle_basic.phpt similarity index 100% rename from ext/standard/tests/array/array_shuffle_basic.phpt rename to ext/standard/tests/array/sort/array_shuffle_basic.phpt diff --git a/ext/standard/tests/array/arsort_basic.phpt b/ext/standard/tests/array/sort/arsort_basic.phpt similarity index 100% rename from ext/standard/tests/array/arsort_basic.phpt rename to ext/standard/tests/array/sort/arsort_basic.phpt diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/sort/arsort_object1.phpt similarity index 100% rename from ext/standard/tests/array/arsort_object1.phpt rename to ext/standard/tests/array/sort/arsort_object1.phpt diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/sort/arsort_object2.phpt similarity index 100% rename from ext/standard/tests/array/arsort_object2.phpt rename to ext/standard/tests/array/sort/arsort_object2.phpt diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/sort/arsort_variation10.phpt similarity index 100% rename from ext/standard/tests/array/arsort_variation10.phpt rename to ext/standard/tests/array/sort/arsort_variation10.phpt diff --git a/ext/standard/tests/array/arsort_variation11.phpt b/ext/standard/tests/array/sort/arsort_variation11.phpt similarity index 100% rename from ext/standard/tests/array/arsort_variation11.phpt rename to ext/standard/tests/array/sort/arsort_variation11.phpt diff --git a/ext/standard/tests/array/arsort_variation3.phpt b/ext/standard/tests/array/sort/arsort_variation3.phpt similarity index 100% rename from ext/standard/tests/array/arsort_variation3.phpt rename to ext/standard/tests/array/sort/arsort_variation3.phpt diff --git a/ext/standard/tests/array/arsort_variation4.phpt b/ext/standard/tests/array/sort/arsort_variation4.phpt similarity index 100% rename from ext/standard/tests/array/arsort_variation4.phpt rename to ext/standard/tests/array/sort/arsort_variation4.phpt diff --git a/ext/standard/tests/array/sort/arsort_variation5.phpt b/ext/standard/tests/array/sort/arsort_variation5.phpt new file mode 100644 index 0000000000000..08c70d8e07ddb --- /dev/null +++ b/ext/standard/tests/array/sort/arsort_variation5.phpt @@ -0,0 +1,121 @@ +--TEST-- +Test arsort() function : usage variations - sort strings +--FILE-- + "lemoN", + "Orange" => "Orange", + "banana" => "banana", + "apple" => "apple", + "Test" => "Test", + "TTTT" => "TTTT", + "ttt" => "ttt", + "ww" => "ww", + "x" => "x", + "X" => "X", + "oraNGe" => "oraNGe", + "BANANA" => "BANANA", +]; + +echo "Default flag\n"; +$temp_array = $array; +var_dump(arsort($temp_array)); // expecting : bool(true) +var_dump($temp_array); + +echo "SORT_REGULAR\n"; +$temp_array = $array; +var_dump(arsort($temp_array, SORT_REGULAR)); // expecting : bool(true) +var_dump($temp_array); + +echo "SORT_STRING\n"; +$temp_array = $array; +var_dump(arsort($temp_array, SORT_STRING)); // expecting : bool(true) +var_dump($temp_array); + +?> +--EXPECT-- +Default flag +bool(true) +array(12) { + ["x"]=> + string(1) "x" + ["ww"]=> + string(2) "ww" + ["ttt"]=> + string(3) "ttt" + ["oraNGe"]=> + string(6) "oraNGe" + ["lemoN"]=> + string(5) "lemoN" + ["banana"]=> + string(6) "banana" + ["apple"]=> + string(5) "apple" + ["X"]=> + string(1) "X" + ["Test"]=> + string(4) "Test" + ["TTTT"]=> + string(4) "TTTT" + ["Orange"]=> + string(6) "Orange" + ["BANANA"]=> + string(6) "BANANA" +} +SORT_REGULAR +bool(true) +array(12) { + ["x"]=> + string(1) "x" + ["ww"]=> + string(2) "ww" + ["ttt"]=> + string(3) "ttt" + ["oraNGe"]=> + string(6) "oraNGe" + ["lemoN"]=> + string(5) "lemoN" + ["banana"]=> + string(6) "banana" + ["apple"]=> + string(5) "apple" + ["X"]=> + string(1) "X" + ["Test"]=> + string(4) "Test" + ["TTTT"]=> + string(4) "TTTT" + ["Orange"]=> + string(6) "Orange" + ["BANANA"]=> + string(6) "BANANA" +} +SORT_STRING +bool(true) +array(12) { + ["x"]=> + string(1) "x" + ["ww"]=> + string(2) "ww" + ["ttt"]=> + string(3) "ttt" + ["oraNGe"]=> + string(6) "oraNGe" + ["lemoN"]=> + string(5) "lemoN" + ["banana"]=> + string(6) "banana" + ["apple"]=> + string(5) "apple" + ["X"]=> + string(1) "X" + ["Test"]=> + string(4) "Test" + ["TTTT"]=> + string(4) "TTTT" + ["Orange"]=> + string(6) "Orange" + ["BANANA"]=> + string(6) "BANANA" +} diff --git a/ext/standard/tests/array/arsort_variation6.phpt b/ext/standard/tests/array/sort/arsort_variation6.phpt similarity index 100% rename from ext/standard/tests/array/arsort_variation6.phpt rename to ext/standard/tests/array/sort/arsort_variation6.phpt diff --git a/ext/standard/tests/array/arsort_variation7.phpt b/ext/standard/tests/array/sort/arsort_variation7.phpt similarity index 100% rename from ext/standard/tests/array/arsort_variation7.phpt rename to ext/standard/tests/array/sort/arsort_variation7.phpt diff --git a/ext/standard/tests/array/arsort_variation8.phpt b/ext/standard/tests/array/sort/arsort_variation8.phpt similarity index 100% rename from ext/standard/tests/array/arsort_variation8.phpt rename to ext/standard/tests/array/sort/arsort_variation8.phpt diff --git a/ext/standard/tests/array/arsort_variation9.phpt b/ext/standard/tests/array/sort/arsort_variation9.phpt similarity index 100% rename from ext/standard/tests/array/arsort_variation9.phpt rename to ext/standard/tests/array/sort/arsort_variation9.phpt diff --git a/ext/standard/tests/array/sort/arsort_variation_escape_sequences.phpt b/ext/standard/tests/array/sort/arsort_variation_escape_sequences.phpt new file mode 100644 index 0000000000000..b4a533c42114c --- /dev/null +++ b/ext/standard/tests/array/sort/arsort_variation_escape_sequences.phpt @@ -0,0 +1,59 @@ +--TEST-- +Test arsort() function: sorting escape sequences +--FILE-- + "\xhh", + "\ddd" => "\ddd", + "\cx" => "\cx", + "\a" => "\a", + "\e" => "\e", + "\r" => "\r", + "\f" => "\f", + "\v" => "\v", + "\n" => "\n", + "\t" => "\t", + null => null, +]; + +$array = [ + null => null, + "\a" => "\a", + "\cx" => "\cx", + "\e" => "\e", + "\f" => "\f", + "\n" => "\n", + "\r" => "\r", + "\t" => "\t", + "\xhh" => "\xhh", + "\ddd" => "\ddd", + "\v" => "\v", +]; + +echo "Default flag\n"; +$temp_array = $array; +var_dump(arsort($temp_array)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +echo "SORT_REGULAR\n"; +$temp_array = $array; +var_dump(arsort($temp_array, SORT_REGULAR)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +echo "SORT_STRING\n"; +$temp_array = $array; +var_dump(arsort($temp_array, SORT_STRING)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +?> +--EXPECT-- +Default flag +bool(true) +bool(true) +SORT_REGULAR +bool(true) +bool(true) +SORT_STRING +bool(true) +bool(true) diff --git a/ext/standard/tests/array/asort_basic.phpt b/ext/standard/tests/array/sort/asort_basic.phpt similarity index 100% rename from ext/standard/tests/array/asort_basic.phpt rename to ext/standard/tests/array/sort/asort_basic.phpt diff --git a/ext/standard/tests/array/asort_object1.phpt b/ext/standard/tests/array/sort/asort_object1.phpt similarity index 100% rename from ext/standard/tests/array/asort_object1.phpt rename to ext/standard/tests/array/sort/asort_object1.phpt diff --git a/ext/standard/tests/array/asort_object2.phpt b/ext/standard/tests/array/sort/asort_object2.phpt similarity index 100% rename from ext/standard/tests/array/asort_object2.phpt rename to ext/standard/tests/array/sort/asort_object2.phpt diff --git a/ext/standard/tests/array/asort_stability.phpt b/ext/standard/tests/array/sort/asort_stability.phpt similarity index 100% rename from ext/standard/tests/array/asort_stability.phpt rename to ext/standard/tests/array/sort/asort_stability.phpt diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/sort/asort_variation10.phpt similarity index 100% rename from ext/standard/tests/array/asort_variation10.phpt rename to ext/standard/tests/array/sort/asort_variation10.phpt diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/sort/asort_variation11.phpt similarity index 100% rename from ext/standard/tests/array/asort_variation11.phpt rename to ext/standard/tests/array/sort/asort_variation11.phpt diff --git a/ext/standard/tests/array/asort_variation3.phpt b/ext/standard/tests/array/sort/asort_variation3.phpt similarity index 100% rename from ext/standard/tests/array/asort_variation3.phpt rename to ext/standard/tests/array/sort/asort_variation3.phpt diff --git a/ext/standard/tests/array/asort_variation4.phpt b/ext/standard/tests/array/sort/asort_variation4.phpt similarity index 100% rename from ext/standard/tests/array/asort_variation4.phpt rename to ext/standard/tests/array/sort/asort_variation4.phpt diff --git a/ext/standard/tests/array/sort/asort_variation5.phpt b/ext/standard/tests/array/sort/asort_variation5.phpt new file mode 100644 index 0000000000000..d5a8930f090c3 --- /dev/null +++ b/ext/standard/tests/array/sort/asort_variation5.phpt @@ -0,0 +1,121 @@ +--TEST-- +Test asort() function : usage variations - sort strings +--FILE-- + "lemoN", + "Orange" => "Orange", + "banana" => "banana", + "apple" => "apple", + "Test" => "Test", + "TTTT" => "TTTT", + "ttt" => "ttt", + "ww" => "ww", + "x" => "x", + "X" => "X", + "oraNGe" => "oraNGe", + "BANANA" => "BANANA", +]; + +echo "Default flag\n"; +$temp_array = $array; +var_dump(asort($temp_array)); // expecting : bool(true) +var_dump($temp_array); + +echo "SORT_REGULAR\n"; +$temp_array = $array; +var_dump(asort($temp_array, SORT_REGULAR)); // expecting : bool(true) +var_dump($temp_array); + +echo "SORT_STRING\n"; +$temp_array = $array; +var_dump(asort($temp_array, SORT_STRING)); // expecting : bool(true) +var_dump($temp_array); + +?> +--EXPECT-- +Default flag +bool(true) +array(12) { + ["BANANA"]=> + string(6) "BANANA" + ["Orange"]=> + string(6) "Orange" + ["TTTT"]=> + string(4) "TTTT" + ["Test"]=> + string(4) "Test" + ["X"]=> + string(1) "X" + ["apple"]=> + string(5) "apple" + ["banana"]=> + string(6) "banana" + ["lemoN"]=> + string(5) "lemoN" + ["oraNGe"]=> + string(6) "oraNGe" + ["ttt"]=> + string(3) "ttt" + ["ww"]=> + string(2) "ww" + ["x"]=> + string(1) "x" +} +SORT_REGULAR +bool(true) +array(12) { + ["BANANA"]=> + string(6) "BANANA" + ["Orange"]=> + string(6) "Orange" + ["TTTT"]=> + string(4) "TTTT" + ["Test"]=> + string(4) "Test" + ["X"]=> + string(1) "X" + ["apple"]=> + string(5) "apple" + ["banana"]=> + string(6) "banana" + ["lemoN"]=> + string(5) "lemoN" + ["oraNGe"]=> + string(6) "oraNGe" + ["ttt"]=> + string(3) "ttt" + ["ww"]=> + string(2) "ww" + ["x"]=> + string(1) "x" +} +SORT_STRING +bool(true) +array(12) { + ["BANANA"]=> + string(6) "BANANA" + ["Orange"]=> + string(6) "Orange" + ["TTTT"]=> + string(4) "TTTT" + ["Test"]=> + string(4) "Test" + ["X"]=> + string(1) "X" + ["apple"]=> + string(5) "apple" + ["banana"]=> + string(6) "banana" + ["lemoN"]=> + string(5) "lemoN" + ["oraNGe"]=> + string(6) "oraNGe" + ["ttt"]=> + string(3) "ttt" + ["ww"]=> + string(2) "ww" + ["x"]=> + string(1) "x" +} \ No newline at end of file diff --git a/ext/standard/tests/array/asort_variation6.phpt b/ext/standard/tests/array/sort/asort_variation6.phpt similarity index 100% rename from ext/standard/tests/array/asort_variation6.phpt rename to ext/standard/tests/array/sort/asort_variation6.phpt diff --git a/ext/standard/tests/array/asort_variation7.phpt b/ext/standard/tests/array/sort/asort_variation7.phpt similarity index 100% rename from ext/standard/tests/array/asort_variation7.phpt rename to ext/standard/tests/array/sort/asort_variation7.phpt diff --git a/ext/standard/tests/array/asort_variation8.phpt b/ext/standard/tests/array/sort/asort_variation8.phpt similarity index 100% rename from ext/standard/tests/array/asort_variation8.phpt rename to ext/standard/tests/array/sort/asort_variation8.phpt diff --git a/ext/standard/tests/array/asort_variation9.phpt b/ext/standard/tests/array/sort/asort_variation9.phpt similarity index 100% rename from ext/standard/tests/array/asort_variation9.phpt rename to ext/standard/tests/array/sort/asort_variation9.phpt diff --git a/ext/standard/tests/array/sort/asort_variation_escape_sequences.phpt b/ext/standard/tests/array/sort/asort_variation_escape_sequences.phpt new file mode 100644 index 0000000000000..6de02b66ae0a6 --- /dev/null +++ b/ext/standard/tests/array/sort/asort_variation_escape_sequences.phpt @@ -0,0 +1,59 @@ +--TEST-- +Test asort() function: sorting escape sequences +--FILE-- + null, + "\t" => "\t", + "\n" => "\n", + "\v" => "\v", + "\f" => "\f", + "\r" => "\r", + "\e" => "\e", + "\a" => "\a", + "\cx" => "\cx", + "\ddd" => "\ddd", + "\xhh" => "\xhh", +]; + +$array = [ + null => null, + "\a" => "\a", + "\cx" => "\cx", + "\e" => "\e", + "\f" => "\f", + "\n" => "\n", + "\r" => "\r", + "\t" => "\t", + "\xhh" => "\xhh", + "\ddd" => "\ddd", + "\v" => "\v", +]; + +echo "Default flag\n"; +$temp_array = $array; +var_dump(asort($temp_array)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +echo "SORT_REGULAR\n"; +$temp_array = $array; +var_dump(asort($temp_array, SORT_REGULAR)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +echo "SORT_STRING\n"; +$temp_array = $array; +var_dump(asort($temp_array, SORT_STRING)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +?> +--EXPECT-- +Default flag +bool(true) +bool(true) +SORT_REGULAR +bool(true) +bool(true) +SORT_STRING +bool(true) +bool(true) diff --git a/ext/standard/tests/array/bug24897.phpt b/ext/standard/tests/array/sort/bug24897.phpt similarity index 100% rename from ext/standard/tests/array/bug24897.phpt rename to ext/standard/tests/array/sort/bug24897.phpt diff --git a/ext/standard/tests/array/bug25359.phpt b/ext/standard/tests/array/sort/bug25359.phpt similarity index 100% rename from ext/standard/tests/array/bug25359.phpt rename to ext/standard/tests/array/sort/bug25359.phpt diff --git a/ext/standard/tests/array/bug33382.phpt b/ext/standard/tests/array/sort/bug33382.phpt similarity index 100% rename from ext/standard/tests/array/bug33382.phpt rename to ext/standard/tests/array/sort/bug33382.phpt diff --git a/ext/standard/tests/array/bug36975.phpt b/ext/standard/tests/array/sort/bug36975.phpt similarity index 100% rename from ext/standard/tests/array/bug36975.phpt rename to ext/standard/tests/array/sort/bug36975.phpt diff --git a/ext/standard/tests/array/bug44929.phpt b/ext/standard/tests/array/sort/bug44929.phpt similarity index 100% rename from ext/standard/tests/array/bug44929.phpt rename to ext/standard/tests/array/sort/bug44929.phpt diff --git a/ext/standard/tests/array/bug50006.phpt b/ext/standard/tests/array/sort/bug50006.phpt similarity index 100% rename from ext/standard/tests/array/bug50006.phpt rename to ext/standard/tests/array/sort/bug50006.phpt diff --git a/ext/standard/tests/array/bug50006_1.phpt b/ext/standard/tests/array/sort/bug50006_1.phpt similarity index 100% rename from ext/standard/tests/array/bug50006_1.phpt rename to ext/standard/tests/array/sort/bug50006_1.phpt diff --git a/ext/standard/tests/array/bug50006_2.phpt b/ext/standard/tests/array/sort/bug50006_2.phpt similarity index 100% rename from ext/standard/tests/array/bug50006_2.phpt rename to ext/standard/tests/array/sort/bug50006_2.phpt diff --git a/ext/standard/tests/array/bug71334.phpt b/ext/standard/tests/array/sort/bug71334.phpt similarity index 100% rename from ext/standard/tests/array/bug71334.phpt rename to ext/standard/tests/array/sort/bug71334.phpt diff --git a/ext/standard/tests/array/bug77395.phpt b/ext/standard/tests/array/sort/bug77395.phpt similarity index 100% rename from ext/standard/tests/array/bug77395.phpt rename to ext/standard/tests/array/sort/bug77395.phpt diff --git a/ext/standard/tests/array/data.inc b/ext/standard/tests/array/sort/data.inc similarity index 100% rename from ext/standard/tests/array/data.inc rename to ext/standard/tests/array/sort/data.inc diff --git a/ext/standard/tests/array/gh9296.phpt b/ext/standard/tests/array/sort/gh9296.phpt similarity index 100% rename from ext/standard/tests/array/gh9296.phpt rename to ext/standard/tests/array/sort/gh9296.phpt diff --git a/ext/standard/tests/array/002.phpt b/ext/standard/tests/array/sort/internal_sorts_basic.phpt similarity index 100% rename from ext/standard/tests/array/002.phpt rename to ext/standard/tests/array/sort/internal_sorts_basic.phpt diff --git a/ext/standard/tests/array/krsort_basic.phpt b/ext/standard/tests/array/sort/krsort_basic.phpt similarity index 100% rename from ext/standard/tests/array/krsort_basic.phpt rename to ext/standard/tests/array/sort/krsort_basic.phpt diff --git a/ext/standard/tests/array/krsort_object.phpt b/ext/standard/tests/array/sort/krsort_object.phpt similarity index 100% rename from ext/standard/tests/array/krsort_object.phpt rename to ext/standard/tests/array/sort/krsort_object.phpt diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/sort/krsort_variation10.phpt similarity index 100% rename from ext/standard/tests/array/krsort_variation10.phpt rename to ext/standard/tests/array/sort/krsort_variation10.phpt diff --git a/ext/standard/tests/array/krsort_variation11.phpt b/ext/standard/tests/array/sort/krsort_variation11.phpt similarity index 100% rename from ext/standard/tests/array/krsort_variation11.phpt rename to ext/standard/tests/array/sort/krsort_variation11.phpt diff --git a/ext/standard/tests/array/krsort_variation3.phpt b/ext/standard/tests/array/sort/krsort_variation3.phpt similarity index 100% rename from ext/standard/tests/array/krsort_variation3.phpt rename to ext/standard/tests/array/sort/krsort_variation3.phpt diff --git a/ext/standard/tests/array/krsort_variation4.phpt b/ext/standard/tests/array/sort/krsort_variation4.phpt similarity index 100% rename from ext/standard/tests/array/krsort_variation4.phpt rename to ext/standard/tests/array/sort/krsort_variation4.phpt diff --git a/ext/standard/tests/array/sort/krsort_variation5.phpt b/ext/standard/tests/array/sort/krsort_variation5.phpt new file mode 100644 index 0000000000000..b1fe5897f16c9 --- /dev/null +++ b/ext/standard/tests/array/sort/krsort_variation5.phpt @@ -0,0 +1,121 @@ +--TEST-- +Test krsort() function : usage variations - sort strings +--FILE-- + "lemoN", + "Orange" => "Orange", + "banana" => "banana", + "apple" => "apple", + "Test" => "Test", + "TTTT" => "TTTT", + "ttt" => "ttt", + "ww" => "ww", + "x" => "x", + "X" => "X", + "oraNGe" => "oraNGe", + "BANANA" => "BANANA", +]; + +echo "Default flag\n"; +$temp_array = $array; +var_dump(ksort($temp_array)); // expecting : bool(true) +var_dump($temp_array); + +echo "SORT_REGULAR\n"; +$temp_array = $array; +var_dump(ksort($temp_array, SORT_REGULAR)); // expecting : bool(true) +var_dump($temp_array); + +echo "SORT_STRING\n"; +$temp_array = $array; +var_dump(ksort($temp_array, SORT_STRING)); // expecting : bool(true) +var_dump($temp_array); + +?> +--EXPECT-- +Default flag +bool(true) +array(12) { + ["BANANA"]=> + string(6) "BANANA" + ["Orange"]=> + string(6) "Orange" + ["TTTT"]=> + string(4) "TTTT" + ["Test"]=> + string(4) "Test" + ["X"]=> + string(1) "X" + ["apple"]=> + string(5) "apple" + ["banana"]=> + string(6) "banana" + ["lemoN"]=> + string(5) "lemoN" + ["oraNGe"]=> + string(6) "oraNGe" + ["ttt"]=> + string(3) "ttt" + ["ww"]=> + string(2) "ww" + ["x"]=> + string(1) "x" +} +SORT_REGULAR +bool(true) +array(12) { + ["BANANA"]=> + string(6) "BANANA" + ["Orange"]=> + string(6) "Orange" + ["TTTT"]=> + string(4) "TTTT" + ["Test"]=> + string(4) "Test" + ["X"]=> + string(1) "X" + ["apple"]=> + string(5) "apple" + ["banana"]=> + string(6) "banana" + ["lemoN"]=> + string(5) "lemoN" + ["oraNGe"]=> + string(6) "oraNGe" + ["ttt"]=> + string(3) "ttt" + ["ww"]=> + string(2) "ww" + ["x"]=> + string(1) "x" +} +SORT_STRING +bool(true) +array(12) { + ["BANANA"]=> + string(6) "BANANA" + ["Orange"]=> + string(6) "Orange" + ["TTTT"]=> + string(4) "TTTT" + ["Test"]=> + string(4) "Test" + ["X"]=> + string(1) "X" + ["apple"]=> + string(5) "apple" + ["banana"]=> + string(6) "banana" + ["lemoN"]=> + string(5) "lemoN" + ["oraNGe"]=> + string(6) "oraNGe" + ["ttt"]=> + string(3) "ttt" + ["ww"]=> + string(2) "ww" + ["x"]=> + string(1) "x" +} diff --git a/ext/standard/tests/array/krsort_variation6.phpt b/ext/standard/tests/array/sort/krsort_variation6.phpt similarity index 100% rename from ext/standard/tests/array/krsort_variation6.phpt rename to ext/standard/tests/array/sort/krsort_variation6.phpt diff --git a/ext/standard/tests/array/krsort_variation7.phpt b/ext/standard/tests/array/sort/krsort_variation7.phpt similarity index 100% rename from ext/standard/tests/array/krsort_variation7.phpt rename to ext/standard/tests/array/sort/krsort_variation7.phpt diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/sort/krsort_variation8.phpt similarity index 100% rename from ext/standard/tests/array/krsort_variation8.phpt rename to ext/standard/tests/array/sort/krsort_variation8.phpt diff --git a/ext/standard/tests/array/krsort_variation9.phpt b/ext/standard/tests/array/sort/krsort_variation9.phpt similarity index 100% rename from ext/standard/tests/array/krsort_variation9.phpt rename to ext/standard/tests/array/sort/krsort_variation9.phpt diff --git a/ext/standard/tests/array/sort/krsort_variation_escape_sequences.phpt b/ext/standard/tests/array/sort/krsort_variation_escape_sequences.phpt new file mode 100644 index 0000000000000..ac56df76ed7ca --- /dev/null +++ b/ext/standard/tests/array/sort/krsort_variation_escape_sequences.phpt @@ -0,0 +1,59 @@ +--TEST-- +Test krsort() function: sorting escape sequences +--FILE-- + "\xhh", + "\ddd" => "\ddd", + "\cx" => "\cx", + "\a" => "\a", + "\e" => "\e", + "\r" => "\r", + "\f" => "\f", + "\v" => "\v", + "\n" => "\n", + "\t" => "\t", + null => null, +]; + +$array = [ + null => null, + "\a" => "\a", + "\cx" => "\cx", + "\e" => "\e", + "\f" => "\f", + "\n" => "\n", + "\r" => "\r", + "\t" => "\t", + "\xhh" => "\xhh", + "\ddd" => "\ddd", + "\v" => "\v", +]; + +echo "Default flag\n"; +$temp_array = $array; +var_dump(krsort($temp_array)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +echo "SORT_REGULAR\n"; +$temp_array = $array; +var_dump(krsort($temp_array, SORT_REGULAR)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +echo "SORT_STRING\n"; +$temp_array = $array; +var_dump(krsort($temp_array, SORT_STRING)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +?> +--EXPECT-- +Default flag +bool(true) +bool(true) +SORT_REGULAR +bool(true) +bool(true) +SORT_STRING +bool(true) +bool(true) diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/sort/ksort_basic.phpt similarity index 100% rename from ext/standard/tests/array/ksort_basic.phpt rename to ext/standard/tests/array/sort/ksort_basic.phpt diff --git a/ext/standard/tests/array/ksort_object.phpt b/ext/standard/tests/array/sort/ksort_object.phpt similarity index 100% rename from ext/standard/tests/array/ksort_object.phpt rename to ext/standard/tests/array/sort/ksort_object.phpt diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/sort/ksort_variation10.phpt similarity index 100% rename from ext/standard/tests/array/ksort_variation10.phpt rename to ext/standard/tests/array/sort/ksort_variation10.phpt diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/sort/ksort_variation11.phpt similarity index 100% rename from ext/standard/tests/array/ksort_variation11.phpt rename to ext/standard/tests/array/sort/ksort_variation11.phpt diff --git a/ext/standard/tests/array/ksort_variation3.phpt b/ext/standard/tests/array/sort/ksort_variation3.phpt similarity index 100% rename from ext/standard/tests/array/ksort_variation3.phpt rename to ext/standard/tests/array/sort/ksort_variation3.phpt diff --git a/ext/standard/tests/array/ksort_variation4.phpt b/ext/standard/tests/array/sort/ksort_variation4.phpt similarity index 100% rename from ext/standard/tests/array/ksort_variation4.phpt rename to ext/standard/tests/array/sort/ksort_variation4.phpt diff --git a/ext/standard/tests/array/sort/ksort_variation5.phpt b/ext/standard/tests/array/sort/ksort_variation5.phpt new file mode 100644 index 0000000000000..f69b0b14d5d05 --- /dev/null +++ b/ext/standard/tests/array/sort/ksort_variation5.phpt @@ -0,0 +1,121 @@ +--TEST-- +Test ksort() function : usage variations - sort strings +--FILE-- + "lemoN", + "Orange" => "Orange", + "banana" => "banana", + "apple" => "apple", + "Test" => "Test", + "TTTT" => "TTTT", + "ttt" => "ttt", + "ww" => "ww", + "x" => "x", + "X" => "X", + "oraNGe" => "oraNGe", + "BANANA" => "BANANA", +]; + +echo "Default flag\n"; +$temp_array = $array; +var_dump(ksort($temp_array)); // expecting : bool(true) +var_dump($temp_array); + +echo "SORT_REGULAR\n"; +$temp_array = $array; +var_dump(ksort($temp_array, SORT_REGULAR)); // expecting : bool(true) +var_dump($temp_array); + +echo "SORT_STRING\n"; +$temp_array = $array; +var_dump(ksort($temp_array, SORT_STRING)); // expecting : bool(true) +var_dump($temp_array); + +?> +--EXPECT-- +Default flag +bool(true) +array(12) { + ["BANANA"]=> + string(6) "BANANA" + ["Orange"]=> + string(6) "Orange" + ["TTTT"]=> + string(4) "TTTT" + ["Test"]=> + string(4) "Test" + ["X"]=> + string(1) "X" + ["apple"]=> + string(5) "apple" + ["banana"]=> + string(6) "banana" + ["lemoN"]=> + string(5) "lemoN" + ["oraNGe"]=> + string(6) "oraNGe" + ["ttt"]=> + string(3) "ttt" + ["ww"]=> + string(2) "ww" + ["x"]=> + string(1) "x" +} +SORT_REGULAR +bool(true) +array(12) { + ["BANANA"]=> + string(6) "BANANA" + ["Orange"]=> + string(6) "Orange" + ["TTTT"]=> + string(4) "TTTT" + ["Test"]=> + string(4) "Test" + ["X"]=> + string(1) "X" + ["apple"]=> + string(5) "apple" + ["banana"]=> + string(6) "banana" + ["lemoN"]=> + string(5) "lemoN" + ["oraNGe"]=> + string(6) "oraNGe" + ["ttt"]=> + string(3) "ttt" + ["ww"]=> + string(2) "ww" + ["x"]=> + string(1) "x" +} +SORT_STRING +bool(true) +array(12) { + ["BANANA"]=> + string(6) "BANANA" + ["Orange"]=> + string(6) "Orange" + ["TTTT"]=> + string(4) "TTTT" + ["Test"]=> + string(4) "Test" + ["X"]=> + string(1) "X" + ["apple"]=> + string(5) "apple" + ["banana"]=> + string(6) "banana" + ["lemoN"]=> + string(5) "lemoN" + ["oraNGe"]=> + string(6) "oraNGe" + ["ttt"]=> + string(3) "ttt" + ["ww"]=> + string(2) "ww" + ["x"]=> + string(1) "x" +} diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/sort/ksort_variation6.phpt similarity index 100% rename from ext/standard/tests/array/ksort_variation6.phpt rename to ext/standard/tests/array/sort/ksort_variation6.phpt diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/sort/ksort_variation7.phpt similarity index 100% rename from ext/standard/tests/array/ksort_variation7.phpt rename to ext/standard/tests/array/sort/ksort_variation7.phpt diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/sort/ksort_variation8.phpt similarity index 100% rename from ext/standard/tests/array/ksort_variation8.phpt rename to ext/standard/tests/array/sort/ksort_variation8.phpt diff --git a/ext/standard/tests/array/ksort_variation9.phpt b/ext/standard/tests/array/sort/ksort_variation9.phpt similarity index 100% rename from ext/standard/tests/array/ksort_variation9.phpt rename to ext/standard/tests/array/sort/ksort_variation9.phpt diff --git a/ext/standard/tests/array/sort/ksort_variation_escape_sequences.phpt b/ext/standard/tests/array/sort/ksort_variation_escape_sequences.phpt new file mode 100644 index 0000000000000..e880227b1c9e0 --- /dev/null +++ b/ext/standard/tests/array/sort/ksort_variation_escape_sequences.phpt @@ -0,0 +1,59 @@ +--TEST-- +Test ksort() function: sorting escape sequences +--FILE-- + null, + "\t" => "\t", + "\n" => "\n", + "\v" => "\v", + "\f" => "\f", + "\r" => "\r", + "\e" => "\e", + "\a" => "\a", + "\cx" => "\cx", + "\ddd" => "\ddd", + "\xhh" => "\xhh", +]; + +$array = [ + null => null, + "\a" => "\a", + "\cx" => "\cx", + "\e" => "\e", + "\f" => "\f", + "\n" => "\n", + "\r" => "\r", + "\t" => "\t", + "\xhh" => "\xhh", + "\ddd" => "\ddd", + "\v" => "\v", +]; + +echo "Default flag\n"; +$temp_array = $array; +var_dump(ksort($temp_array)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +echo "SORT_REGULAR\n"; +$temp_array = $array; +var_dump(ksort($temp_array, SORT_REGULAR)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +echo "SORT_STRING\n"; +$temp_array = $array; +var_dump(ksort($temp_array, SORT_STRING)); // expecting : bool(true) +var_dump($temp_array === EXPECTED_RESULT); + +?> +--EXPECT-- +Default flag +bool(true) +bool(true) +SORT_REGULAR +bool(true) +bool(true) +SORT_STRING +bool(true) +bool(true) diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/sort/locale_sort.phpt similarity index 100% rename from ext/standard/tests/array/locale_sort.phpt rename to ext/standard/tests/array/sort/locale_sort.phpt diff --git a/ext/standard/tests/array/natcasesort_basic.phpt b/ext/standard/tests/array/sort/natcasesort_basic.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_basic.phpt rename to ext/standard/tests/array/sort/natcasesort_basic.phpt diff --git a/ext/standard/tests/array/natcasesort_object1.phpt b/ext/standard/tests/array/sort/natcasesort_object1.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_object1.phpt rename to ext/standard/tests/array/sort/natcasesort_object1.phpt diff --git a/ext/standard/tests/array/natcasesort_object2.phpt b/ext/standard/tests/array/sort/natcasesort_object2.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_object2.phpt rename to ext/standard/tests/array/sort/natcasesort_object2.phpt diff --git a/ext/standard/tests/array/natcasesort_variation10.phpt b/ext/standard/tests/array/sort/natcasesort_variation10.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_variation10.phpt rename to ext/standard/tests/array/sort/natcasesort_variation10.phpt diff --git a/ext/standard/tests/array/natcasesort_variation11.phpt b/ext/standard/tests/array/sort/natcasesort_variation11.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_variation11.phpt rename to ext/standard/tests/array/sort/natcasesort_variation11.phpt diff --git a/ext/standard/tests/array/natcasesort_variation2.phpt b/ext/standard/tests/array/sort/natcasesort_variation2.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_variation2.phpt rename to ext/standard/tests/array/sort/natcasesort_variation2.phpt diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/sort/natcasesort_variation3.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_variation3.phpt rename to ext/standard/tests/array/sort/natcasesort_variation3.phpt diff --git a/ext/standard/tests/array/natcasesort_variation4.phpt b/ext/standard/tests/array/sort/natcasesort_variation4.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_variation4.phpt rename to ext/standard/tests/array/sort/natcasesort_variation4.phpt diff --git a/ext/standard/tests/array/natcasesort_variation5.phpt b/ext/standard/tests/array/sort/natcasesort_variation5.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_variation5.phpt rename to ext/standard/tests/array/sort/natcasesort_variation5.phpt diff --git a/ext/standard/tests/array/natcasesort_variation6.phpt b/ext/standard/tests/array/sort/natcasesort_variation6.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_variation6.phpt rename to ext/standard/tests/array/sort/natcasesort_variation6.phpt diff --git a/ext/standard/tests/array/natcasesort_variation7.phpt b/ext/standard/tests/array/sort/natcasesort_variation7.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_variation7.phpt rename to ext/standard/tests/array/sort/natcasesort_variation7.phpt diff --git a/ext/standard/tests/array/natcasesort_variation8.phpt b/ext/standard/tests/array/sort/natcasesort_variation8.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_variation8.phpt rename to ext/standard/tests/array/sort/natcasesort_variation8.phpt diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/sort/natcasesort_variation9.phpt similarity index 100% rename from ext/standard/tests/array/natcasesort_variation9.phpt rename to ext/standard/tests/array/sort/natcasesort_variation9.phpt diff --git a/ext/standard/tests/array/natsort_basic.phpt b/ext/standard/tests/array/sort/natsort_basic.phpt similarity index 100% rename from ext/standard/tests/array/natsort_basic.phpt rename to ext/standard/tests/array/sort/natsort_basic.phpt diff --git a/ext/standard/tests/array/004.phpt b/ext/standard/tests/array/sort/natsort_natcasesort_basics.phpt similarity index 100% rename from ext/standard/tests/array/004.phpt rename to ext/standard/tests/array/sort/natsort_natcasesort_basics.phpt diff --git a/ext/standard/tests/array/rsort_basic.phpt b/ext/standard/tests/array/sort/rsort_basic.phpt similarity index 100% rename from ext/standard/tests/array/rsort_basic.phpt rename to ext/standard/tests/array/sort/rsort_basic.phpt diff --git a/ext/standard/tests/array/rsort_object1.phpt b/ext/standard/tests/array/sort/rsort_object1.phpt similarity index 100% rename from ext/standard/tests/array/rsort_object1.phpt rename to ext/standard/tests/array/sort/rsort_object1.phpt diff --git a/ext/standard/tests/array/rsort_object2.phpt b/ext/standard/tests/array/sort/rsort_object2.phpt similarity index 100% rename from ext/standard/tests/array/rsort_object2.phpt rename to ext/standard/tests/array/sort/rsort_object2.phpt diff --git a/ext/standard/tests/array/rsort_variation10.phpt b/ext/standard/tests/array/sort/rsort_variation10.phpt similarity index 100% rename from ext/standard/tests/array/rsort_variation10.phpt rename to ext/standard/tests/array/sort/rsort_variation10.phpt diff --git a/ext/standard/tests/array/rsort_variation11.phpt b/ext/standard/tests/array/sort/rsort_variation11.phpt similarity index 100% rename from ext/standard/tests/array/rsort_variation11.phpt rename to ext/standard/tests/array/sort/rsort_variation11.phpt diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/sort/rsort_variation3.phpt similarity index 100% rename from ext/standard/tests/array/rsort_variation3.phpt rename to ext/standard/tests/array/sort/rsort_variation3.phpt diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/sort/rsort_variation4.phpt similarity index 100% rename from ext/standard/tests/array/rsort_variation4.phpt rename to ext/standard/tests/array/sort/rsort_variation4.phpt diff --git a/ext/standard/tests/array/sort/rsort_variation5.phpt b/ext/standard/tests/array/sort/rsort_variation5.phpt new file mode 100644 index 0000000000000..c4dd3f6a9ce70 --- /dev/null +++ b/ext/standard/tests/array/sort/rsort_variation5.phpt @@ -0,0 +1,121 @@ +--TEST-- +Test rsort() function : usage variations - String values +--FILE-- + +--EXPECT-- +Default 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_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_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" +} diff --git a/ext/standard/tests/array/rsort_variation6.phpt b/ext/standard/tests/array/sort/rsort_variation6.phpt similarity index 100% rename from ext/standard/tests/array/rsort_variation6.phpt rename to ext/standard/tests/array/sort/rsort_variation6.phpt diff --git a/ext/standard/tests/array/rsort_variation7.phpt b/ext/standard/tests/array/sort/rsort_variation7.phpt similarity index 100% rename from ext/standard/tests/array/rsort_variation7.phpt rename to ext/standard/tests/array/sort/rsort_variation7.phpt diff --git a/ext/standard/tests/array/rsort_variation8.phpt b/ext/standard/tests/array/sort/rsort_variation8.phpt similarity index 100% rename from ext/standard/tests/array/rsort_variation8.phpt rename to ext/standard/tests/array/sort/rsort_variation8.phpt diff --git a/ext/standard/tests/array/rsort_variation9.phpt b/ext/standard/tests/array/sort/rsort_variation9.phpt similarity index 100% rename from ext/standard/tests/array/rsort_variation9.phpt rename to ext/standard/tests/array/sort/rsort_variation9.phpt diff --git a/ext/standard/tests/array/sort/rsort_variation_escape_sequences.phpt b/ext/standard/tests/array/sort/rsort_variation_escape_sequences.phpt new file mode 100644 index 0000000000000..57edbe66e1514 --- /dev/null +++ b/ext/standard/tests/array/sort/rsort_variation_escape_sequences.phpt @@ -0,0 +1,59 @@ +--TEST-- +Test rsort() function: sorting escape sequences +--FILE-- + +--EXPECT-- +Default flag +bool(true) +bool(true) +SORT_REGULAR +bool(true) +bool(true) +SORT_STRING +bool(true) +bool(true) diff --git a/ext/standard/tests/array/shuffle_basic1.phpt b/ext/standard/tests/array/sort/shuffle_basic1.phpt similarity index 100% rename from ext/standard/tests/array/shuffle_basic1.phpt rename to ext/standard/tests/array/sort/shuffle_basic1.phpt diff --git a/ext/standard/tests/array/shuffle_basic2.phpt b/ext/standard/tests/array/sort/shuffle_basic2.phpt similarity index 100% rename from ext/standard/tests/array/shuffle_basic2.phpt rename to ext/standard/tests/array/sort/shuffle_basic2.phpt diff --git a/ext/standard/tests/array/shuffle_variation2.phpt b/ext/standard/tests/array/sort/shuffle_variation2.phpt similarity index 100% rename from ext/standard/tests/array/shuffle_variation2.phpt rename to ext/standard/tests/array/sort/shuffle_variation2.phpt diff --git a/ext/standard/tests/array/shuffle_variation3.phpt b/ext/standard/tests/array/sort/shuffle_variation3.phpt similarity index 100% rename from ext/standard/tests/array/shuffle_variation3.phpt rename to ext/standard/tests/array/sort/shuffle_variation3.phpt diff --git a/ext/standard/tests/array/shuffle_variation4.phpt b/ext/standard/tests/array/sort/shuffle_variation4.phpt similarity index 100% rename from ext/standard/tests/array/shuffle_variation4.phpt rename to ext/standard/tests/array/sort/shuffle_variation4.phpt diff --git a/ext/standard/tests/array/shuffle_variation5.phpt b/ext/standard/tests/array/sort/shuffle_variation5.phpt similarity index 100% rename from ext/standard/tests/array/shuffle_variation5.phpt rename to ext/standard/tests/array/sort/shuffle_variation5.phpt diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort/sort_basic.phpt similarity index 100% rename from ext/standard/tests/array/sort_basic.phpt rename to ext/standard/tests/array/sort/sort_basic.phpt diff --git a/ext/standard/tests/array/sort_object1.phpt b/ext/standard/tests/array/sort/sort_object1.phpt similarity index 100% rename from ext/standard/tests/array/sort_object1.phpt rename to ext/standard/tests/array/sort/sort_object1.phpt diff --git a/ext/standard/tests/array/sort_object2.phpt b/ext/standard/tests/array/sort/sort_object2.phpt similarity index 100% rename from ext/standard/tests/array/sort_object2.phpt rename to ext/standard/tests/array/sort/sort_object2.phpt diff --git a/ext/standard/tests/array/sort_variation10.phpt b/ext/standard/tests/array/sort/sort_variation10.phpt similarity index 100% rename from ext/standard/tests/array/sort_variation10.phpt rename to ext/standard/tests/array/sort/sort_variation10.phpt diff --git a/ext/standard/tests/array/sort_variation11.phpt b/ext/standard/tests/array/sort/sort_variation11.phpt similarity index 100% rename from ext/standard/tests/array/sort_variation11.phpt rename to ext/standard/tests/array/sort/sort_variation11.phpt diff --git a/ext/standard/tests/array/sort_variation3.phpt b/ext/standard/tests/array/sort/sort_variation3.phpt similarity index 100% rename from ext/standard/tests/array/sort_variation3.phpt rename to ext/standard/tests/array/sort/sort_variation3.phpt diff --git a/ext/standard/tests/array/sort_variation4.phpt b/ext/standard/tests/array/sort/sort_variation4.phpt similarity index 100% rename from ext/standard/tests/array/sort_variation4.phpt rename to ext/standard/tests/array/sort/sort_variation4.phpt diff --git a/ext/standard/tests/array/sort/sort_variation5.phpt b/ext/standard/tests/array/sort/sort_variation5.phpt new file mode 100644 index 0000000000000..c9e369f4a2807 --- /dev/null +++ b/ext/standard/tests/array/sort/sort_variation5.phpt @@ -0,0 +1,121 @@ +--TEST-- +Test sort() function : usage variations - sort strings +--FILE-- + +--EXPECT-- +Default 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_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_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" +} diff --git a/ext/standard/tests/array/sort_variation6.phpt b/ext/standard/tests/array/sort/sort_variation6.phpt similarity index 100% rename from ext/standard/tests/array/sort_variation6.phpt rename to ext/standard/tests/array/sort/sort_variation6.phpt diff --git a/ext/standard/tests/array/sort_variation7.phpt b/ext/standard/tests/array/sort/sort_variation7.phpt similarity index 100% rename from ext/standard/tests/array/sort_variation7.phpt rename to ext/standard/tests/array/sort/sort_variation7.phpt diff --git a/ext/standard/tests/array/sort_variation8.phpt b/ext/standard/tests/array/sort/sort_variation8.phpt similarity index 100% rename from ext/standard/tests/array/sort_variation8.phpt rename to ext/standard/tests/array/sort/sort_variation8.phpt diff --git a/ext/standard/tests/array/sort_variation9.phpt b/ext/standard/tests/array/sort/sort_variation9.phpt similarity index 100% rename from ext/standard/tests/array/sort_variation9.phpt rename to ext/standard/tests/array/sort/sort_variation9.phpt diff --git a/ext/standard/tests/array/sort/sort_variation_escape_sequences.phpt b/ext/standard/tests/array/sort/sort_variation_escape_sequences.phpt new file mode 100644 index 0000000000000..e824a6f7e9c9f --- /dev/null +++ b/ext/standard/tests/array/sort/sort_variation_escape_sequences.phpt @@ -0,0 +1,59 @@ +--TEST-- +Test sort() function: sorting escape sequences +--FILE-- + +--EXPECT-- +Default flag +bool(true) +bool(true) +SORT_REGULAR +bool(true) +bool(true) +SORT_STRING +bool(true) +bool(true) diff --git a/ext/standard/tests/array/uasort_basic1.phpt b/ext/standard/tests/array/sort/uasort_basic1.phpt similarity index 100% rename from ext/standard/tests/array/uasort_basic1.phpt rename to ext/standard/tests/array/sort/uasort_basic1.phpt diff --git a/ext/standard/tests/array/uasort_basic2.phpt b/ext/standard/tests/array/sort/uasort_basic2.phpt similarity index 100% rename from ext/standard/tests/array/uasort_basic2.phpt rename to ext/standard/tests/array/sort/uasort_basic2.phpt diff --git a/ext/standard/tests/array/uasort_object1.phpt b/ext/standard/tests/array/sort/uasort_object1.phpt similarity index 100% rename from ext/standard/tests/array/uasort_object1.phpt rename to ext/standard/tests/array/sort/uasort_object1.phpt diff --git a/ext/standard/tests/array/uasort_object2.phpt b/ext/standard/tests/array/sort/uasort_object2.phpt similarity index 100% rename from ext/standard/tests/array/uasort_object2.phpt rename to ext/standard/tests/array/sort/uasort_object2.phpt diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/sort/uasort_variation10.phpt similarity index 100% rename from ext/standard/tests/array/uasort_variation10.phpt rename to ext/standard/tests/array/sort/uasort_variation10.phpt diff --git a/ext/standard/tests/array/uasort_variation11.phpt b/ext/standard/tests/array/sort/uasort_variation11.phpt similarity index 100% rename from ext/standard/tests/array/uasort_variation11.phpt rename to ext/standard/tests/array/sort/uasort_variation11.phpt diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/sort/uasort_variation3.phpt similarity index 100% rename from ext/standard/tests/array/uasort_variation3.phpt rename to ext/standard/tests/array/sort/uasort_variation3.phpt diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/sort/uasort_variation4.phpt similarity index 100% rename from ext/standard/tests/array/uasort_variation4.phpt rename to ext/standard/tests/array/sort/uasort_variation4.phpt diff --git a/ext/standard/tests/array/uasort_variation5.phpt b/ext/standard/tests/array/sort/uasort_variation5.phpt similarity index 100% rename from ext/standard/tests/array/uasort_variation5.phpt rename to ext/standard/tests/array/sort/uasort_variation5.phpt diff --git a/ext/standard/tests/array/uasort_variation6.phpt b/ext/standard/tests/array/sort/uasort_variation6.phpt similarity index 100% rename from ext/standard/tests/array/uasort_variation6.phpt rename to ext/standard/tests/array/sort/uasort_variation6.phpt diff --git a/ext/standard/tests/array/uasort_variation7.phpt b/ext/standard/tests/array/sort/uasort_variation7.phpt similarity index 100% rename from ext/standard/tests/array/uasort_variation7.phpt rename to ext/standard/tests/array/sort/uasort_variation7.phpt diff --git a/ext/standard/tests/array/uasort_variation8.phpt b/ext/standard/tests/array/sort/uasort_variation8.phpt similarity index 100% rename from ext/standard/tests/array/uasort_variation8.phpt rename to ext/standard/tests/array/sort/uasort_variation8.phpt diff --git a/ext/standard/tests/array/uksort_basic.phpt b/ext/standard/tests/array/sort/uksort_basic.phpt similarity index 100% rename from ext/standard/tests/array/uksort_basic.phpt rename to ext/standard/tests/array/sort/uksort_basic.phpt diff --git a/ext/standard/tests/array/003.phpt b/ext/standard/tests/array/sort/user_sort_basics.phpt similarity index 100% rename from ext/standard/tests/array/003.phpt rename to ext/standard/tests/array/sort/user_sort_basics.phpt diff --git a/ext/standard/tests/array/usort_basic.phpt b/ext/standard/tests/array/sort/usort_basic.phpt similarity index 100% rename from ext/standard/tests/array/usort_basic.phpt rename to ext/standard/tests/array/sort/usort_basic.phpt diff --git a/ext/standard/tests/array/usort_object1.phpt b/ext/standard/tests/array/sort/usort_object1.phpt similarity index 100% rename from ext/standard/tests/array/usort_object1.phpt rename to ext/standard/tests/array/sort/usort_object1.phpt diff --git a/ext/standard/tests/array/usort_object2.phpt b/ext/standard/tests/array/sort/usort_object2.phpt similarity index 100% rename from ext/standard/tests/array/usort_object2.phpt rename to ext/standard/tests/array/sort/usort_object2.phpt diff --git a/ext/standard/tests/array/usort_stability.phpt b/ext/standard/tests/array/sort/usort_stability.phpt similarity index 100% rename from ext/standard/tests/array/usort_stability.phpt rename to ext/standard/tests/array/sort/usort_stability.phpt diff --git a/ext/standard/tests/array/usort_variation10.phpt b/ext/standard/tests/array/sort/usort_variation10.phpt similarity index 100% rename from ext/standard/tests/array/usort_variation10.phpt rename to ext/standard/tests/array/sort/usort_variation10.phpt diff --git a/ext/standard/tests/array/usort_variation11.phpt b/ext/standard/tests/array/sort/usort_variation11.phpt similarity index 100% rename from ext/standard/tests/array/usort_variation11.phpt rename to ext/standard/tests/array/sort/usort_variation11.phpt diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/sort/usort_variation3.phpt similarity index 100% rename from ext/standard/tests/array/usort_variation3.phpt rename to ext/standard/tests/array/sort/usort_variation3.phpt diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/sort/usort_variation4.phpt similarity index 100% rename from ext/standard/tests/array/usort_variation4.phpt rename to ext/standard/tests/array/sort/usort_variation4.phpt diff --git a/ext/standard/tests/array/usort_variation5.phpt b/ext/standard/tests/array/sort/usort_variation5.phpt similarity index 100% rename from ext/standard/tests/array/usort_variation5.phpt rename to ext/standard/tests/array/sort/usort_variation5.phpt diff --git a/ext/standard/tests/array/usort_variation6.phpt b/ext/standard/tests/array/sort/usort_variation6.phpt similarity index 100% rename from ext/standard/tests/array/usort_variation6.phpt rename to ext/standard/tests/array/sort/usort_variation6.phpt diff --git a/ext/standard/tests/array/usort_variation7.phpt b/ext/standard/tests/array/sort/usort_variation7.phpt similarity index 100% rename from ext/standard/tests/array/usort_variation7.phpt rename to ext/standard/tests/array/sort/usort_variation7.phpt diff --git a/ext/standard/tests/array/usort_variation8.phpt b/ext/standard/tests/array/sort/usort_variation8.phpt similarity index 100% rename from ext/standard/tests/array/usort_variation8.phpt rename to ext/standard/tests/array/sort/usort_variation8.phpt diff --git a/ext/standard/tests/array/usort_variation9.phpt b/ext/standard/tests/array/sort/usort_variation9.phpt similarity index 100% rename from ext/standard/tests/array/usort_variation9.phpt rename to ext/standard/tests/array/sort/usort_variation9.phpt diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort_variation5.phpt deleted file mode 100644 index 6c49342df25d8..0000000000000 --- a/ext/standard/tests/array/sort_variation5.phpt +++ /dev/null @@ -1,227 +0,0 @@ ---TEST-- -Test sort() function : usage variations - sort strings ---FILE-- - SORT_REGULAR, "SORT_STRING" => SORT_STRING); - -$count = 1; -echo "\n-- Testing sort() by supplying various string arrays --\n"; - -// loop through to test sort() with different arrays -foreach ($various_arrays as $array) { - echo "\n-- Iteration $count --\n"; - - echo "- With Default sort flag -\n"; - $temp_array = $array; - var_dump(sort($temp_array) ); // expecting : bool(true) - var_dump($temp_array); - - // loop through $flags array and setting all possible flag values - foreach($flags as $key => $flag){ - echo "- Sort flag = $key -\n"; - $temp_array = $array; - var_dump(sort($temp_array, $flag) ); // expecting : bool(true) - var_dump($temp_array); - } - $count++; -} - -echo "Done\n"; -?> ---EXPECT-- -*** 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(1) "" - [8]=> - string(2) "\a" - [9]=> - string(3) "\cx" - [10]=> - string(4) "\ddd" - [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(1) "" - [8]=> - string(2) "\a" - [9]=> - string(3) "\cx" - [10]=> - string(4) "\ddd" - [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(1) "" - [8]=> - string(2) "\a" - [9]=> - string(3) "\cx" - [10]=> - string(4) "\ddd" - [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