- killed off UEXPECT

diff --git a/ext/standard/tests/math/acos_variation.phpt b/ext/standard/tests/math/acos_variation.phpt
index ecc2dc243d924abd17aee9fcf366771de0d828f2..5cc5b118a1188b7eabb34dcc51da244486134c08 100644 (file)
--- a/ext/standard/tests/math/acos_variation.phpt
+++ b/ext/standard/tests/math/acos_variation.phpt
@@ -45,26 +45,6 @@ float(NAN)
 float(NAN)
 float(NAN)
 
-Warning: acos() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(NAN)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(NAN)
-float(1.570796327)
-float(0)
-float(1.570796327)
---UEXPECTF--
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-
 Warning: acos() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(NAN)

diff --git a/ext/standard/tests/math/acosh_variation.phpt b/ext/standard/tests/math/acosh_variation.phpt
index d364f26c68ce963acc98d236ffd4db1f5c51ecf2..5eb6c195c3f6f7de26878762183e789f7f16ba6b 100644 (file)
--- a/ext/standard/tests/math/acosh_variation.phpt
+++ b/ext/standard/tests/math/acosh_variation.phpt
@@ -45,26 +45,6 @@ float(3.828168471)
 float(3.847562739)
 float(3.847562739)
 
-Warning: acosh() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(7.60090221)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(7.60090221)
-float(NAN)
-float(0)
-float(NAN)
---UEXPECTF--
-float(3.828168471)
-float(NAN)
-float(3.847562739)
-float(NAN)
-float(3.828168471)
-float(3.828168471)
-float(3.828168471)
-float(3.847562739)
-float(3.847562739)
-
 Warning: acosh() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(7.60090221)

diff --git a/ext/standard/tests/math/asin_variation.phpt b/ext/standard/tests/math/asin_variation.phpt
index 0a14f438186e12551acf2e1a28b0d8c83203a789..7612ff2f13b1fb47fe00b8caa70b3ab442deac4a 100644 (file)
--- a/ext/standard/tests/math/asin_variation.phpt
+++ b/ext/standard/tests/math/asin_variation.phpt
@@ -45,26 +45,6 @@ float(NAN)
 float(NAN)
 float(NAN)
 
-Warning: asin() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(NAN)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(NAN)
-float(0)
-float(1.570796327)
-float(0)
---UEXPECTF--
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-
 Warning: asin() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(NAN)

diff --git a/ext/standard/tests/math/asinh_variation.phpt b/ext/standard/tests/math/asinh_variation.phpt
index ee6eb381af9bd1f866593868f7eeaba2ba0b8b83..b57e0c6a528c96895ad414882c58f309df40bd63 100644 (file)
--- a/ext/standard/tests/math/asinh_variation.phpt
+++ b/ext/standard/tests/math/asinh_variation.phpt
@@ -45,26 +45,6 @@ float(3.829113652)
 float(3.848471992)
 float(3.848471992)
 
-Warning: asinh() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(7.60090271)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(7.60090271)
-float(0)
-float(0.881373587)
-float(0)
---UEXPECTF--
-float(3.829113652)
-float(-3.829113652)
-float(3.848471992)
-float(-3.848471992)
-float(3.829113652)
-float(3.829113652)
-float(3.829113652)
-float(3.848471992)
-float(3.848471992)
-
 Warning: asinh() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(7.60090271)

diff --git a/ext/standard/tests/math/atan2_basic.phpt b/ext/standard/tests/math/atan2_basic.phpt
index 65a0622c6a25d6ed685d447f2bb3801f0d5ee212..8312bb289020247f793f84924f3954106dbaa7d6 100644 (file)
--- a/ext/standard/tests/math/atan2_basic.phpt
+++ b/ext/standard/tests/math/atan2_basic.phpt
@@ -38,7 +38,7 @@ for ($i = 0; $i < count($valuesy); $i++) {
        }       
 }
 ?>
---EXPECTF--
+--EXPECT--
 Y:23 X:23 float(0.78539816339745)
 Y:23 X:-23 float(2.3561944901923)
 Y:23 X:23.45 float(0.77571063007847)

diff --git a/ext/standard/tests/math/atan_variation.phpt b/ext/standard/tests/math/atan_variation.phpt
index de12f2cc1a190ef7f99a452e4ab4d1274847d487..5b3769a5d7e7753a0dc74ddcc6991051fae9e4f4 100644 (file)
--- a/ext/standard/tests/math/atan_variation.phpt
+++ b/ext/standard/tests/math/atan_variation.phpt
@@ -45,26 +45,6 @@ float(1.527345431)
 float(1.528178225)
 float(1.528178225)
 
