From: Steph Fox <sfox@php.net>
Date: Tue, 27 May 2008 07:38:00 +0000 (+0000)
Subject: - killed off UEXPECT
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1658
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5078c3a00ae0586c742c1ef182f417e44c082ddb;p=php

- killed off UEXPECT
---

diff --git a/ext/standard/tests/math/acos_variation.phpt b/ext/standard/tests/math/acos_variation.phpt
index ecc2dc243d..5cc5b118a1 100644
--- 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 d364f26c68..5eb6c195c3 100644
--- 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 0a14f43818..7612ff2f13 100644
--- 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 ee6eb381af..b57e0c6a52 100644
--- 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 65a0622c6a..8312bb2890 100644
--- 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 de12f2cc1a..5b3769a5d7 100644
--- 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 e77e264402..a7a621ad82 100644
--- 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 327f47c75a..fdad794541 100644
--- 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 e50dc8d489..350d739f49 100644
--- 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 006983717b..fc558425be 100644
--- 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 f1718b0f39..bc5de1c3a2 100644
--- 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 92456da7f6..7ed00d7575 100755
--- 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 deeb785f44..9492629e33 100644
--- 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 9a2327323d..4cb4ff67ff 100644
--- 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 a98aceb5cc..bffacb3e0e 100644
--- 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 6707c02a3f..7119927432 100644
--- 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 f76d7d535b..564e4b4455 100644
--- 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 52e1feaa1e..4525234c3d 100644
--- 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 ad2fa279a9..03ab0dd63c 100644
--- 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 c29abca9d2..003a49498e 100644
--- 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 1c42ae7e40..796c4e9bae 100644
--- 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 85d2685273..47dee8b724 100644
--- 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 e26563079e..4d7b0be876 100644
--- 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 ca79922287..7f4d3634ae 100644
--- 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 fb10737cea..91849284c7 100644
--- 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 7749e4e406..6ae854ad8b 100644
--- 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 6d624d84ab..a962cb40ce 100644
--- 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 31987f1854..a47600871d 100644
--- 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 e2f9c9fe7d..1b0b628d51 100644
--- 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 29a30d088f..3bc4200f2c 100644
--- 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 8b6b3cb2ce..8228053109 100644
--- 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 03b1ecd6f9..be8b85cdef 100644
--- 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 e28b1b9eae..ec0c24254d 100644
--- 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 53fcf6a8ff..5d492c7878 100644
--- 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 9a17dfc8e7..eaa17c0d4d 100644
--- 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 8fd57ecfef..ce8102f296 100644
--- 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 fec5691371..b4d6c8ebe9 100644
--- 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 96864e0abc..4aa42bd289 100644
--- 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 d00173eb48..ab32d5a03d 100644
--- 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 96cc615631..e89c5cb0c8 100644
--- 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 7622644100..0f81b0fa92 100644
--- 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 32f55caa4f..1848fd6294 100644
--- 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 9d495d24b8..ff16fafd7c 100644
--- 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 16aa2dd69e..6f4228530b 100644
--- 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 43f6369ff8..1757a75baa 100644
--- 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 a15bf74ddb..9e69134e2b 100644
--- 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 9eb21102fb..1246e40712 100644
--- 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)