Removing trailing zeros in the internal representation when it's possible

Author: castarco

src/Decimal.php

@@ -92,12 +92,11 @@ public static function create($value, $scale = null)
 
     /**
      * @param  integer $intValue
-     * @param  integer $scale
      * @return Decimal
      */
-    public static function fromInteger($intValue, $scale = null)
+    public static function fromInteger($intValue)
     {
-        self::paramsValidation($intValue, $scale);
+        self::paramsValidation($intValue, null);
 
         if (!is_int($intValue)) {
             throw new InvalidArgumentTypeException(
@@ -107,10 +106,7 @@ public static function fromInteger($intValue, $scale = null)
             );
         }
 
-        return new Decimal(
-            $scale === null ? (string)$intValue : bcadd((string)$intValue, '0', $scale),
-            $scale === null ? 0 : $scale
-        );
+        return new Decimal((string)$intValue, 0);
     }
 
     /**
@@ -140,14 +136,10 @@ public static function fromFloat($fltValue, $scale = null)
             );
         }
 
-        $dec_scale = $scale === null ?
-            8 :
-            $scale;
+        $dec_scale = $scale === null ? 8 : $scale;
+        $strValue = self::floatToString($fltValue, $dec_scale);
 
-        return new Decimal(
-            number_format($fltValue, $dec_scale, '.', ''),
-            $dec_scale
-        );
+        return new Decimal($strValue, $dec_scale);
     }
 
     /**
@@ -981,8 +973,24 @@ private static function normalizeSign($sign)
         return $sign;
     }
 
+    private static function floatToString($fltValue, &$scale)
+    {
+        $strValue = number_format($fltValue, $scale, '.', '');
+
+        preg_match('/^[+\-]?[0-9]+(\.([0-9]*[1-9])?(0+)?)?$/', $strValue, $captures);
+
+        if (count($captures) === 4) {
+            $toRemove = strlen($captures[3]);
+            $scale -= $toRemove;
+            $strValue = substr($strValue, 0, strlen($strValue)-$toRemove-($scale===0 ? 1 : 0));
+        }
+
+        return $strValue;
+    }
+
     /**
-     * Counts the number of significative digits of $val
+     * Counts the number of significative digits of $val.
+     * Assumes a consistent internal state (without zeros at the end or the start).
      *
      * @param  Decimal $val
      * @param  Decimal $abs $val->abs()

tests/Decimal/DecimalInternalValidationTest.php

@@ -23,7 +23,7 @@ public function testConstructorNullValueValidation()
      */
     public function testConstructorNegativeScaleValidation()
     {
-        Decimal::fromInteger(25, -15);
+        Decimal::fromString("25", -15);
     }
 
     /**
@@ -32,7 +32,7 @@ public function testConstructorNegativeScaleValidation()
      */
     public function testConstructorNotIntegerScaleValidation()
     {
-        Decimal::fromInteger(25, "hola mundo");
+        Decimal::fromString("25", "hola mundo");
     }
 
     /**