-Warning: atan() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(1.569796327)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(1.569796327)
-float(0)
-float(0.7853981634)
-float(0)
---UEXPECTF--
-float(1.527345431)
-float(-1.527345431)
-float(1.528178225)
-float(-1.528178225)
-float(1.527345431)
-float(1.527345431)
-float(1.527345431)
-float(1.528178225)
-float(1.528178225)
-
 Warning: atan() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(1.569796327)

diff --git a/ext/standard/tests/math/atanh_variation.phpt b/ext/standard/tests/math/atanh_variation.phpt
index e77e2644027df418b737b484045d55762b58a7db..a7a621ad820c1f4259b2a66a42103bd759684a52 100644 (file)
--- a/ext/standard/tests/math/atanh_variation.phpt
+++ b/ext/standard/tests/math/atanh_variation.phpt
@@ -45,26 +45,6 @@ float(NAN)
 float(NAN)
 float(NAN)
 
-Warning: atanh() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(NAN)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(NAN)
-float(0)
-float(INF)
-float(0)
---UEXPECTF--
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-float(NAN)
-
 Warning: atanh() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(NAN)

diff --git a/ext/standard/tests/math/base_convert_basic.phpt b/ext/standard/tests/math/base_convert_basic.phpt
index 327f47c75ae0b525b7660c31f17417cf7a1a5c1c..fdad79454164ae1325e4083066d260c2311c6068 100644 (file)
--- a/ext/standard/tests/math/base_convert_basic.phpt
+++ b/ext/standard/tests/math/base_convert_basic.phpt
@@ -29,7 +29,7 @@ for ($f= 0; $f < count($frombase); $f++) {
 }
 ?>
 
---EXPECTF--
+--EXPECT--
 ...from base is 2
 ......to base is 2
 .........value= 10 res = 10

diff --git a/ext/standard/tests/math/bindec_basic.phpt b/ext/standard/tests/math/bindec_basic.phpt
index e50dc8d4893f8ea1ca410a2346053a872ee460d0..350d739f49bd5edbe18281ed6131bf1a7ff1b7c6 100644 (file)
--- a/ext/standard/tests/math/bindec_basic.phpt
+++ b/ext/standard/tests/math/bindec_basic.phpt
@@ -31,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) {
        var_dump($res);
 }
 ?>
---EXPECTF--
+--EXPECT--
 int(455)
 int(0)
 int(32766)

diff --git a/ext/standard/tests/math/bindec_basic_64bit.phpt b/ext/standard/tests/math/bindec_basic_64bit.phpt
index 006983717bb4c1b6497d8dbbf15b472636c99985..fc558425be21246055669dd4cd23ca4d3c7f3413 100644 (file)
--- a/ext/standard/tests/math/bindec_basic_64bit.phpt
+++ b/ext/standard/tests/math/bindec_basic_64bit.phpt
@@ -31,7 +31,7 @@ for ($i = 0; $i < count($values); $i++) {
        var_dump($res);
 }
 ?>
---EXPECTF--
+--EXPECT--
 int(455)
 int(0)
 int(32766)

diff --git a/ext/standard/tests/math/bug21523.phpt b/ext/standard/tests/math/bug21523.phpt
index f1718b0f39d04ecc725d02067c04fa665ce23dbe..bc5de1c3a2f379a6ea4ee71ee57805a28177976e 100644 (file)
--- a/ext/standard/tests/math/bug21523.phpt
+++ b/ext/standard/tests/math/bug21523.phpt
@@ -8,8 +8,5 @@ var_dump(number_format(-2000, 2768));
 echo "OK";
 ?>
 --EXPECT--
-string(2775) "-2,000.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-OK
---UEXPECT--
 unicode(2775) "-2,000.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
 OK

diff --git a/ext/standard/tests/math/bug27646.phpt b/ext/standard/tests/math/bug27646.phpt
index 92456da7f6983ac611880be9b3ec0fde6325437b..7ed00d7575c9d8db7e9f92b79435a9223e6fda57 100755 (executable)
--- a/ext/standard/tests/math/bug27646.phpt
+++ b/ext/standard/tests/math/bug27646.phpt
@@ -32,22 +32,6 @@ var_dump(unserialize(serialize($f)));
 ?>
 --EXPECTF--
 float(1%f)
-string(%d) "d:1%s;"
-float(1%f)
-float(-1%f)
-string(%d) "d:-1%s;"
-float(-1%f)
-float(-INF)
-string(7) "d:-INF;"
-float(-INF)
-float(INF)
-string(6) "d:INF;"
-float(INF)
-float(NAN)
-string(6) "d:NAN;"
-float(NAN)
---UEXPECTF--
-float(1%f)
 unicode(%d) "d:1%s;"
 float(1%f)
 float(-1%f)

