Fix test (new parameter parsing)

diff --git a/ext/standard/tests/math/acos_error.phpt b/ext/standard/tests/math/acos_error.phpt
index dd42fbb58989dfe93cca19307ae655d2636bbd37..6cfdb8f857e64ab1dcff776ce6e98d492ca781cf 100644 (file)
--- 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 2503b8b8d05fb95bb2adb8c5d1f62c6905da1641..006bcecfdbf2613051653f69b22806c9b70f1324 100644 (file)
--- 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 fd2f92118da342c46ac27a3dd420d1c9417f2035..8402ce54db2962d402718ca8345bde07da0481c3 100644 (file)
--- 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 b0e9f9bd80668b459cd1f5a03155c62886f90201..9865dedd2b84a97e83fa332e7d9e1429622f5e4b 100644 (file)
--- 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 ef2a322e09d735e295383503abb3e4b0be6be7af..a51a077b90f663dc03d22aafefc64948870c0674 100644 (file)
--- 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 2902e969b1357a2f21ca21d144524e450fd8a30a..83a33ee3c158af5f624a041fe9dcd165964cb6e2 100644 (file)
--- 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 96f7ba061619c30a14c0a0711974a78fe2edcf78..c6f7e4f586bcaa937be2d28a00b983bd6103b445 100644 (file)
--- 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 00ade0b8d52a0653d001901244a9ff5ac18845fe..eb71af126353b5416702ba204ff7b22fabad7597 100644 (file)
--- 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 b56843e3a16fb8b89149993736c084f15ed020e6..ce9687cf5fd36927d25643e26907c0759d6581b1 100644 (file)
--- 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 c1cbc7c3c8a7c24723c0da9ebe678e8cdd0478cf..61b35b05d6eee735cbed8f1cd57c132b834920ca 100644 (file)
--- 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 a53099d10301b6a6fa7f8ccc9a72a324c0986422..c58514d80313b3d767e427e7e7ee2cd473ada31d 100644 (file)
--- 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 3201eef20bddd0cc7fee4e55012d528f367f637d..04df2fac823758aefe374599240597af5d21b7b9 100644 (file)
--- 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 879b9a9f286bf7f6b762d27686293a426fade4db..c2c26815147c1aa1d4a89ac961225ac73a50b0eb 100644 (file)
--- 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 7806c5648e7a0a5768c6eaa5048252872010eb88..9d871dd7b58a7a70a1109c9dae578460192d6c29 100644 (file)
--- 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 36193b63e558ca43eb1ccefe950c3efa2c733bb5..7f7fb9ef938ecbb09fab1dc0743b456110b3bcb5 100644 (file)
--- 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 3198b9e8226655237b16864ecf15717c46a45135..40901991e032c9805571f474965a627606bd6ba5 100644 (file)
--- 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 0ae3c30da454e4923140f31497e1df7994df95c2..cb45f3efa45d9c720cef6aced9357acd4f8b01be 100644 (file)
--- 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 f4552e61c0090c755c70f635c5a7993252eac79c..afed24fe3b0307a47b48a525b646944d2f09b701 100644 (file)
--- 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 3bd8852a55efb358a946d9a3ee6dc88f5fd5cddd..c702fa3d4053496cb52eef26ab2577b0d946b2b3 100644 (file)
--- 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 a350cee7f086d03ad73fdc193795b58fe17273e6..cc6d1bda1b4e9ceedea2eb26beb8b568b7a6ffe6 100644 (file)
--- 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 f83afb346a5002f7034fb10fe8a8dfbbb114019b..499a2957013dea44cb8ddb10ad590bbf44bbb472 100644 (file)
--- 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 48c30644fe8a3e3e298c2f81d28e2338901e9d49..34feddd30a79fb7311b5348381469aafa542bcbe 100644 (file)
--- 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 3cfdfc30443a663d4c7032ef98c5b79b265c42ca..517680a7c37b267113d983b9191ff18961e5ec02 100644 (file)
--- 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 4ce8900a9fa5ac501bddca5ed064f806a6106ecd..70bb75989ed95aa9ea0fee1dd7b927281815d379 100644 (file)
--- 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 06ce3fb20d4450307c27454cd4b4755ab9377a1d..dae83b8564c334de78ef4badabfafbfc8fe4b54a 100644 (file)
--- 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 19a9ee0852860ed0b4556f659d8dea6b22845ac0..7f3081bc6221392c0089668a2b5d20291e55a545 100644 (file)
--- 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 083494a84afb575b674c9d9322049009c2829fde..e3bc604fd24677c9911494ff185635cdb3cb8586 100644 (file)
--- 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 746412a44ede138c13746cb9edd1e8821c4f035a..2325705e8df81cfeb56b4ce1b3d934d5eb900b49 100644 (file)
--- 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 77084a4ecae1f1455634dfed505870998f1f8449..48a23df3c0e4dfb43237eadc355f99b2ff494e43 100644 (file)
--- 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 8a3d1759a398bffa82eb3a7e0af779f5fa3f490a..d380928808cd7fd869db354a01d909da587eba1e 100644 (file)
--- 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 9892321068d379c279978faee74112d88aac383a..32b2f4dcb675ae43619d8f1de891c89ffb4af3d6 100644 (file)
--- 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 3fd6ec8cf31c5c63d93aad4a5d74752c98d10da0..173cbc40688608736f71ecfd16474889a446ac5b 100644 (file)
--- 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 3fdb10af1bd109c69995620d35fd8125889208cf..41a4b2e7aff6e3f4ed05c442ef64bdcb9ad2d02c 100644 (file)
--- 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 0e79317d414ec9491fb86fe3bc5a0cce52d51901..ff95e998fc05ef68e7bcee1cc68dcd94c09a3c39 100644 (file)
--- 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 8a3584dfc28755f086171784c1e33e8acdd41387..70decf252fe49472b3f512eddde6d3c4fb07012c 100644 (file)
--- 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 c0f238582e7cf3d29a018bb5270c441f2c633926..3704e0f5e609a4d8668d2a5365532612b01929c9 100644 (file)
--- 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 318a18a35ae1cbf4acfd8c9bb0562642599e0320..66d6d27355155155b2e4226f5f8d1c474b987ddc 100644 (file)
--- 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 3508f0e782e6922ea6c9d7b111d0233d66b33171..b3d4cf83c180fd4b867315e202b99361d27588af 100644 (file)
--- 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 9628d766095e721cd6605a478658d2e45abe7d7c..59aa5be5745ae65b44809d660c97b47a6acfac55 100644 (file)
--- 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 f90de5eb5fcfb2ffd30a0157f5aa8dd776fb58a8..cc92cb4acab7dd518f5618de2ae1fc7ad3c8d950 100644 (file)
--- 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 5e4afad8fe06724e811688d466ab2563ccce9f4c..e5e65a399e5b0003d11c242d2772f3dfd71ab861 100644 (file)
--- 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)