summaryrefslogtreecommitdiff
path: root/ext/standard/tests/math
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2012-04-17 15:45:53 +0200
committerNikita Popov <nikic@php.net>2015-01-28 22:54:17 +0100
commitd133e68bab52edc0f1500d20dfb22e37d560dfe1 (patch)
tree83ef1f82fd9cd64950f259ea7bcbb2a5c71315fb /ext/standard/tests/math
parent14d6de97c5f54ec66dbb6b18ebe9cd0d279e4784 (diff)
downloadphp-git-d133e68bab52edc0f1500d20dfb22e37d560dfe1.tar.gz
Remove support for hex number from is_numeric_string
Diffstat (limited to 'ext/standard/tests/math')
-rw-r--r--ext/standard/tests/math/ceil_basic.phpt2
-rw-r--r--ext/standard/tests/math/exp_basic.phpt10
-rw-r--r--ext/standard/tests/math/expm1_basic.phpt10
-rw-r--r--ext/standard/tests/math/floor_basic.phpt6
-rw-r--r--ext/standard/tests/math/mt_rand_basic.phpt5
-rw-r--r--ext/standard/tests/math/rand_basic.phpt3
-rw-r--r--ext/standard/tests/math/round_basic.phpt29
7 files changed, 10 insertions, 55 deletions
diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt
index 679460533d..e90afd3388 100644
--- a/ext/standard/tests/math/ceil_basic.phpt
+++ b/ext/standard/tests/math/ceil_basic.phpt
@@ -31,7 +31,6 @@ $values = array(0,
"3.95E3",
"-3.95E3",
"039",
- "0x5F",
true,
false,
null,
@@ -63,7 +62,6 @@ float(-10)
float(3950)
float(-3950)
float(39)
-float(95)
float(1)
float(0)
float(0)
diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt
index 9526c66fa4..135705507c 100644
--- a/ext/standard/tests/math/exp_basic.phpt
+++ b/ext/standard/tests/math/exp_basic.phpt
@@ -13,7 +13,6 @@ $values = array(10,
"3950.5",
"3.9505e3",
"039",
- "0x5F",
true,
false,
null,
@@ -58,14 +57,11 @@ float(INF)
float(8.6593400423994E+16)
-- Iteration 10 --
-float(1.811239082889E+41)
-
--- Iteration 11 --
float(2.718281828459)
--- Iteration 12 --
+-- Iteration 11 --
float(1)
--- Iteration 13 --
+-- Iteration 12 --
float(1)
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt
index fa1d571db4..320b01a27d 100644
--- a/ext/standard/tests/math/expm1_basic.phpt
+++ b/ext/standard/tests/math/expm1_basic.phpt
@@ -20,7 +20,6 @@ $values = array(10,
"3950.5",
"3.9505e3",
"039",
- "0x5F",
true,
false,
null,
@@ -66,14 +65,11 @@ float(INF)
float(8.6593400423994E+16)
-- Iteration 10 --
-float(1.811239082889E+41)
-
--- Iteration 11 --
float(1.718281828459)
--- Iteration 12 --
+-- Iteration 11 --
float(0)
--- Iteration 13 --
+-- Iteration 12 --
float(0)
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt
index bbb8a2aa57..2b6d2f75c8 100644
--- a/ext/standard/tests/math/floor_basic.phpt
+++ b/ext/standard/tests/math/floor_basic.phpt
@@ -27,7 +27,6 @@ $values = array(0,
"3.95E3",
"-3.95E3",
"039",
- "0x5F",
true,
false,
null,
@@ -94,9 +93,6 @@ float(-3950)
-- floor 039 --
float(39)
--- floor 0x5F --
-float(95)
-
-- floor 1 --
float(1)
@@ -105,4 +101,4 @@ float(0)
-- floor --
float(0)
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt
index 8b6b3cb2ce..0f7b8a8b6e 100644
--- a/ext/standard/tests/math/mt_rand_basic.phpt
+++ b/ext/standard/tests/math/mt_rand_basic.phpt
@@ -56,15 +56,13 @@ $min = array(true,
false,
null,
"10",
- "0x10",
"10.5");
-// Eexepcted numerical equivalent of above non-numerics
+// Expected numerical equivalent of above non-numerics
$minval = array(1,
0,
0,
10,
- 0,
10);
for ($x = 0; $x < count($min); $x++) {
for ($i = 0; $i < 100; $i++) {
@@ -98,5 +96,4 @@ PASSED range min = 1 max = 100
PASSED range min = 0 max = 100
PASSED range min = 0 max = 100
PASSED range min = 10 max = 100
-PASSED range min = 0 max = 100
PASSED range min = 10 max = 100
diff --git a/ext/standard/tests/math/rand_basic.phpt b/ext/standard/tests/math/rand_basic.phpt
index 525956017e..8dc9fb862c 100644
--- a/ext/standard/tests/math/rand_basic.phpt
+++ b/ext/standard/tests/math/rand_basic.phpt
@@ -56,7 +56,6 @@ $min = array(true,
false,
null,
"10",
- "0x10",
"10.5");
// Eexepcted numerical equivalent of above non-numerics
@@ -64,7 +63,6 @@ $minval = array(1,
0,
0,
10,
- 0,
10);
for ($x = 0; $x < count($min); $x++) {
for ($i = 0; $i < 100; $i++) {
@@ -99,5 +97,4 @@ PASSED range min = 1 max = 100
PASSED range min = 0 max = 100
PASSED range min = 0 max = 100
PASSED range min = 10 max = 100
-PASSED range min = 0 max = 100
PASSED range min = 10 max = 100
diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt
index dd4725f244..d4b94ec056 100644
--- a/ext/standard/tests/math/round_basic.phpt
+++ b/ext/standard/tests/math/round_basic.phpt
@@ -20,8 +20,7 @@ $values = array(123456789,
0x234567,
067777777,
"1.234567",
- "2.3456789e8",
- "0x1234CDEF");
+ "2.3456789e8");
$precision = array(2,
8,
@@ -29,7 +28,6 @@ $precision = array(2,
04,
3.6,
"2",
- "0x03",
"04",
"3.6",
"2.1e1",
@@ -56,7 +54,6 @@ round: 123456789
...with precision 4-> float(123456789)
...with precision 3.6-> float(123456789)
...with precision 2-> float(123456789)
-...with precision 0x03-> float(123456789)
...with precision 04-> float(123456789)
...with precision 3.6-> float(123456789)
...with precision 2.1e1-> float(123456789)
@@ -70,7 +67,6 @@ round: 123.456789
...with precision 4-> float(123.4568)
...with precision 3.6-> float(123.457)
...with precision 2-> float(123.46)
-...with precision 0x03-> float(123.457)
...with precision 04-> float(123.4568)
...with precision 3.6-> float(123.457)
...with precision 2.1e1-> float(123.456789)
@@ -84,7 +80,6 @@ round: -4.5679123
...with precision 4-> float(-4.5679)
...with precision 3.6-> float(-4.568)
...with precision 2-> float(-4.57)
-...with precision 0x03-> float(-4.568)
...with precision 04-> float(-4.5679)
...with precision 3.6-> float(-4.568)
...with precision 2.1e1-> float(-4.5679123)
@@ -98,7 +93,6 @@ round: 12300
...with precision 4-> float(12300)
...with precision 3.6-> float(12300)
...with precision 2-> float(12300)
-...with precision 0x03-> float(12300)
...with precision 04-> float(12300)
...with precision 3.6-> float(12300)
...with precision 2.1e1-> float(12300)
@@ -112,7 +106,6 @@ round: -4567
...with precision 4-> float(-4567)
...with precision 3.6-> float(-4567)
...with precision 2-> float(-4567)
-...with precision 0x03-> float(-4567)
...with precision 04-> float(-4567)
...with precision 3.6-> float(-4567)
...with precision 2.1e1-> float(-4567)
@@ -126,7 +119,6 @@ round: 2311527
...with precision 4-> float(2311527)
...with precision 3.6-> float(2311527)
...with precision 2-> float(2311527)
-...with precision 0x03-> float(2311527)
...with precision 04-> float(2311527)
...with precision 3.6-> float(2311527)
...with precision 2.1e1-> float(2311527)
@@ -140,7 +132,6 @@ round: 14680063
...with precision 4-> float(14680063)
...with precision 3.6-> float(14680063)
...with precision 2-> float(14680063)
-...with precision 0x03-> float(14680063)
...with precision 04-> float(14680063)
...with precision 3.6-> float(14680063)
...with precision 2.1e1-> float(14680063)
@@ -154,7 +145,6 @@ round: 1.234567
...with precision 4-> float(1.2346)
...with precision 3.6-> float(1.235)
...with precision 2-> float(1.23)
-...with precision 0x03-> float(1.235)
...with precision 04-> float(1.2346)
...with precision 3.6-> float(1.235)
...with precision 2.1e1-> float(1.234567)
@@ -168,25 +158,10 @@ round: 2.3456789e8
...with precision 4-> float(234567890)
...with precision 3.6-> float(234567890)
...with precision 2-> float(234567890)
-...with precision 0x03-> float(234567890)
...with precision 04-> float(234567890)
...with precision 3.6-> float(234567890)
...with precision 2.1e1-> float(234567890)
...with precision -> float(234567890)
...with precision 1-> float(234567890)
...with precision -> float(234567890)
-round: 0x1234CDEF
-...with precision 2-> float(305450479)
-...with precision 8-> float(305450479)
-...with precision 3-> float(305450479)
-...with precision 4-> float(305450479)
-...with precision 3.6-> float(305450479)
-...with precision 2-> float(305450479)
-...with precision 0x03-> float(305450479)
-...with precision 04-> float(305450479)
-...with precision 3.6-> float(305450479)
-...with precision 2.1e1-> float(305450479)
-...with precision -> float(305450479)
-...with precision 1-> float(305450479)
-...with precision -> float(305450479)
-===Done=== \ No newline at end of file
+===Done===