diff --git a/ext/standard/tests/math/constants.phpt b/ext/standard/tests/math/constants.phpt
index deeb785f447ff5a8d46d585c98622c9f0f28b62f..9492629e3381e2d683321ddd14b73f504ea5eef0 100644 (file)
--- a/ext/standard/tests/math/constants.phpt
+++ b/ext/standard/tests/math/constants.phpt
@@ -45,4 +45,3 @@ M_EULER   : 0.577215[0-9]*
 M_SQRT2   : 1.414213[0-9]*
 M_SQRT1_2 : 0.707106[0-9]*
 M_SQRT3   : 1.732050[0-9]*
-

diff --git a/ext/standard/tests/math/cos_variation.phpt b/ext/standard/tests/math/cos_variation.phpt
index 9a2327323d21c3a5fa44abf0c99d487f2996663b..4cb4ff67ffeacde2ee48e2469a0646893d36ce54 100644 (file)
--- a/ext/standard/tests/math/cos_variation.phpt
+++ b/ext/standard/tests/math/cos_variation.phpt
@@ -45,26 +45,6 @@ float(-0.5328330203)
 float(-0.1117112391)
 float(-0.1117112391)
 
-Warning: cos() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(0.5623790763)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(0.5623790763)
-float(1)
-float(0.5403023059)
-float(1)
---UEXPECTF--
-float(-0.5328330203)
-float(-0.5328330203)
-float(-0.1117112391)
-float(-0.1117112391)
-float(-0.5328330203)
-float(-0.5328330203)
-float(-0.5328330203)
-float(-0.1117112391)
-float(-0.1117112391)
-
 Warning: cos() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(0.5623790763)

diff --git a/ext/standard/tests/math/cosh_variation.phpt b/ext/standard/tests/math/cosh_variation.phpt
index a98aceb5cc1f9d6ccbefa7a118410b98c519e70e..bffacb3e0e6277c76509d14435903397f60111b8 100644 (file)
--- a/ext/standard/tests/math/cosh_variation.phpt
+++ b/ext/standard/tests/math/cosh_variation.phpt
@@ -45,26 +45,6 @@ float(4872401723)
 float(7641446995)
 float(7641446995)
 
-Warning: cosh() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(INF)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(INF)
-float(1)
-float(1.543080635)
-float(1)
---UEXPECTF--
-float(4872401723)
-float(4872401723)
-float(7641446995)
-float(7641446995)
-float(4872401723)
-float(4872401723)
-float(4872401723)
-float(7641446995)
-float(7641446995)
-
 Warning: cosh() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(INF)

diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt
index 6707c02a3f09598b549d28d8f89daf22efd298f3..71199274325a116c1100cc86c9f3474d9616b9a5 100644 (file)
--- a/ext/standard/tests/math/decbin_basic.phpt
+++ b/ext/standard/tests/math/decbin_basic.phpt
@@ -24,20 +24,6 @@ for ($i = 0; $i < count($values); $i++) {
 ?>
 
 --EXPECTF--
-string(4) "1010"
-string(12) "111101101110"
-string(12) "111101101110"
-string(2) "11"
-string(7) "1011111"
-string(4) "1010"
-string(12) "111101101110"
-string(2) "11"
-string(6) "100111"
-string(1) "0"
-string(1) "1"
-string(1) "0"
-string(1) "0"
---UEXPECTF--
 unicode(4) "1010"
 unicode(12) "111101101110"
 unicode(12) "111101101110"

diff --git a/ext/standard/tests/math/dechex_basic.phpt b/ext/standard/tests/math/dechex_basic.phpt
index f76d7d535be6d2c026f035939ef126cfd0b19753..564e4b4455b2fdd7fa44dc470920c68c0534a432 100644 (file)
--- a/ext/standard/tests/math/dechex_basic.phpt
+++ b/ext/standard/tests/math/dechex_basic.phpt
@@ -23,20 +23,6 @@ for ($i = 0; $i < count($values); $i++) {
 }
 ?>
 --EXPECTF--
-string(1) "a"
-string(3) "f6e"
-string(3) "f6e"
-string(1) "3"
-string(2) "5f"
-string(1) "a"
-string(3) "f6e"
-string(1) "3"
-string(2) "27"
-string(1) "0"
-string(1) "1"
-string(1) "0"
-string(1) "0"
---UEXPECTF--
 unicode(1) "a"
 unicode(3) "f6e"
 unicode(3) "f6e"

diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt
index 52e1feaa1e9119dab1f1d5d1395f94fdbc039da0..4525234c3df54240c178ec68dfa42c022dac07bf 100644 (file)
--- a/ext/standard/tests/math/decoct_basic.phpt
+++ b/ext/standard/tests/math/decoct_basic.phpt
@@ -23,20 +23,6 @@ for ($i = 0; $i < count($values); $i++) {
 }
 ?>
 --EXPECTF--
-string(2) "12"
-string(4) "7556"
-string(4) "7556"
-string(1) "3"
-string(3) "137"
-string(2) "12"
-string(4) "7556"
-string(1) "3"
-string(2) "47"
-string(1) "0"
-string(1) "1"
-string(1) "0"
-string(1) "0"
---UEXPECTF--
 unicode(2) "12"
 unicode(4) "7556"
 unicode(4) "7556"

diff --git a/ext/standard/tests/math/deg2rad_variation.phpt b/ext/standard/tests/math/deg2rad_variation.phpt
index ad2fa279a991de4b70d2c55edf986258852d2745..03ab0dd63cff183ffa07c187662055ff579c2356 100644 (file)
--- a/ext/standard/tests/math/deg2rad_variation.phpt
+++ b/ext/standard/tests/math/deg2rad_variation.phpt
@@ -45,26 +45,6 @@ float(0.401425728)
 float(0.4092797096)
 float(0.4092797096)
 
-Warning: deg2rad() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(17.45329252)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(17.45329252)
-float(0)
-float(0.01745329252)
-float(0)
---UEXPECTF--
-float(0.401425728)
-float(-0.401425728)
-float(0.4092797096)
-float(-0.4092797096)
-float(0.401425728)
-float(0.401425728)
-float(0.401425728)
-float(0.4092797096)
-float(0.4092797096)
-
 Warning: deg2rad() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(17.45329252)

diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt
index c29abca9d2cee5b5a3a41d32a03feb94c2b9ce29..003a49498ebea43f3698f90d6f69a68f0fc5b0e0 100644 (file)
--- a/ext/standard/tests/math/fmod_basic.phpt
+++ b/ext/standard/tests/math/fmod_basic.phpt
@@ -38,7 +38,7 @@ for ($i = 0; $i < count($values1); $i++) {
        }       
 }
 ?>
