Simplified Decimal::fromString

Author: castarco

src/Decimal.php

@@ -186,8 +186,8 @@ public static function fromString($strValue, $scale = null)
         if (preg_match('/^([+\-]?)0*(([1-9][0-9]*|[0-9])(\.[0-9]+)?)$/', $strValue, $captures) === 1) {
 
             // Now it's time to strip leading zeros in order to normalize inner values
-            $sign      = ($captures[1]==='') ? '+' : $captures[1];
-            $value     =  $captures[2];
+            $sign      = $captures[1];
+            $value     = $sign . $captures[2];
 
             $dec_scale = $scale !== null ?
                 $scale :
@@ -196,7 +196,7 @@ public static function fromString($strValue, $scale = null)
         } elseif (preg_match('/([+\-]?)([0-9](\.[0-9]+)?)[eE]([+\-]?)([1-9][0-9]*)/', $strValue, $captures) === 1) {
 
             // Now it's time to "unroll" the exponential notation to basic positional notation
-            $sign     = ($captures[1]==='') ? '+' : $captures[1];
+            $sign     = $captures[1];
             $mantissa = $captures[2];
 
             $mantissa_scale = strlen($captures[3]) > 0 ? strlen($captures[3])-1 : 0;
@@ -212,7 +212,7 @@ public static function fromString($strValue, $scale = null)
                 $tmp_multiplier = bcpow(10, -$exp_val, $exp_val);
             }
 
-            $value     = bcmul($mantissa, $tmp_multiplier, max($min_scale, $scale !== null ? $scale : 0));
+            $value     = $sign . bcmul($mantissa, $tmp_multiplier, max($min_scale, $scale !== null ? $scale : 0));
             $dec_scale = $scale !== null ? $scale : $min_scale;
 
         } else {
@@ -221,10 +221,6 @@ public static function fromString($strValue, $scale = null)
             );
         }
 
-        if ($sign === '-') {
-            $value = '-'.$value;
-        }
-
         if ($scale !== null) {
             $value = self::innerRound($value, $scale);
         }