Merge pull request #9 from silentvick/fix/zero-exponent

Fix #7: leading zero in exponent and zero exponent

Author: castarco

src/Decimal.php

@@ -177,7 +177,7 @@ public static function fromString($strValue, $scale = null)
                 max(0, strlen($captures[4])-1) :
                 0;
 
-        } elseif (preg_match('/([+\-]?)0*([0-9](\.[0-9]+)?)[eE]([+\-]?)([1-9][0-9]*)/', $strValue, $captures) === 1) {
+        } elseif (preg_match('/([+\-]?)0*([0-9](\.[0-9]+)?)[eE]([+\-]?)(\d+)/', $strValue, $captures) === 1) {
 
             $mantissa_scale = max(strlen($captures[3])-1, 0);
 

tests/Decimal/DecimalFromStringTest.php

@@ -89,6 +89,20 @@ public function testExponentialNotation_With_PositiveSign()
         );
     }
 
+    public function testExponentialNotation_With_LeadingZero_in_ExponentPart()
+    {
+        $this->assertTrue(
+            Decimal::fromString('1.048576E+06')->equals(Decimal::fromString('1.048576e6'))
+        );
+    }
+
+    public function testExponentialNotation_With_ZeroExponent()
+    {
+        $this->assertTrue(
+            Decimal::fromString('3.14E+00')->equals(Decimal::fromString('3.14'))
+        );
+    }
+
     /**
      * @expectedException Litipk\Exceptions\InvalidArgumentTypeException
      * @expectedExceptionMessage $strVlue must be of type string.