---EXPECTF--
+--EXPECT--
 
 iteration 0
 float(0)

diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt
index 1c42ae7e406eee8de281078761751330ed31b5f7..796c4e9bae2644cd40a0363711b8bb41e6325565 100644 (file)
--- a/ext/standard/tests/math/hexdec_basic.phpt
+++ b/ext/standard/tests/math/hexdec_basic.phpt
@@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) {
        var_dump($res);
 }
 ?>
---EXPECTF--
+--EXPECT--
 int(18433668)
 int(126895953)
 float(142929835591)

diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt
index 85d26852734a0294c023d4bd37b7b9628c1a83ee..47dee8b7245eaa4ce7cc9b625d2a649abdde1e58 100644 (file)
--- a/ext/standard/tests/math/is_finite_basic.phpt
+++ b/ext/standard/tests/math/is_finite_basic.phpt
@@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) {
        var_dump($res);         
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
@@ -37,5 +37,3 @@ bool(true)
 bool(true)
 bool(false)
 bool(false)
-
-

diff --git a/ext/standard/tests/math/is_finite_error.phpt b/ext/standard/tests/math/is_finite_error.phpt
index e26563079e51ad2b2354041a02438deddf845a7d..4d7b0be87666acf9a38e997abe5e1da2ad5378db 100644 (file)
--- a/ext/standard/tests/math/is_finite_error.phpt
+++ b/ext/standard/tests/math/is_finite_error.phpt
@@ -10,4 +10,3 @@ is_finite(23,2,true);
 Warning: is_finite() expects exactly 1 parameter, 0 given in %s on line 2
 
 Warning: is_finite() expects exactly 1 parameter, 3 given in %s on line 3
-

diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt
index ca79922287bd7fd514f3e943ccfee7ef3ae113ad..7f4d3634ae97aeb27175e3d625a5152fa810edba 100644 (file)
--- a/ext/standard/tests/math/is_infinite_basic.phpt
+++ b/ext/standard/tests/math/is_infinite_basic.phpt
@@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) {
        var_dump($res);         
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)
@@ -37,6 +37,3 @@ bool(false)
 bool(false)
 bool(true)
 bool(false)
-
-
-

diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt
index fb10737ceaa3efc2d7bc06bdada20633a9ae2557..91849284c7a346251272b5b4b64f819c728573f3 100644 (file)
--- a/ext/standard/tests/math/is_nan_basic.phpt
+++ b/ext/standard/tests/math/is_nan_basic.phpt
@@ -25,7 +25,7 @@ for ($i = 0; $i < count($values); $i++) {
  
 ?>
 
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)
@@ -40,6 +40,3 @@ bool(false)
 bool(false)
 bool(false)
 bool(true)
-
-
-

diff --git a/ext/standard/tests/math/is_nan_error.phpt b/ext/standard/tests/math/is_nan_error.phpt
index 7749e4e4067d3c79743bbe72e95a2b3716801f8a..6ae854ad8b8d078ba2e104cab264756013feda4d 100644 (file)
--- a/ext/standard/tests/math/is_nan_error.phpt
+++ b/ext/standard/tests/math/is_nan_error.phpt
@@ -10,7 +10,3 @@ is_nan(23,2,true);
 Warning: is_nan() expects exactly 1 parameter, 0 given in %s on line 2
 
 Warning: is_nan() expects exactly 1 parameter, 3 given in %s on line 3
