From: George Peter Banyard Date: Fri, 26 Jun 2020 19:14:24 +0000 (+0200) Subject: Drop non-well formed numeric strings from math function tests X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=562ceae7bcc3daa3845c2d31e2c3ba6c0c752775;p=php Drop non-well formed numeric strings from math function tests --- diff --git a/ext/standard/tests/math/acos_variation.phpt b/ext/standard/tests/math/acos_variation.phpt index 88b035d0bf..163487d99f 100644 --- a/ext/standard/tests/math/acos_variation.phpt +++ b/ext/standard/tests/math/acos_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(NAN) float(NAN) float(NAN) @@ -43,9 +42,6 @@ float(NAN) float(NAN) float(NAN) float(NAN) - -Notice: A non well formed numeric value encountered in %s on line %d -float(NAN) float(1.5707963267948966) float(0) float(1.5707963267948966) diff --git a/ext/standard/tests/math/acosh_variation.phpt b/ext/standard/tests/math/acosh_variation.phpt index 345a5f19cd..904316a998 100644 --- a/ext/standard/tests/math/acosh_variation.phpt +++ b/ext/standard/tests/math/acosh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(3.8281684713331012) float(NAN) float(3.8475627390640357) @@ -43,9 +42,6 @@ float(3.8281684713331012) float(3.8475627390640357) float(3.8475627390640357) float(7.600902209541989) - -Notice: A non well formed numeric value encountered in %s on line %d -float(7.600902209541989) float(NAN) float(0) float(NAN) diff --git a/ext/standard/tests/math/asin_variation.phpt b/ext/standard/tests/math/asin_variation.phpt index f58e303064..323701c51a 100644 --- a/ext/standard/tests/math/asin_variation.phpt +++ b/ext/standard/tests/math/asin_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(NAN) float(NAN) float(NAN) @@ -43,9 +42,6 @@ float(NAN) float(NAN) float(NAN) float(NAN) - -Notice: A non well formed numeric value encountered in %s on line %d -float(NAN) float(0) float(1.5707963267948966) float(0) diff --git a/ext/standard/tests/math/asinh_variation.phpt b/ext/standard/tests/math/asinh_variation.phpt index a2762233e7..4958468064 100644 --- a/ext/standard/tests/math/asinh_variation.phpt +++ b/ext/standard/tests/math/asinh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(3.829113652) float(-3.829113652) float(3.848471992) @@ -43,9 +42,6 @@ float(3.829113652) float(3.848471992) float(3.848471992) float(7.60090271) - -Notice: A non well formed numeric value encountered in %s on line %d -float(7.60090271) float(0) float(0.881373587) float(0) diff --git a/ext/standard/tests/math/atan_variation.phpt b/ext/standard/tests/math/atan_variation.phpt index 35b0390b5a..88593c84de 100644 --- a/ext/standard/tests/math/atan_variation.phpt +++ b/ext/standard/tests/math/atan_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(1.5273454314033659) float(-1.5273454314033659) float(1.528178224770569) @@ -43,9 +42,6 @@ float(1.5273454314033659) float(1.528178224770569) float(1.528178224770569) float(1.5697963271282298) - -Notice: A non well formed numeric value encountered in %s on line %d -float(1.5697963271282298) float(0) float(0.7853981633974483) float(0) diff --git a/ext/standard/tests/math/atanh_variation.phpt b/ext/standard/tests/math/atanh_variation.phpt index a03201825e..fa71e206c8 100644 --- a/ext/standard/tests/math/atanh_variation.phpt +++ b/ext/standard/tests/math/atanh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(NAN) float(NAN) float(NAN) @@ -43,9 +42,6 @@ float(NAN) float(NAN) float(NAN) float(NAN) - -Notice: A non well formed numeric value encountered in %s on line %d -float(NAN) float(0) float(INF) float(0) diff --git a/ext/standard/tests/math/cos_variation.phpt b/ext/standard/tests/math/cos_variation.phpt index abe2f8c232..23af5e873b 100644 --- a/ext/standard/tests/math/cos_variation.phpt +++ b/ext/standard/tests/math/cos_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(-0.5328330203) float(-0.5328330203) float(-0.1117112391) @@ -43,9 +42,6 @@ float(-0.5328330203) float(-0.1117112391) float(-0.1117112391) float(0.5623790763) - -Notice: A non well formed numeric value encountered in %s on line %d -float(0.5623790763) float(1) float(0.5403023059) float(1) diff --git a/ext/standard/tests/math/cosh_variation.phpt b/ext/standard/tests/math/cosh_variation.phpt index 6b0bf0a0c8..1a0a6b69e7 100644 --- a/ext/standard/tests/math/cosh_variation.phpt +++ b/ext/standard/tests/math/cosh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(4872401723) float(4872401723) float(7641446995) @@ -43,9 +42,6 @@ float(4872401723) float(7641446995) float(7641446995) float(INF) - -Notice: A non well formed numeric value encountered in %s on line %d -float(INF) float(1) float(1.543080635) float(1) diff --git a/ext/standard/tests/math/deg2rad_variation.phpt b/ext/standard/tests/math/deg2rad_variation.phpt index a9b9516efc..0d5d44626f 100644 --- a/ext/standard/tests/math/deg2rad_variation.phpt +++ b/ext/standard/tests/math/deg2rad_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -43,9 +42,6 @@ float(0.40142572795869574) float(0.40927970959267024) float(0.40927970959267024) float(17.453292519943293) - -Notice: A non well formed numeric value encountered in %s on line %d -float(17.453292519943293) float(0) float(0.017453292519943295) float(0) diff --git a/ext/standard/tests/math/hypot_basic.phpt b/ext/standard/tests/math/hypot_basic.phpt index 78bed90921..29c8892846 100644 --- a/ext/standard/tests/math/hypot_basic.phpt +++ b/ext/standard/tests/math/hypot_basic.phpt @@ -16,7 +16,6 @@ $valuesy = array(23, "23", "23.45", "2.345e1", - "23abc", null, true, false); @@ -30,7 +29,6 @@ $valuesx = array(33, "33", "43.45", "1.345e1", - "33abc", null, true, false); @@ -43,7 +41,7 @@ for ($i = 0; $i < count($valuesy); $i++) { } } ?> ---EXPECTF-- +--EXPECT-- *** Testing hypot() : basic functionality *** Y:23 X:33 float(40.22437072223753) @@ -64,10 +62,6 @@ Y:23 X:43.45 float(49.162002603636886) Y:23 X:1.345e1 float(26.64399557123518) -Y:23 X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(40.22437072223753) - Y:23 X: float(23) Y:23 X:1 float(23.021728866442675) @@ -92,10 +86,6 @@ Y:-23 X:43.45 float(49.162002603636886) Y:-23 X:1.345e1 float(26.64399557123518) -Y:-23 X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(40.22437072223753) - Y:-23 X: float(23) Y:-23 X:1 float(23.021728866442675) @@ -120,10 +110,6 @@ Y:23.45 X:43.45 float(49.37413290377868) Y:23.45 X:1.345e1 float(27.033405260898967) -Y:23.45 X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(40.48336077946099) - Y:23.45 X: float(23.45) Y:23.45 X:1 float(23.47131227690518) @@ -148,10 +134,6 @@ Y:-23.45 X:43.45 float(49.37413290377868) Y:-23.45 X:1.345e1 float(27.033405260898967) -Y:-23.45 X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(40.48336077946099) - Y:-23.45 X: float(23.45) Y:-23.45 X:1 float(23.47131227690518) @@ -176,10 +158,6 @@ Y:23 X:43.45 float(49.162002603636886) Y:23 X:1.345e1 float(26.64399557123518) -Y:23 X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(40.22437072223753) - Y:23 X: float(23) Y:23 X:1 float(23.021728866442675) @@ -204,10 +182,6 @@ Y:23 X:43.45 float(49.162002603636886) Y:23 X:1.345e1 float(26.64399557123518) -Y:23 X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(40.22437072223753) - Y:23 X: float(23) Y:23 X:1 float(23.021728866442675) @@ -232,10 +206,6 @@ Y:23 X:43.45 float(49.162002603636886) Y:23 X:1.345e1 float(26.64399557123518) -Y:23 X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(40.22437072223753) - Y:23 X: float(23) Y:23 X:1 float(23.021728866442675) @@ -260,10 +230,6 @@ Y:23.45 X:43.45 float(49.37413290377868) Y:23.45 X:1.345e1 float(27.033405260898967) -Y:23.45 X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(40.48336077946099) - Y:23.45 X: float(23.45) Y:23.45 X:1 float(23.47131227690518) @@ -288,70 +254,12 @@ Y:2.345e1 X:43.45 float(49.37413290377868) Y:2.345e1 X:1.345e1 float(27.033405260898967) -Y:2.345e1 X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(40.48336077946099) - Y:2.345e1 X: float(23.45) Y:2.345e1 X:1 float(23.47131227690518) Y:2.345e1 X: float(23.45) -Y:23abc X:33 -Notice: A non well formed numeric value encountered in %s on line %d -float(40.22437072223753) - -Y:23abc X:-33 -Notice: A non well formed numeric value encountered in %s on line %d -float(40.22437072223753) - -Y:23abc X:33.45 -Notice: A non well formed numeric value encountered in %s on line %d -float(40.594365372548936) - -Y:23abc X:-33.45 -Notice: A non well formed numeric value encountered in %s on line %d -float(40.594365372548936) - -Y:23abc X:39 -Notice: A non well formed numeric value encountered in %s on line %d -float(45.27692569068709) - -Y:23abc X:31 -Notice: A non well formed numeric value encountered in %s on line %d -float(38.600518131237564) - -Y:23abc X:33 -Notice: A non well formed numeric value encountered in %s on line %d -float(40.22437072223753) - -Y:23abc X:43.45 -Notice: A non well formed numeric value encountered in %s on line %d -float(49.162002603636886) - -Y:23abc X:1.345e1 -Notice: A non well formed numeric value encountered in %s on line %d -float(26.64399557123518) - -Y:23abc X:33abc -Notice: A non well formed numeric value encountered in %s on line %d - -Notice: A non well formed numeric value encountered in %s on line %d -float(40.22437072223753) - -Y:23abc X: -Notice: A non well formed numeric value encountered in %s on line %d -float(23) - -Y:23abc X:1 -Notice: A non well formed numeric value encountered in %s on line %d -float(23.021728866442675) - -Y:23abc X: -Notice: A non well formed numeric value encountered in %s on line %d -float(23) - Y: X:33 float(33) Y: X:-33 float(33) @@ -370,10 +278,6 @@ Y: X:43.45 float(43.45) Y: X:1.345e1 float(13.45) -Y: X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(33) - Y: X: float(0) Y: X:1 float(1) @@ -398,10 +302,6 @@ Y:1 X:43.45 float(43.461505956420794) Y:1 X:1.345e1 float(13.48712348872064) -Y:1 X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(33.015148038438355) - Y:1 X: float(1) Y:1 X:1 float(1.4142135623730951) @@ -426,10 +326,6 @@ Y: X:43.45 float(43.45) Y: X:1.345e1 float(13.45) -Y: X:33abc -Notice: A non well formed numeric value encountered in %s on line %d -float(33) - Y: X: float(0) Y: X:1 float(1) diff --git a/ext/standard/tests/math/log10_variation.phpt b/ext/standard/tests/math/log10_variation.phpt index 0795241471..6e73cd7bea 100644 --- a/ext/standard/tests/math/log10_variation.phpt +++ b/ext/standard/tests/math/log10_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(1.3617278360175928) float(NAN) float(1.3701428470511021) @@ -43,9 +42,6 @@ float(1.3617278360175928) float(1.3701428470511021) float(1.3701428470511021) float(3) - -Notice: A non well formed numeric value encountered in %s on line %d -float(3) float(-INF) float(0) float(-INF) diff --git a/ext/standard/tests/math/rad2deg_variation.phpt b/ext/standard/tests/math/rad2deg_variation.phpt index 94a9339662..122d5b2c13 100644 --- a/ext/standard/tests/math/rad2deg_variation.phpt +++ b/ext/standard/tests/math/rad2deg_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(1317.8029288008934) float(-1317.8029288008934) float(1343.5860295817804) @@ -43,9 +42,6 @@ float(1317.8029288008934) float(1343.5860295817804) float(1343.5860295817804) float(57295.77951308232) - -Notice: A non well formed numeric value encountered in %s on line %d -float(57295.77951308232) float(0) float(57.29577951308232) float(0) diff --git a/ext/standard/tests/math/sin_variation.phpt b/ext/standard/tests/math/sin_variation.phpt index 0695c5c05b..26801750f5 100644 --- a/ext/standard/tests/math/sin_variation.phpt +++ b/ext/standard/tests/math/sin_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -43,9 +42,6 @@ float(-0.8462204042) float(-0.9937407102) float(-0.9937407102) float(0.8268795405) - -Notice: A non well formed numeric value encountered in %s on line %d -float(0.8268795405) float(0) float(0.8414709848) float(0) diff --git a/ext/standard/tests/math/sinh_variation.phpt b/ext/standard/tests/math/sinh_variation.phpt index 4d5dbd1c41..9f5c393c4a 100644 --- a/ext/standard/tests/math/sinh_variation.phpt +++ b/ext/standard/tests/math/sinh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -43,9 +42,6 @@ float(4872401723) float(7641446995) float(7641446995) float(INF) - -Notice: A non well formed numeric value encountered in %s on line %d -float(INF) float(0) float(1.175201194) float(0) diff --git a/ext/standard/tests/math/sqrt_variation.phpt b/ext/standard/tests/math/sqrt_variation.phpt index 0d7941aa3b..6486b00724 100644 --- a/ext/standard/tests/math/sqrt_variation.phpt +++ b/ext/standard/tests/math/sqrt_variation.phpt @@ -22,7 +22,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -45,9 +44,6 @@ float(4.795831523312719) float(4.8425200051213) float(4.8425200051213) float(31.622776601683793) - -Notice: A non well formed numeric value encountered in %s on line %d -float(31.622776601683793) float(0) float(1) float(0) diff --git a/ext/standard/tests/math/tan_variation.phpt b/ext/standard/tests/math/tan_variation.phpt index 58b9cb6b15..bd2fc1e80c 100644 --- a/ext/standard/tests/math/tan_variation.phpt +++ b/ext/standard/tests/math/tan_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -43,9 +42,6 @@ float(1.588153083) float(8.895619796) float(8.895619796) float(1.470324156) - -Notice: A non well formed numeric value encountered in %s on line %d -float(1.470324156) float(0) float(1.557407725) float(0) diff --git a/ext/standard/tests/math/tanh_variation.phpt b/ext/standard/tests/math/tanh_variation.phpt index 035f4b15c7..aab33fea60 100644 --- a/ext/standard/tests/math/tanh_variation.phpt +++ b/ext/standard/tests/math/tanh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - "1000ABC", null, true, false); @@ -32,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- float(1) float(-1) float(1) @@ -43,9 +42,6 @@ float(1) float(1) float(1) float(1) - -Notice: A non well formed numeric value encountered in %s on line %d -float(1) float(0) float(0.7615941559557649) float(0)