allow exponential float format, closes #1

ntzm · Jun 22, 2019 · b4fb754 · b4fb754
1 parent 996712d
commit b4fb754
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/functions.php b/src/functions.php
@@ -67,7 +67,8 @@ function toInt($value): int {
 
 /** @throws Uncastable */
 function stringToFloat(string $string): float {
-    if (preg_match('/^-?\d+(\.\d+)?$/', $string) === 1) {
+    // is_numeric allows leading whitespace, but we don't want to allow that
+    if (is_numeric($string) && ! ctype_space($string[0] ?? null)) {
         return (float) $string;
     }
 

diff --git a/tests/StringToFloatTest.php b/tests/StringToFloatTest.php
@@ -24,6 +24,10 @@ public function provideCastable(): Generator
         yield [2.0, '2'];
         yield [-5.0, '-5'];
         yield [0.0, '0'];
+        yield [0.1, '.1'];
+        yield [1.0, '1.'];
+        yield [1.2e3, '1.2e3'];
+        yield [7E-10, '7E-10'];
     }
 
     /** @dataProvider provideUncastable */
@@ -41,7 +45,7 @@ public function provideUncastable(): Generator
         yield [' 1.1 '];
         yield ['1.1 '];
         yield ['1.1.1'];
-        yield ['1.'];
-        yield ['.1'];
+        yield ['0xf4c3b00c'];
+        yield ['0b10100111001'];
     }
 }
diff --git a/tests/ToFloatTest.php b/tests/ToFloatTest.php
@@ -30,6 +30,10 @@ public function provideCastable(): Generator
         yield [5.0, 5];
         yield [0.0, []];
         yield [1.0, ['hello']];
+        yield [0.1, '.1'];
+        yield [1.0, '1.'];
+        yield [1.2e3, '1.2e3'];
+        yield [7E-10, '7E-10'];
     }
 
     /** @dataProvider provideUncastable */
@@ -47,7 +51,7 @@ public function provideUncastable(): Generator
         yield [' 1.1 '];
         yield ['1.1 '];
         yield ['1.1.1'];
-        yield ['1.'];
-        yield ['.1'];
+        yield ['0xf4c3b00c'];
+        yield ['0b10100111001'];
     }
 }