-
-
-
-

diff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt
index 6d624d84ab04bac4b7973f8236556378e95013ec..a962cb40ce6fa11fba012e306307133dc34e812f 100644 (file)
--- a/ext/standard/tests/math/lcg_value_basic.phpt
+++ b/ext/standard/tests/math/lcg_value_basic.phpt
@@ -51,6 +51,3 @@ PASSED
 PASSED
 PASSED
 MATHS test script completed
-
-
-

diff --git a/ext/standard/tests/math/log10_variation.phpt b/ext/standard/tests/math/log10_variation.phpt
index 31987f1854129cec15588ff8e04e5d9812b64f5c..a47600871d0702602be53b1cc15a230d5adcd126 100644 (file)
--- a/ext/standard/tests/math/log10_variation.phpt
+++ b/ext/standard/tests/math/log10_variation.phpt
@@ -21,12 +21,12 @@ $values = array(23,
                "23",
                "23.45",
                "2.345e1",
-               "nonsense",                             
+               "nonsense",
                "1000",
                "1000ABC",
                null,
                true,
-               false); 
+               false);
 
 for ($i = 0; $i < count($values); $i++) {
        $res = log10($values[$i]);
@@ -45,26 +45,6 @@ float(1.361727836)
 float(1.370142847)
 float(1.370142847)
 
-Warning: log10() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(3)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(3)
-float(-INF)
-float(0)
-float(-INF)
---UEXPECTF--
-float(1.361727836)
-float(NAN)
-float(1.370142847)
-float(NAN)
-float(1.361727836)
-float(1.361727836)
-float(1.361727836)
-float(1.370142847)
-float(1.370142847)
-
 Warning: log10() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(3)

diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt
index e2f9c9fe7d32f017a875379c8bc728fc541bbde7..1b0b628d516a9ae8a49bd280aef7a213a2b6f787 100644 (file)
--- a/ext/standard/tests/math/log_basic.phpt
+++ b/ext/standard/tests/math/log_basic.phpt
@@ -30,7 +30,7 @@ for ($i = 0; $i < count($values); $i++) {
 }
 ?>
 
---EXPECTF--
+--EXPECT--
  LOG tests...no base
 float(3.1354942159291)
 float(NAN)

diff --git a/ext/standard/tests/math/mt_getrandmax_basic.phpt b/ext/standard/tests/math/mt_getrandmax_basic.phpt
index 29a30d088f6523f68ebf8c5763852a7ca847b993..3bc4200f2ccdfd2df6cfe58566fcc089d3dfe2c7 100644 (file)
--- a/ext/standard/tests/math/mt_getrandmax_basic.phpt
+++ b/ext/standard/tests/math/mt_getrandmax_basic.phpt
@@ -5,4 +5,4 @@ Test mt_getrandmax() - basic function test mt_getrandmax()
 var_dump(mt_getrandmax());
 ?>
 --EXPECTF--
-int(%d)
\ No newline at end of file
+int(%d)

diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt
index 8b6b3cb2ce6e996a462f5e949caa72ffb8a6b3e3..8228053109fc45e675ddb3e0e4fd69aaeb466ad8 100644 (file)
--- a/ext/standard/tests/math/mt_rand_basic.phpt
+++ b/ext/standard/tests/math/mt_rand_basic.phpt
@@ -81,7 +81,7 @@ for ($x = 0; $x < count($min); $x++) {
        }       
 }
 ?>
---EXPECTF--
+--EXPECT--
 mt_rand() tests with default min and max value (i.e 0 thru 2147483647)
 PASSED: range min = 0  max = 2147483647
 

diff --git a/ext/standard/tests/math/mt_rand_error.phpt b/ext/standard/tests/math/mt_rand_error.phpt
index 03b1ecd6f99cd3a89b5d1fbab5a45d664e3931d3..be8b85cdef0e825d69da3e5ce13e194b7f220fe0 100644 (file)
--- a/ext/standard/tests/math/mt_rand_error.phpt
+++ b/ext/standard/tests/math/mt_rand_error.phpt
@@ -14,15 +14,6 @@ Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line %d
 
 Warning: mt_rand() expects exactly 2 parameters, 3 given in %s on line %d
 
-Warning: mt_rand() expects parameter 1 to be long, string given in %s on line %d
-
-Warning: mt_rand() expects parameter 2 to be long, string given in %s on line %d
---UEXPECTF--
-
-Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: mt_rand() expects exactly 2 parameters, 3 given in %s on line %d
-
 Warning: mt_rand() expects parameter 1 to be long, Unicode string given in %s on line %d
 
 Warning: mt_rand() expects parameter 2 to be long, Unicode string given in %s on line %d

