summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/standard/tests/math/acos_error.phpt4
-rw-r--r--ext/standard/tests/math/acos_variation.phpt8
-rw-r--r--ext/standard/tests/math/acosh_error.phpt4
-rw-r--r--ext/standard/tests/math/acosh_variation.phpt8
-rw-r--r--ext/standard/tests/math/asin_error.phpt4
-rw-r--r--ext/standard/tests/math/asin_variation.phpt8
-rw-r--r--ext/standard/tests/math/asinh_error.phpt4
-rw-r--r--ext/standard/tests/math/asinh_variation.phpt8
-rw-r--r--ext/standard/tests/math/atan2_error.phpt7
-rw-r--r--ext/standard/tests/math/atan_error.phpt4
-rw-r--r--ext/standard/tests/math/atan_variation.phpt8
-rw-r--r--ext/standard/tests/math/atanh_error.phpt4
-rw-r--r--ext/standard/tests/math/atanh_variation.phpt8
-rw-r--r--ext/standard/tests/math/base_convert_error.phpt11
-rw-r--r--ext/standard/tests/math/bindec_error.phpt5
-rw-r--r--ext/standard/tests/math/cos_error.phpt4
-rw-r--r--ext/standard/tests/math/cos_variation.phpt8
-rw-r--r--ext/standard/tests/math/cosh_error.phpt4
-rw-r--r--ext/standard/tests/math/cosh_variation.phpt8
-rw-r--r--ext/standard/tests/math/decbin_error.phpt6
-rw-r--r--ext/standard/tests/math/dechex_error.phpt5
-rw-r--r--ext/standard/tests/math/decoct_error.phpt6
-rw-r--r--ext/standard/tests/math/deg2rad_error.phpt4
-rw-r--r--ext/standard/tests/math/deg2rad_variation.phpt8
-rw-r--r--ext/standard/tests/math/hexdec_error.phpt5
-rw-r--r--ext/standard/tests/math/hypot_error.phpt8
-rw-r--r--ext/standard/tests/math/log10_error.phpt4
-rw-r--r--ext/standard/tests/math/log10_variation.phpt8
-rw-r--r--ext/standard/tests/math/log_error.phpt7
-rw-r--r--ext/standard/tests/math/octdec_error.phpt5
-rw-r--r--ext/standard/tests/math/rad2deg_error.phpt4
-rw-r--r--ext/standard/tests/math/rad2deg_variation.phpt8
-rw-r--r--ext/standard/tests/math/sin_error.phpt4
-rw-r--r--ext/standard/tests/math/sin_variation.phpt8
-rw-r--r--ext/standard/tests/math/sinh_error.phpt4
-rw-r--r--ext/standard/tests/math/sinh_variation.phpt8
-rw-r--r--ext/standard/tests/math/sqrt_error.phpt4
-rw-r--r--ext/standard/tests/math/tan_error.phpt4
-rw-r--r--ext/standard/tests/math/tan_variation.phpt8
-rw-r--r--ext/standard/tests/math/tanh_error.phpt4
-rw-r--r--ext/standard/tests/math/tanh_variation.phpt8
41 files changed, 148 insertions, 101 deletions
diff --git a/ext/standard/tests/math/acos_error.phpt b/ext/standard/tests/math/acos_error.phpt
index dd42fbb589..6cfdb8f857 100644
--- a/ext/standard/tests/math/acos_error.phpt
+++ b/ext/standard/tests/math/acos_error.phpt
@@ -20,10 +20,10 @@ var_dump(acos());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for acos() in %s on line 11
+Warning: acos() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for acos() in %s on line 14
+Warning: acos() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/acos_variation.phpt b/ext/standard/tests/math/acos_variation.phpt
index 2503b8b8d0..006bcecfdb 100644
--- a/ext/standard/tests/math/acos_variation.phpt
+++ b/ext/standard/tests/math/acos_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(NAN)
float(NAN)
float(NAN)
@@ -44,8 +44,12 @@ float(NAN)
float(NAN)
float(NAN)
float(NAN)
-float(1.570796327)
+
+Warning: acos() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(NAN)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(NAN)
float(1.570796327)
float(0)
diff --git a/ext/standard/tests/math/acosh_error.phpt b/ext/standard/tests/math/acosh_error.phpt
index fd2f92118d..8402ce54db 100644
--- a/ext/standard/tests/math/acosh_error.phpt
+++ b/ext/standard/tests/math/acosh_error.phpt
@@ -25,10 +25,10 @@ var_dump(acosh());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for acosh() in %s on line 11
+Warning: acosh() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for acosh() in %s on line 14
+Warning: acosh() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/acosh_variation.phpt b/ext/standard/tests/math/acosh_variation.phpt
index b0e9f9bd80..9865dedd2b 100644
--- a/ext/standard/tests/math/acosh_variation.phpt
+++ b/ext/standard/tests/math/acosh_variation.phpt
@@ -39,7 +39,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(3.828168471)
float(NAN)
float(3.847562739)
@@ -49,8 +49,12 @@ float(3.828168471)
float(3.828168471)
float(3.847562739)
float(3.847562739)
-float(NAN)
+
+Warning: acosh() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(7.60090221)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(7.60090221)
float(NAN)
float(0)
diff --git a/ext/standard/tests/math/asin_error.phpt b/ext/standard/tests/math/asin_error.phpt
index ef2a322e09..a51a077b90 100644
--- a/ext/standard/tests/math/asin_error.phpt
+++ b/ext/standard/tests/math/asin_error.phpt
@@ -20,10 +20,10 @@ var_dump(asin());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for asin() in %s on line 11
+Warning: asin() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for asin() in %s on line 14
+Warning: asin() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/asin_variation.phpt b/ext/standard/tests/math/asin_variation.phpt
index 2902e969b1..83a33ee3c1 100644
--- a/ext/standard/tests/math/asin_variation.phpt
+++ b/ext/standard/tests/math/asin_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(NAN)
float(NAN)
float(NAN)
@@ -44,8 +44,12 @@ float(NAN)
float(NAN)
float(NAN)
float(NAN)
-float(0)
+
+Warning: asin() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(NAN)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(NAN)
float(0)
float(1.570796327)
diff --git a/ext/standard/tests/math/asinh_error.phpt b/ext/standard/tests/math/asinh_error.phpt
index 96f7ba0616..c6f7e4f586 100644
--- a/ext/standard/tests/math/asinh_error.phpt
+++ b/ext/standard/tests/math/asinh_error.phpt
@@ -25,10 +25,10 @@ var_dump(asinh());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for asinh() in %s on line 11
+Warning: asinh() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for asinh() in %s on line 14
+Warning: asinh() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/asinh_variation.phpt b/ext/standard/tests/math/asinh_variation.phpt
index 00ade0b8d5..eb71af1263 100644
--- a/ext/standard/tests/math/asinh_variation.phpt
+++ b/ext/standard/tests/math/asinh_variation.phpt
@@ -39,7 +39,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(3.829113652)
float(-3.829113652)
float(3.848471992)
@@ -49,8 +49,12 @@ float(3.829113652)
float(3.829113652)
float(3.848471992)
float(3.848471992)
-float(0)
+
+Warning: asinh() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(7.60090271)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(7.60090271)
float(0)
float(0.881373587)
diff --git a/ext/standard/tests/math/atan2_error.phpt b/ext/standard/tests/math/atan2_error.phpt
index b56843e3a1..ce9687cf5f 100644
--- a/ext/standard/tests/math/atan2_error.phpt
+++ b/ext/standard/tests/math/atan2_error.phpt
@@ -7,9 +7,8 @@ atan2(36);
atan2(36,25,0);
?>
--EXPECTF--
+Warning: atan2() expects exactly 2 parameters, 0 given in %s on line %d
-Warning: Wrong parameter count for atan2() in %s on line 2
+Warning: atan2() expects exactly 2 parameters, 1 given in %s on line %d
-Warning: Wrong parameter count for atan2() in %s on line 3
-
-Warning: Wrong parameter count for atan2() in %s on line 4
+Warning: atan2() expects exactly 2 parameters, 3 given in %s on line %d
diff --git a/ext/standard/tests/math/atan_error.phpt b/ext/standard/tests/math/atan_error.phpt
index c1cbc7c3c8..61b35b05d6 100644
--- a/ext/standard/tests/math/atan_error.phpt
+++ b/ext/standard/tests/math/atan_error.phpt
@@ -20,10 +20,10 @@ var_dump(atan());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for atan() in %s on line 11
+Warning: atan() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for atan() in %s on line 14
+Warning: atan() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/atan_variation.phpt b/ext/standard/tests/math/atan_variation.phpt
index a53099d103..c58514d803 100644
--- a/ext/standard/tests/math/atan_variation.phpt
+++ b/ext/standard/tests/math/atan_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(1.527345431)
float(-1.527345431)
float(1.528178225)
@@ -44,8 +44,12 @@ float(1.527345431)
float(1.527345431)
float(1.528178225)
float(1.528178225)
-float(0)
+
+Warning: atan() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(1.569796327)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(1.569796327)
float(0)
float(0.7853981634)
diff --git a/ext/standard/tests/math/atanh_error.phpt b/ext/standard/tests/math/atanh_error.phpt
index 3201eef20b..04df2fac82 100644
--- a/ext/standard/tests/math/atanh_error.phpt
+++ b/ext/standard/tests/math/atanh_error.phpt
@@ -25,10 +25,10 @@ var_dump(atanh());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for atanh() in %s on line 11
+Warning: atanh() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for atanh() in %s on line 14
+Warning: atanh() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/atanh_variation.phpt b/ext/standard/tests/math/atanh_variation.phpt
index 879b9a9f28..c2c2681514 100644
--- a/ext/standard/tests/math/atanh_variation.phpt
+++ b/ext/standard/tests/math/atanh_variation.phpt
@@ -39,7 +39,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(NAN)
float(NAN)
float(NAN)
@@ -49,8 +49,12 @@ float(NAN)
float(NAN)
float(NAN)
float(NAN)
-float(0)
+
+Warning: atanh() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(NAN)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(NAN)
float(0)
float(INF)
diff --git a/ext/standard/tests/math/base_convert_error.phpt b/ext/standard/tests/math/base_convert_error.phpt
index 7806c5648e..9d871dd7b5 100644
--- a/ext/standard/tests/math/base_convert_error.phpt
+++ b/ext/standard/tests/math/base_convert_error.phpt
@@ -9,13 +9,12 @@ base_convert(1234, 1, 10);
base_convert(1234, 10, 37);
?>
--EXPECTF--
+Warning: base_convert() expects exactly 3 parameters, 0 given in %s on line %d
-Warning: Wrong parameter count for base_convert() in %s on line 2
+Warning: base_convert() expects exactly 3 parameters, 1 given in %s on line %d
-Warning: Wrong parameter count for base_convert() in %s on line 3
+Warning: base_convert() expects exactly 3 parameters, 2 given in %s on line %d
-Warning: Wrong parameter count for base_convert() in %s on line 4
+Warning: base_convert(): Invalid `from base' (1) in %s on line %d
-Warning: base_convert(): Invalid `from base' (1) in %s on line 5
-
-Warning: base_convert(): Invalid `to base' (37) in %s on line 6
+Warning: base_convert(): Invalid `to base' (37) in %s on line %d
diff --git a/ext/standard/tests/math/bindec_error.phpt b/ext/standard/tests/math/bindec_error.phpt
index 36193b63e5..7f7fb9ef93 100644
--- a/ext/standard/tests/math/bindec_error.phpt
+++ b/ext/standard/tests/math/bindec_error.phpt
@@ -6,7 +6,6 @@ bindec();
bindec('01010101111',true);
?>
--EXPECTF--
+Warning: bindec() expects exactly 1 parameter, 0 given in %s on line %d
-Warning: Wrong parameter count for bindec() in %s on line 2
-
-Warning: Wrong parameter count for bindec() in %s on line 3
+Warning: bindec() expects exactly 1 parameter, 2 given in %s on line %d
diff --git a/ext/standard/tests/math/cos_error.phpt b/ext/standard/tests/math/cos_error.phpt
index 3198b9e822..40901991e0 100644
--- a/ext/standard/tests/math/cos_error.phpt
+++ b/ext/standard/tests/math/cos_error.phpt
@@ -20,10 +20,10 @@ var_dump(cos());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for cos() in %s on line 11
+Warning: cos() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for cos() in %s on line 14
+Warning: cos() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/cos_variation.phpt b/ext/standard/tests/math/cos_variation.phpt
index 0ae3c30da4..cb45f3efa4 100644
--- a/ext/standard/tests/math/cos_variation.phpt
+++ b/ext/standard/tests/math/cos_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(-0.5328330203)
float(-0.5328330203)
float(-0.1117112391)
@@ -44,8 +44,12 @@ float(-0.5328330203)
float(-0.5328330203)
float(-0.1117112391)
float(-0.1117112391)
-float(1)
+
+Warning: cos() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(0.5623790763)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(0.5623790763)
float(1)
float(0.5403023059)
diff --git a/ext/standard/tests/math/cosh_error.phpt b/ext/standard/tests/math/cosh_error.phpt
index f4552e61c0..afed24fe3b 100644
--- a/ext/standard/tests/math/cosh_error.phpt
+++ b/ext/standard/tests/math/cosh_error.phpt
@@ -20,10 +20,10 @@ var_dump(cosh());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for cosh() in %s on line 11
+Warning: cosh() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for cosh() in %s on line 14
+Warning: cosh() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/cosh_variation.phpt b/ext/standard/tests/math/cosh_variation.phpt
index 3bd8852a55..c702fa3d40 100644
--- a/ext/standard/tests/math/cosh_variation.phpt
+++ b/ext/standard/tests/math/cosh_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(4872401723)
float(4872401723)
float(7641446995)
@@ -44,8 +44,12 @@ float(4872401723)
float(4872401723)
float(7641446995)
float(7641446995)
-float(1)
+
+Warning: cosh() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(INF)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(INF)
float(1)
float(1.543080635)
diff --git a/ext/standard/tests/math/decbin_error.phpt b/ext/standard/tests/math/decbin_error.phpt
index a350cee7f0..cc6d1bda1b 100644
--- a/ext/standard/tests/math/decbin_error.phpt
+++ b/ext/standard/tests/math/decbin_error.phpt
@@ -6,8 +6,6 @@ decbin();
decbin(23,2,true);
?>
--EXPECTF--
+Warning: decbin() expects exactly 1 parameter, 0 given in %s on line %d
-Warning: Wrong parameter count for decbin() in %s on line 2
-
-Warning: Wrong parameter count for decbin() in %s on line 3
-
+Warning: decbin() expects exactly 1 parameter, 3 given in %s on line %d
diff --git a/ext/standard/tests/math/dechex_error.phpt b/ext/standard/tests/math/dechex_error.phpt
index f83afb346a..499a295701 100644
--- a/ext/standard/tests/math/dechex_error.phpt
+++ b/ext/standard/tests/math/dechex_error.phpt
@@ -7,7 +7,6 @@ dechex(23,2,true);
?>
--EXPECTF--
+Warning: dechex() expects exactly 1 parameter, 0 given in %s on line %d
-Warning: Wrong parameter count for dechex() in %s on line 2
-
-Warning: Wrong parameter count for dechex() in %s on line 3
+Warning: dechex() expects exactly 1 parameter, 3 given in %s on line %d
diff --git a/ext/standard/tests/math/decoct_error.phpt b/ext/standard/tests/math/decoct_error.phpt
index 48c30644fe..34feddd30a 100644
--- a/ext/standard/tests/math/decoct_error.phpt
+++ b/ext/standard/tests/math/decoct_error.phpt
@@ -6,8 +6,6 @@ decoct();
decoct(23,2,true);
?>
--EXPECTF--
+Warning: decoct() expects exactly 1 parameter, 0 given in %s on line %d
-Warning: Wrong parameter count for decoct() in %s on line 2
-
-Warning: Wrong parameter count for decoct() in %s on line 3
-
+Warning: decoct() expects exactly 1 parameter, 3 given in %s on line %d
diff --git a/ext/standard/tests/math/deg2rad_error.phpt b/ext/standard/tests/math/deg2rad_error.phpt
index 3cfdfc3044..517680a7c3 100644
--- a/ext/standard/tests/math/deg2rad_error.phpt
+++ b/ext/standard/tests/math/deg2rad_error.phpt
@@ -22,10 +22,10 @@ var_dump(deg2rad());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for deg2rad() in %s on line 11
+Warning: deg2rad() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for deg2rad() in %s on line 14
+Warning: deg2rad() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/deg2rad_variation.phpt b/ext/standard/tests/math/deg2rad_variation.phpt
index 4ce8900a9f..70bb75989e 100644
--- a/ext/standard/tests/math/deg2rad_variation.phpt
+++ b/ext/standard/tests/math/deg2rad_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(0.401425728)
float(-0.401425728)
float(0.4092797096)
@@ -44,8 +44,12 @@ float(0.401425728)
float(0.401425728)
float(0.4092797096)
float(0.4092797096)
-float(0)
+
+Warning: deg2rad() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(17.45329252)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(17.45329252)
float(0)
float(0.01745329252)
diff --git a/ext/standard/tests/math/hexdec_error.phpt b/ext/standard/tests/math/hexdec_error.phpt
index 06ce3fb20d..dae83b8564 100644
--- a/ext/standard/tests/math/hexdec_error.phpt
+++ b/ext/standard/tests/math/hexdec_error.phpt
@@ -6,7 +6,6 @@ hexdec();
hexdec('0x123abc',true);
?>
--EXPECTF--
+Warning: hexdec() expects exactly 1 parameter, 0 given in %s on line %d
-Warning: Wrong parameter count for hexdec() in %s on line 2
-
-Warning: Wrong parameter count for hexdec() in %s on line 3
+Warning: hexdec() expects exactly 1 parameter, 2 given in %s on line %d
diff --git a/ext/standard/tests/math/hypot_error.phpt b/ext/standard/tests/math/hypot_error.phpt
index 19a9ee0852..7f3081bc62 100644
--- a/ext/standard/tests/math/hypot_error.phpt
+++ b/ext/standard/tests/math/hypot_error.phpt
@@ -9,10 +9,8 @@ hypot(36);
hypot(36,25,0);
?>
--EXPECTF--
+Warning: hypot() expects exactly 2 parameters, 0 given in %s on line %d
+Warning: hypot() expects exactly 2 parameters, 1 given in %s on line %d
-Warning: Wrong parameter count for hypot() in %s on line 2
-
-Warning: Wrong parameter count for hypot() in %s on line 3
-
-Warning: Wrong parameter count for hypot() in %s on line 4
+Warning: hypot() expects exactly 2 parameters, 3 given in %s on line %d
diff --git a/ext/standard/tests/math/log10_error.phpt b/ext/standard/tests/math/log10_error.phpt
index 083494a84a..e3bc604fd2 100644
--- a/ext/standard/tests/math/log10_error.phpt
+++ b/ext/standard/tests/math/log10_error.phpt
@@ -22,10 +22,10 @@ var_dump(log10());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for log10() in %s on line 11
+Warning: log10() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for log10() in %s on line 14
+Warning: log10() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/log10_variation.phpt b/ext/standard/tests/math/log10_variation.phpt
index 746412a44e..2325705e8d 100644
--- a/ext/standard/tests/math/log10_variation.phpt
+++ b/ext/standard/tests/math/log10_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(1.361727836)
float(NAN)
float(1.370142847)
@@ -44,8 +44,12 @@ float(1.361727836)
float(1.361727836)
float(1.370142847)
float(1.370142847)
-float(-INF)
+
+Warning: log10() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(3)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(3)
float(-INF)
float(0)
diff --git a/ext/standard/tests/math/log_error.phpt b/ext/standard/tests/math/log_error.phpt
index 77084a4eca..48a23df3c0 100644
--- a/ext/standard/tests/math/log_error.phpt
+++ b/ext/standard/tests/math/log_error.phpt
@@ -9,9 +9,8 @@ log(36,4,true);
log(36, -4);
?>
--EXPECTF--
+Warning: log() expects at least 1 parameter, 0 given in %s on line %d
-Warning: Wrong parameter count for log() in %s on line 2
+Warning: log() expects at most 2 parameters, 3 given in %s on line %d
-Warning: Wrong parameter count for log() in %s on line 3
-
-Warning: log(): base must be greater than 0 in %s on line 4
+Warning: log(): base must be greater than 0 in %s on line %d
diff --git a/ext/standard/tests/math/octdec_error.phpt b/ext/standard/tests/math/octdec_error.phpt
index 8a3d1759a3..d380928808 100644
--- a/ext/standard/tests/math/octdec_error.phpt
+++ b/ext/standard/tests/math/octdec_error.phpt
@@ -6,7 +6,6 @@ octdec();
octdec('0123567',true);
?>
--EXPECTF--
+Warning: octdec() expects exactly 1 parameter, 0 given in %s on line %d
-Warning: Wrong parameter count for octdec() in %s on line 2
-
-Warning: Wrong parameter count for octdec() in %s on line 3
+Warning: octdec() expects exactly 1 parameter, 2 given in %s on line %d
diff --git a/ext/standard/tests/math/rad2deg_error.phpt b/ext/standard/tests/math/rad2deg_error.phpt
index 9892321068..32b2f4dcb6 100644
--- a/ext/standard/tests/math/rad2deg_error.phpt
+++ b/ext/standard/tests/math/rad2deg_error.phpt
@@ -22,10 +22,10 @@ var_dump(rad2deg());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for rad2deg() in %s on line 11
+Warning: rad2deg() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for rad2deg() in %s on line 14
+Warning: rad2deg() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/rad2deg_variation.phpt b/ext/standard/tests/math/rad2deg_variation.phpt
index 3fd6ec8cf3..173cbc4068 100644
--- a/ext/standard/tests/math/rad2deg_variation.phpt
+++ b/ext/standard/tests/math/rad2deg_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(1317.802929)
float(-1317.802929)
float(1343.58603)
@@ -44,8 +44,12 @@ float(1317.802929)
float(1317.802929)
float(1343.58603)
float(1343.58603)
-float(0)
+
+Warning: rad2deg() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(57295.77951)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(57295.77951)
float(0)
float(57.29577951)
diff --git a/ext/standard/tests/math/sin_error.phpt b/ext/standard/tests/math/sin_error.phpt
index 3fdb10af1b..41a4b2e7af 100644
--- a/ext/standard/tests/math/sin_error.phpt
+++ b/ext/standard/tests/math/sin_error.phpt
@@ -20,10 +20,10 @@ var_dump(sin());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for sin() in %s on line 11
+Warning: sin() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for sin() in %s on line 14
+Warning: sin() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/sin_variation.phpt b/ext/standard/tests/math/sin_variation.phpt
index 0e79317d41..ff95e998fc 100644
--- a/ext/standard/tests/math/sin_variation.phpt
+++ b/ext/standard/tests/math/sin_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(-0.8462204042)
float(0.8462204042)
float(-0.9937407102)
@@ -44,8 +44,12 @@ float(-0.8462204042)
float(-0.8462204042)
float(-0.9937407102)
float(-0.9937407102)
-float(0)
+
+Warning: sin() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(0.8268795405)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(0.8268795405)
float(0)
float(0.8414709848)
diff --git a/ext/standard/tests/math/sinh_error.phpt b/ext/standard/tests/math/sinh_error.phpt
index 8a3584dfc2..70decf252f 100644
--- a/ext/standard/tests/math/sinh_error.phpt
+++ b/ext/standard/tests/math/sinh_error.phpt
@@ -20,10 +20,10 @@ var_dump(sinh());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for sinh() in %s on line 11
+Warning: sinh() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for sinh() in %s on line 14
+Warning: sinh() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/sinh_variation.phpt b/ext/standard/tests/math/sinh_variation.phpt
index c0f238582e..3704e0f5e6 100644
--- a/ext/standard/tests/math/sinh_variation.phpt
+++ b/ext/standard/tests/math/sinh_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(4872401723)
float(-4872401723)
float(7641446995)
@@ -44,8 +44,12 @@ float(4872401723)
float(4872401723)
float(7641446995)
float(7641446995)
-float(0)
+
+Warning: sinh() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(INF)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(INF)
float(0)
float(1.175201194)
diff --git a/ext/standard/tests/math/sqrt_error.phpt b/ext/standard/tests/math/sqrt_error.phpt
index 318a18a35a..66d6d27355 100644
--- a/ext/standard/tests/math/sqrt_error.phpt
+++ b/ext/standard/tests/math/sqrt_error.phpt
@@ -22,10 +22,10 @@ var_dump(sqrt());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for sqrt() in %s on line 11
+Warning: sqrt() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for sqrt() in %s on line 14
+Warning: sqrt() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/tan_error.phpt b/ext/standard/tests/math/tan_error.phpt
index 3508f0e782..b3d4cf83c1 100644
--- a/ext/standard/tests/math/tan_error.phpt
+++ b/ext/standard/tests/math/tan_error.phpt
@@ -20,10 +20,10 @@ var_dump(tan());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for tan() in %s on line 11
+Warning: tan() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for tan() in %s on line 14
+Warning: tan() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/tan_variation.phpt b/ext/standard/tests/math/tan_variation.phpt
index 9628d76609..59aa5be574 100644
--- a/ext/standard/tests/math/tan_variation.phpt
+++ b/ext/standard/tests/math/tan_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(1.588153083)
float(-1.588153083)
float(8.895619796)
@@ -44,8 +44,12 @@ float(1.588153083)
float(1.588153083)
float(8.895619796)
float(8.895619796)
-float(0)
+
+Warning: tan() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(1.470324156)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(1.470324156)
float(0)
float(1.557407725)
diff --git a/ext/standard/tests/math/tanh_error.phpt b/ext/standard/tests/math/tanh_error.phpt
index f90de5eb5f..cc92cb4aca 100644
--- a/ext/standard/tests/math/tanh_error.phpt
+++ b/ext/standard/tests/math/tanh_error.phpt
@@ -20,10 +20,10 @@ var_dump(tanh());
--EXPECTF--
Too many arguments
-Warning: Wrong parameter count for tanh() in %s on line 11
+Warning: tanh() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
-Warning: Wrong parameter count for tanh() in %s on line 14
+Warning: tanh() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/standard/tests/math/tanh_variation.phpt b/ext/standard/tests/math/tanh_variation.phpt
index 5e4afad8fe..e5e65a399e 100644
--- a/ext/standard/tests/math/tanh_variation.phpt
+++ b/ext/standard/tests/math/tanh_variation.phpt
@@ -34,7 +34,7 @@ for ($i = 0; $i < count($values); $i++) {
}
?>
---EXPECT--
+--EXPECTF--
float(1)
float(-1)
float(1)
@@ -44,8 +44,12 @@ float(1)
float(1)
float(1)
float(1)
-float(0)
+
+Warning: tanh() expects parameter 1 to be double, string given in %s on line %d
+NULL
float(1)
+
+Notice: A non well formed numeric value encountered in %s on line %d
float(1)
float(0)
float(0.761594156)