diff options
Diffstat (limited to 'ext/standard/tests/array')
25 files changed, 51 insertions, 99 deletions
diff --git a/ext/standard/tests/array/array_chunk2.phpt b/ext/standard/tests/array/array_chunk2.phpt index c02194aa5b..a49ccc4eae 100644 --- a/ext/standard/tests/array/array_chunk2.phpt +++ b/ext/standard/tests/array/array_chunk2.phpt @@ -6,13 +6,13 @@ $input_array = array('a', 'b', 'c', 'd', 'e'); try { var_dump(array_chunk($input_array, 0)); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } try { var_dump(array_chunk($input_array, 0, true)); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/standard/tests/array/array_chunk_variation5.phpt b/ext/standard/tests/array/array_chunk_variation5.phpt index 21f1a3dce2..fca31d51c8 100644 --- a/ext/standard/tests/array/array_chunk_variation5.phpt +++ b/ext/standard/tests/array/array_chunk_variation5.phpt @@ -29,23 +29,22 @@ foreach ($sizes as $size){ echo "\n-- Testing array_chunk() when size = $size --\n"; try { var_dump( array_chunk($input_array, $size) ); - } catch (\Error $e) { + } catch (\ValueError $e) { echo $e->getMessage() . "\n"; } try { var_dump( array_chunk($input_array, $size, true) ); - } catch (\Error $e) { + } catch (\ValueError $e) { echo $e->getMessage() . "\n"; } try { var_dump( array_chunk($input_array, $size, false) ); - } catch (\Error $e) { + } catch (\ValueError $e) { echo $e->getMessage() . "\n"; } } ?> -DONE --EXPECT-- *** Testing array_chunk() : usage variations *** @@ -146,5 +145,3 @@ array(3) { int(3) } } - -DONE diff --git a/ext/standard/tests/array/array_combine_error2.phpt b/ext/standard/tests/array/array_combine_error2.phpt index 463dc6dfe8..4eae53c120 100644 --- a/ext/standard/tests/array/array_combine_error2.phpt +++ b/ext/standard/tests/array/array_combine_error2.phpt @@ -18,7 +18,7 @@ var_dump( array_combine(array(), array()) ); echo "\n-- Testing array_combine() function with empty array for \$keys argument --\n"; try { var_dump( array_combine(array(), array(1, 2)) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(); } @@ -26,7 +26,7 @@ try { echo "\n-- Testing array_combine() function with empty array for \$values argument --\n"; try { var_dump( array_combine(array(1, 2), array()) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(); } @@ -34,13 +34,11 @@ try { echo "\n-- Testing array_combine() function by passing array with unequal number of elements --\n"; try { var_dump( array_combine(array(1, 2), array(1, 2, 3)) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(); } ?> - -DONE --EXPECT-- *** Testing array_combine() : error conditions specific to array_combine() *** @@ -54,4 +52,3 @@ Both parameters should have an equal number of elements Both parameters should have an equal number of elements -- Testing array_combine() function by passing array with unequal number of elements -- Both parameters should have an equal number of elements -DONE diff --git a/ext/standard/tests/array/array_fill_error.phpt b/ext/standard/tests/array/array_fill_error.phpt index 63af88bf28..3a9423e2b8 100644 --- a/ext/standard/tests/array/array_fill_error.phpt +++ b/ext/standard/tests/array/array_fill_error.phpt @@ -17,15 +17,11 @@ $val = 1; try { var_dump( array_fill($start_key,$num,$val) ); -} catch (Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } ?> - -DONE ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : error conditions *** Number of elements can't be negative - -DONE diff --git a/ext/standard/tests/array/array_multisort_error.phpt b/ext/standard/tests/array/array_multisort_error.phpt index ddcf74eaae..63d59e58f0 100644 --- a/ext/standard/tests/array/array_multisort_error.phpt +++ b/ext/standard/tests/array/array_multisort_error.phpt @@ -14,7 +14,7 @@ echo "\n-- Testing array_multisort() function with repeated flags --\n"; $ar1 = array(1); try { var_dump( array_multisort($ar1, SORT_ASC, SORT_ASC) ); -} catch (Error $e) { +} catch (\TypeError $e) { echo $e->getMessage() . "\n"; } @@ -22,7 +22,7 @@ echo "\n-- Testing array_multisort() function with repeated flags --\n"; $ar1 = array(1); try { var_dump( array_multisort($ar1, SORT_STRING, SORT_NUMERIC) ); -} catch (Error $e) { +} catch (\TypeError $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt index 4c09facb54..a912680421 100644 --- a/ext/standard/tests/array/array_multisort_variation1.phpt +++ b/ext/standard/tests/array/array_multisort_variation1.phpt @@ -99,7 +99,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; try { var_dump( array_multisort($value)); - } catch (Error $e) { + } catch (\ValueError | \TypeError $e) { echo $e->getMessage() . "\n"; } }; diff --git a/ext/standard/tests/array/array_multisort_variation2.phpt b/ext/standard/tests/array/array_multisort_variation2.phpt index 160172fa3b..f28988ecfa 100644 --- a/ext/standard/tests/array/array_multisort_variation2.phpt +++ b/ext/standard/tests/array/array_multisort_variation2.phpt @@ -107,7 +107,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; try { var_dump( array_multisort($ar1, $value) ); - } catch (Error $e) { + } catch (\ValueError | \TypeError $e) { echo $e->getMessage() . "\n"; } }; diff --git a/ext/standard/tests/array/array_multisort_variation3.phpt b/ext/standard/tests/array/array_multisort_variation3.phpt index cedc6814cc..07669d7fd2 100644 --- a/ext/standard/tests/array/array_multisort_variation3.phpt +++ b/ext/standard/tests/array/array_multisort_variation3.phpt @@ -99,7 +99,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; try { var_dump( array_multisort($ar1, SORT_REGULAR, $value) ); - } catch (Error $e) { + } catch (\ValueError | \TypeError $e) { echo $e->getMessage() . "\n"; } }; diff --git a/ext/standard/tests/array/array_pad.phpt b/ext/standard/tests/array/array_pad.phpt index ce6e1b2b04..e4f8c5ce7f 100644 --- a/ext/standard/tests/array/array_pad.phpt +++ b/ext/standard/tests/array/array_pad.phpt @@ -15,13 +15,11 @@ var_dump(array_pad(array("", -1, 2.0), -4, array())); try { var_dump(array_pad(array("", -1, 2.0), 2000000, 0)); -} catch (Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } ?> - -DONE --EXPECT-- array(1) { [0]=> @@ -87,5 +85,3 @@ array(4) { float(2) } You may only pad up to 1048576 elements at a time - -DONE diff --git a/ext/standard/tests/array/array_push_error2.phpt b/ext/standard/tests/array/array_push_error2.phpt index 2d19dbc246..ce267f2cd0 100644 --- a/ext/standard/tests/array/array_push_error2.phpt +++ b/ext/standard/tests/array/array_push_error2.phpt @@ -22,7 +22,6 @@ try { } var_dump($array); -echo "Done"; ?> --EXPECTF-- *** Testing array_push() : error conditions *** @@ -31,4 +30,3 @@ array(1) { [%d]=> string(3) "max" } -Done diff --git a/ext/standard/tests/array/array_rand.phpt b/ext/standard/tests/array/array_rand.phpt index 5895727548..4aebe8c23d 100644 --- a/ext/standard/tests/array/array_rand.phpt +++ b/ext/standard/tests/array/array_rand.phpt @@ -5,38 +5,37 @@ array_rand() tests try { var_dump(array_rand(array())); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } try { var_dump(array_rand(array(), 0)); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } try { var_dump(array_rand(array(1,2,3), 0)); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } try { var_dump(array_rand(array(1,2,3), -1)); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } try { var_dump(array_rand(array(1,2,3), 10)); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } var_dump(array_rand(array(1,2,3), 3)); var_dump(array_rand(array(1,2,3), 2)); -echo "Done\n"; ?> --EXPECTF-- Array is empty @@ -58,4 +57,3 @@ array(2) { [1]=> int(%d) } -Done diff --git a/ext/standard/tests/array/array_rand_variation5.phpt b/ext/standard/tests/array/array_rand_variation5.phpt index 03e20d6e07..04e71bdc49 100644 --- a/ext/standard/tests/array/array_rand_variation5.phpt +++ b/ext/standard/tests/array/array_rand_variation5.phpt @@ -34,34 +34,32 @@ var_dump( array_rand($input, 1) ); // with valid $num_req value echo"\n-- With num_req = 0 --\n"; try { var_dump( array_rand($input, 0) ); // with $num_req=0 -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } echo"\n-- With num_req = -1 --\n"; try { var_dump( array_rand($input, -1) ); // with $num_req=-1 -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } echo"\n-- With num_req = -2 --\n"; try { var_dump( array_rand($input, -2) ); // with $num_req=-2 -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } echo"\n-- With num_req more than number of members in 'input' array --\n"; try { var_dump( array_rand($input, 13) ); // with $num_req=13 -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } ?> - -DONE --EXPECTF-- *** Testing array_rand() : with invalid values for 'req_num' *** @@ -82,5 +80,3 @@ Second argument has to be between 1 and the number of elements in the array -- With num_req more than number of members in 'input' array -- Second argument has to be between 1 and the number of elements in the array - -DONE diff --git a/ext/standard/tests/array/bug43495.phpt b/ext/standard/tests/array/bug43495.phpt index cb011d3d44..37c4f6b604 100644 --- a/ext/standard/tests/array/bug43495.phpt +++ b/ext/standard/tests/array/bug43495.phpt @@ -20,9 +20,5 @@ $a["key1"]["key2"]["key3"] = null; $b["key1"]["key2"]["key3"] = null; ?> - -DONE --EXPECT-- Recursion detected - -DONE diff --git a/ext/standard/tests/array/bug71220.phpt b/ext/standard/tests/array/bug71220.phpt index ed46b25e18..6a933f5f52 100644 --- a/ext/standard/tests/array/bug71220.phpt +++ b/ext/standard/tests/array/bug71220.phpt @@ -10,7 +10,5 @@ try { } ?> -OKAY --EXPECT-- Cannot call compact() dynamically -OKAY diff --git a/ext/standard/tests/array/bug77395.phpt b/ext/standard/tests/array/bug77395.phpt index b90e9dd976..bca1e3136c 100644 --- a/ext/standard/tests/array/bug77395.phpt +++ b/ext/standard/tests/array/bug77395.phpt @@ -13,7 +13,7 @@ $data = [['aa'=> 'bb',], ['aa'=> 'bb',],]; try { array_multisort(array_column($data, 'bb'),SORT_DESC, $data); // PHP Warning error -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } ?> diff --git a/ext/standard/tests/array/compact_variation1.phpt b/ext/standard/tests/array/compact_variation1.phpt index 9201bc5aa1..ede36efd7e 100644 --- a/ext/standard/tests/array/compact_variation1.phpt +++ b/ext/standard/tests/array/compact_variation1.phpt @@ -23,24 +23,19 @@ $arr3 = array(&$string); try { var_dump(compact($arr1)); -} catch (\Error $e) { +} catch (Error $e) { echo $e->getMessage() . "\n"; } try { var_dump(compact($arr2)); -} catch (\Error $e) { +} catch (Error $e) { echo $e->getMessage() . "\n"; } -try { - var_dump(compact($arr3)); -} catch (\Error $e) { - echo $e->getMessage() . "\n"; -} -?> +var_dump(compact($arr3)); -DONE +?> --EXPECT-- *** Testing compact() : usage variations - arrays containing references *** Recursion detected @@ -49,5 +44,3 @@ array(1) { ["c"]=> int(3) } - -DONE diff --git a/ext/standard/tests/array/extract_error.phpt b/ext/standard/tests/array/extract_error.phpt index 2103a1b9a4..db6569e94c 100644 --- a/ext/standard/tests/array/extract_error.phpt +++ b/ext/standard/tests/array/extract_error.phpt @@ -11,24 +11,23 @@ $arr = array(1); try { var_dump( extract($arr, -1 . "wddr") ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } try { var_dump( extract($arr, 7 , "wddr") ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } /* Two Arguments, second as prefix but without prefix string as third argument */ try { var_dump( extract($arr,EXTR_PREFIX_IF_EXISTS) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } -echo "Done\n"; ?> --EXPECTF-- *** Testing Error Conditions *** @@ -37,4 +36,3 @@ Notice: A non well formed numeric value encountered in %s on line %d Invalid extract type Invalid extract type Specified extract type requires the prefix parameter -Done diff --git a/ext/standard/tests/array/extract_error_variation1.phpt b/ext/standard/tests/array/extract_error_variation1.phpt index ec3078a0b9..a0caafb213 100644 --- a/ext/standard/tests/array/extract_error_variation1.phpt +++ b/ext/standard/tests/array/extract_error_variation1.phpt @@ -6,7 +6,7 @@ $a = ["1" => "one", "2" => "two", "3" => "three", "4" => "four", "5" => "five"]; try { extract($a, EXTR_PREFIX_ALL, '85bogus'); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(); } ?> diff --git a/ext/standard/tests/array/max.phpt b/ext/standard/tests/array/max.phpt index 9e6448cd52..dacd470ada 100644 --- a/ext/standard/tests/array/max.phpt +++ b/ext/standard/tests/array/max.phpt @@ -13,7 +13,7 @@ try { try { var_dump(max(array())); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } @@ -31,7 +31,6 @@ var_dump(max(true, false, true)); var_dump(max(1, true, false, true)); var_dump(max(0, true, false, true)); -echo "Done\n"; ?> --EXPECT-- When only one parameter is given, it must be an array @@ -44,4 +43,3 @@ bool(true) bool(true) int(1) bool(true) -Done diff --git a/ext/standard/tests/array/min.phpt b/ext/standard/tests/array/min.phpt index 85defa6e85..144cd815a8 100644 --- a/ext/standard/tests/array/min.phpt +++ b/ext/standard/tests/array/min.phpt @@ -13,7 +13,7 @@ try { try { var_dump(min(array())); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } @@ -31,7 +31,6 @@ var_dump(min(true, false, true)); var_dump(min(1, true, false, true)); var_dump(min(0, true, false, true)); -echo "Done\n"; ?> --EXPECT-- When only one parameter is given, it must be an array @@ -44,4 +43,3 @@ bool(false) bool(false) bool(false) int(0) -Done diff --git a/ext/standard/tests/array/range_bug70239_0.phpt b/ext/standard/tests/array/range_bug70239_0.phpt index 048d40737b..c5e56462c5 100644 --- a/ext/standard/tests/array/range_bug70239_0.phpt +++ b/ext/standard/tests/array/range_bug70239_0.phpt @@ -4,7 +4,7 @@ Bug #70239 Creating a huge array doesn't result in exhausted, but segfault, var <?php try { range(0, pow(2.0, 100000000)); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } ?> diff --git a/ext/standard/tests/array/range_bug70239_1.phpt b/ext/standard/tests/array/range_bug70239_1.phpt index 9ab62870b1..cfaa1a51fc 100644 --- a/ext/standard/tests/array/range_bug70239_1.phpt +++ b/ext/standard/tests/array/range_bug70239_1.phpt @@ -4,7 +4,7 @@ Bug #70239 Creating a huge array doesn't result in exhausted, but segfault, var <?php try { range(pow(2.0, 100000000), pow(2.0, 100000000) + 1); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } ?> diff --git a/ext/standard/tests/array/range_bug70239_2.phpt b/ext/standard/tests/array/range_bug70239_2.phpt index 192644cd0f..1ccf8d0373 100644 --- a/ext/standard/tests/array/range_bug70239_2.phpt +++ b/ext/standard/tests/array/range_bug70239_2.phpt @@ -4,7 +4,7 @@ Bug #70239 Creating a huge array doesn't result in exhausted, but segfault, var <?php try { var_dump(range(0, PHP_INT_MAX)); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } ?> diff --git a/ext/standard/tests/array/range_bug70239_3.phpt b/ext/standard/tests/array/range_bug70239_3.phpt index f1f7c94b89..5d50db4f4a 100644 --- a/ext/standard/tests/array/range_bug70239_3.phpt +++ b/ext/standard/tests/array/range_bug70239_3.phpt @@ -4,7 +4,7 @@ Bug #70239 Creating a huge array doesn't result in exhausted, but segfault, var <?php try { var_dump(range(PHP_INT_MIN, 0)); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage() . "\n"; } ?> diff --git a/ext/standard/tests/array/range_errors.phpt b/ext/standard/tests/array/range_errors.phpt index 971eade4be..d2dbfd5d67 100644 --- a/ext/standard/tests/array/range_errors.phpt +++ b/ext/standard/tests/array/range_errors.phpt @@ -10,67 +10,65 @@ echo "\n*** Testing error conditions ***\n"; echo "\n-- Testing ( (low < high) && (step = 0) ) --\n"; try { var_dump( range(1, 2, 0) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(), "\n"; } try { var_dump( range("a", "b", 0) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(), "\n"; } echo "\n\n-- Testing ( (low > high) && (step = 0) ) --\n"; try { var_dump( range(2, 1, 0) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(), "\n"; } try { var_dump( range("b", "a", 0) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(), "\n"; } echo "\n\n-- Testing ( (low < high) && (high-low < step) ) --\n"; try { var_dump( range(1.0, 7.0, 6.5) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(), "\n"; } echo "\n\n-- Testing ( (low > high) && (low-high < step) ) --\n"; try { var_dump( range(7.0, 1.0, 6.5) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(), "\n"; } echo "\n-- Testing other conditions --\n"; try { var_dump( range(-1, -2, 2) ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(), "\n"; } try { var_dump( range("a", "j", "z") ); -} catch (TypeError $e) { - echo $e->getMessage(), "\n"; -} catch (\Error $e) { +} catch (\TypeError $e) { echo $e->getMessage(), "\n"; } try { var_dump( range(0, 1, "140962482048819216326.24") ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(), "\n"; } try { var_dump( range(0, 1, "140962482048819216326.24.") ); -} catch (\Error $e) { +} catch (\ValueError $e) { echo $e->getMessage(), "\n"; } @@ -80,14 +78,10 @@ $step_arr = array( "string", NULL, FALSE, "", "\0" ); foreach( $step_arr as $step ) { try { var_dump( range( 1, 5, $step ) ); - } catch (\TypeError $e) { - echo $e->getMessage(), "\n"; - } catch (\Error $e) { + } catch (\TypeError | \ValueError $e) { echo $e->getMessage(), "\n"; } } - -echo "Done\n"; ?> --EXPECTF-- *** Testing error conditions *** @@ -123,4 +117,3 @@ step exceeds the specified range step exceeds the specified range range() expects parameter 3 to be int or float, string given range() expects parameter 3 to be int or float, string given -Done |