diff --git a/ext/standard/tests/math/mt_srand_basic.phpt b/ext/standard/tests/math/mt_srand_basic.phpt
index e28b1b9eae80f00344f01bcc89b6c5923751d07f..ec0c24254d9fd564a59eb059ab546bb4fa6cd7e5 100644 (file)
--- a/ext/standard/tests/math/mt_srand_basic.phpt
+++ b/ext/standard/tests/math/mt_srand_basic.phpt
@@ -13,7 +13,8 @@ var_dump(mt_srand(true));
 var_dump(mt_srand(false));
 var_dump(mt_srand(NULL));
 ?>
---EXPECTF--
+--EXPECT--
+NULL
 NULL
 NULL
 NULL
@@ -21,4 +22,3 @@ NULL
 NULL
 NULL
 NULL
-NULL
\ No newline at end of file

diff --git a/ext/standard/tests/math/mt_srand_error.phpt b/ext/standard/tests/math/mt_srand_error.phpt
index 53fcf6a8ff5c23fe0166dbf256cb37292a6eff95..5d492c787863d2b6985ff531587d433cc8bff03b 100644 (file)
--- a/ext/standard/tests/math/mt_srand_error.phpt
+++ b/ext/standard/tests/math/mt_srand_error.phpt
@@ -10,15 +10,6 @@ var_dump(mt_srand("500ABC"));
 Warning: mt_srand() expects at most 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: mt_srand() expects parameter 1 to be long, string given in %s on line %d
-NULL
-
-Notice: A non well formed numeric value encountered in %s on line %d
-NULL
---UEXPECTF--
-Warning: mt_srand() expects at most 1 parameter, 2 given in %s on line %d
-NULL
-
 Warning: mt_srand() expects parameter 1 to be long, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/math/number_format_basic.phpt b/ext/standard/tests/math/number_format_basic.phpt
index 9a17dfc8e77c6a4a138832f9adf9360e11231928..eaa17c0d4d7546dbf5516dd58b484a8ba4fbc182 100644 (file)
--- a/ext/standard/tests/math/number_format_basic.phpt
+++ b/ext/standard/tests/math/number_format_basic.phpt
@@ -39,63 +39,7 @@ for ($i = 0; $i < count($values); $i++) {
        var_dump($res);
 }
 ?>
---EXPECTF--
- number_format tests.....default
-string(5) "1,235"
-string(6) "-1,235"
-string(10) "12,346,578"
-string(11) "-12,345,679"
-string(11) "305,450,479"
-string(11) "402,653,183"
-string(11) "123,456,789"
-string(3) "123"
-string(3) "123"
-string(1) "0"
-string(1) "1"
-string(1) "0"
-
- number_format tests.....with two dp
-string(8) "1,234.57"
-string(9) "-1,234.57"
-string(13) "12,346,578.00"
-string(14) "-12,345,678.90"
-string(14) "305,450,479.00"
-string(14) "402,653,183.00"
-string(14) "123,456,789.00"
-string(6) "123.46"
-string(6) "123.46"
-string(4) "0.00"
-string(4) "1.00"
-string(4) "0.00"
-
- number_format tests.....English format
-string(8) "1 234.57"
-string(9) "-1 234.57"
-string(13) "12 346 578.00"
-string(14) "-12 345 678.90"
-string(14) "305 450 479.00"
-string(14) "402 653 183.00"
-string(14) "123 456 789.00"
-string(6) "123.46"
-string(6) "123.46"
-string(4) "0.00"
-string(4) "1.00"
-string(4) "0.00"
-
- number_format tests.....French format
-string(8) "1 234,57"
-string(9) "-1 234,57"
-string(13) "12 346 578,00"
-string(14) "-12 345 678,90"
-string(14) "305 450 479,00"
-string(14) "402 653 183,00"
-string(14) "123 456 789,00"
-string(6) "123,46"
-string(6) "123,46"
-string(4) "0,00"
-string(4) "1,00"
-string(4) "0,00"
---UEXPECTF--
+--EXPECT--
 number_format tests.....default
 unicode(5) "1,235"
 unicode(6) "-1,235"

diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt
index 8fd57ecfef7d9e18c2aef2310a06f04bf0ac5510..ce8102f29600f7fea2df37331aae9abf312b79dc 100644 (file)
--- a/ext/standard/tests/math/octdec_basic.phpt
+++ b/ext/standard/tests/math/octdec_basic.phpt
@@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) {
        var_dump($res);
 }
 ?>
---EXPECTF--
+--EXPECT--
 int(14489)
 int(253)
 int(36947879)
@@ -46,4 +46,4 @@ int(102923)
 int(823384)
 int(1)
 int(0)
-int(0)
\ No newline at end of file
+int(0)

diff --git a/ext/standard/tests/math/pi_basic.phpt b/ext/standard/tests/math/pi_basic.phpt
index fec5691371d1b1a5f383509219ffd337542dcfeb..b4d6c8ebe90ad020014c524a81522fae5e3a55c7 100644 (file)
--- a/ext/standard/tests/math/pi_basic.phpt
+++ b/ext/standard/tests/math/pi_basic.phpt
@@ -9,6 +9,6 @@ echo M_PI, "\n";
 // N.B pi() ignores all specified arguments no error 
 // messages are produced if arguments are spcified. 
 ?>
---EXPECTF--
+--EXPECT--
 3.1415926535898
 3.1415926535898

diff --git a/ext/standard/tests/math/pow_basic.phpt b/ext/standard/tests/math/pow_basic.phpt
index 96864e0abc9cc4583a5084879fc5ef8d2dc4c65f..4aa42bd2893586cd35d578b256f59b729f601ffe 100644 (file)
--- a/ext/standard/tests/math/pow_basic.phpt
+++ b/ext/standard/tests/math/pow_basic.phpt
@@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) {
        var_dump($res);
 }
 ?>
---EXPECTF--
+--EXPECT--
 int(279841)
 int(279841)
 float(302392.75950625)
@@ -34,4 +34,4 @@ float(302392.75950625)
 float(302392.75950625)
 int(0)
 int(1)
-int(0)
\ No newline at end of file
+int(0)

diff --git a/ext/standard/tests/math/pow_error.phpt b/ext/standard/tests/math/pow_error.phpt
index d00173eb489a295e4bedb51ee1363ce30210f660..ab32d5a03d94b61e966bb60e52865bb0408fafa5 100644 (file)
--- a/ext/standard/tests/math/pow_error.phpt
+++ b/ext/standard/tests/math/pow_error.phpt
@@ -15,5 +15,3 @@ Warning: pow() expects exactly 2 parameters, 0 given in %s line 2
 Warning: pow() expects exactly 2 parameters, 1 given in %s line 3
 
 Warning: pow() expects exactly 2 parameters, 3 given in %s line 4
-
-

diff --git a/ext/standard/tests/math/rad2deg_variation.phpt b/ext/standard/tests/math/rad2deg_variation.phpt
index 96cc615631a0960388b19f1a19a9cce342f5dcc1..e89c5cb0c8d13ac830a0172bc496802815fa0007 100644 (file)
--- a/ext/standard/tests/math/rad2deg_variation.phpt
+++ b/ext/standard/tests/math/rad2deg_variation.phpt
@@ -45,26 +45,6 @@ float(1317.802929)
 float(1343.58603)
 float(1343.58603)
 
-Warning: rad2deg() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(57295.77951)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(57295.77951)
-float(0)
-float(57.29577951)
-float(0)
---UEXPECTF--
-float(1317.802929)
-float(-1317.802929)
-float(1343.58603)
-float(-1343.58603)
-float(1317.802929)
-float(1317.802929)
-float(1317.802929)
-float(1343.58603)
-float(1343.58603)
-
 Warning: rad2deg() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(57295.77951)

diff --git a/ext/standard/tests/math/rand_error.phpt b/ext/standard/tests/math/rand_error.phpt
index 762264410062ea5eedbbe8f1334c8eb8f46f4f3b..0f81b0fa92fc1d6b5cd9000cb2de3367ff722333 100644 (file)
--- a/ext/standard/tests/math/rand_error.phpt
+++ b/ext/standard/tests/math/rand_error.phpt
@@ -8,15 +8,6 @@ rand("one", 100);
 rand(1, "hundered");
 ?>
 --EXPECTF--
-
-Warning: rand() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: rand() expects exactly 2 parameters, 3 given in %s on line %d
-
-Warning: rand() expects parameter 1 to be long, string given in %s on line %d
-
-Warning: rand() expects parameter 2 to be long, string given in %s on line %d
---UEXPECTF--
 Warning: rand() expects exactly 2 parameters, 1 given in %s on line %d
 
 Warning: rand() expects exactly 2 parameters, 3 given in %s on line %d

diff --git a/ext/standard/tests/math/sin_variation.phpt b/ext/standard/tests/math/sin_variation.phpt
index 32f55caa4f7c1d64bd531fbdba23b26265b5c16b..1848fd6294a78c3769a1be6a3e1d3179ddd61d95 100644 (file)
--- a/ext/standard/tests/math/sin_variation.phpt
+++ b/ext/standard/tests/math/sin_variation.phpt
@@ -45,26 +45,6 @@ float(-0.8462204042)
 float(-0.9937407102)
 float(-0.9937407102)
 
-Warning: sin() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(0.8268795405)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(0.8268795405)
-float(0)
-float(0.8414709848)
-float(0)
---UEXPECTF--
-float(-0.8462204042)
-float(0.8462204042)
-float(-0.9937407102)
-float(0.9937407102)
-float(-0.8462204042)
-float(-0.8462204042)
-float(-0.8462204042)
-float(-0.9937407102)
-float(-0.9937407102)
-
 Warning: sin() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(0.8268795405)

diff --git a/ext/standard/tests/math/sinh_variation.phpt b/ext/standard/tests/math/sinh_variation.phpt
index 9d495d24b8bdef9e3a61b651b40c951b815137bc..ff16fafd7c68de3e582d813ca329c6ae62ef3751 100644 (file)
--- a/ext/standard/tests/math/sinh_variation.phpt
+++ b/ext/standard/tests/math/sinh_variation.phpt
@@ -45,26 +45,6 @@ float(4872401723)
 float(7641446995)
 float(7641446995)
 
-Warning: sinh() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(INF)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(INF)
-float(0)
-float(1.175201194)
-float(0)
---UEXPECTF--
-float(4872401723)
-float(-4872401723)
-float(7641446995)
-float(-7641446995)
-float(4872401723)
-float(4872401723)
-float(4872401723)
-float(7641446995)
-float(7641446995)
-
 Warning: sinh() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(INF)

diff --git a/ext/standard/tests/math/srand_basic.phpt b/ext/standard/tests/math/srand_basic.phpt
index 16aa2dd69e192bac0ec3c0c51717e22a272bd18a..6f4228530b93888195781c46556e21c3a8ec9e90 100644 (file)
--- a/ext/standard/tests/math/srand_basic.phpt
+++ b/ext/standard/tests/math/srand_basic.phpt
@@ -13,7 +13,8 @@ var_dump(srand(true));
 var_dump(srand(false));
 var_dump(srand(NULL));
 ?>
---EXPECTF--
+--EXPECT--
+NULL
 NULL
 NULL
 NULL
@@ -21,4 +22,3 @@ NULL
 NULL
 NULL
 NULL
-NULL
\ No newline at end of file

diff --git a/ext/standard/tests/math/srand_error.phpt b/ext/standard/tests/math/srand_error.phpt
index 43f6369ff874e0ceeb5a962ef7b9cf4d2ab7b413..1757a75baa2de2b0695e27bb77b2ca17ed3cb06a 100644 (file)
--- a/ext/standard/tests/math/srand_error.phpt
+++ b/ext/standard/tests/math/srand_error.phpt
@@ -10,15 +10,6 @@ var_dump(mt_srand("500ABC"));
 Warning: mt_srand() expects at most 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: mt_srand() expects parameter 1 to be long, string given in %s on line %d
-NULL
-
-Notice: A non well formed numeric value encountered in %s on line %d
-NULL
---UEXPECTF--
-Warning: mt_srand() expects at most 1 parameter, 2 given in %s on line %d
-NULL
-
 Warning: mt_srand() expects parameter 1 to be long, Unicode string 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 a15bf74ddb0e18364ea6849ea3c7ab7759993e88..9e69134e2b80fd56703a54947671c05e65383c66 100644 (file)
--- a/ext/standard/tests/math/tan_variation.phpt
+++ b/ext/standard/tests/math/tan_variation.phpt
@@ -45,26 +45,6 @@ float(1.588153083)
 float(8.895619796)
 float(8.895619796)
 
-Warning: tan() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(1.470324156)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(1.470324156)
-float(0)
-float(1.557407725)
-float(0)
---UEXPECTF--
-float(1.588153083)
-float(-1.588153083)
-float(8.895619796)
-float(-8.895619796)
-float(1.588153083)
-float(1.588153083)
-float(1.588153083)
-float(8.895619796)
-float(8.895619796)
-
 Warning: tan() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(1.470324156)

diff --git a/ext/standard/tests/math/tanh_variation.phpt b/ext/standard/tests/math/tanh_variation.phpt
index 9eb21102fb7fe4b1b137528884221d3125d4c7a4..1246e40712855e9813cbc51daf2fd2dfda261948 100644 (file)
--- a/ext/standard/tests/math/tanh_variation.phpt
+++ b/ext/standard/tests/math/tanh_variation.phpt
@@ -45,26 +45,6 @@ float(1)
 float(1)
 float(1)
 
-Warning: tanh() expects parameter 1 to be double, string given in %s on line 27
-NULL
-float(1)
-
-Notice: A non well formed numeric value encountered in %s on line 27
-float(1)
-float(0)
-float(0.761594156)
-float(0)
---UEXPECTF--
-float(1)
-float(-1)
-float(1)
-float(-1)
-float(1)
-float(1)
-float(1)
-float(1)
-float(1)
-
 Warning: tanh() expects parameter 1 to be double, Unicode string given in %s on line 27
 NULL
 float(1)