Fix tests

Author: amouhzi

lib/Money/CurrencyPair.php

@@ -75,7 +75,7 @@ public function convert(Money $money)
         }
 
         // @todo add rounding mode?
-        return new Money((int) round($money->getAmount() * $this->ratio), $this->counterCurrency);
+        return new Money((float) round($money->getAmount() * $this->ratio), $this->counterCurrency);
     }
 
     /** @return \Money\Currency */

lib/Money/Money.php

@@ -10,6 +10,12 @@
 
 namespace Money;
 
+/**
+ * Class Money
+ * @package Money
+ * @method static Money EUR(float $amount) Create a Money object with EUR currency.
+ * @method static Money USD(float $amount) Create a Money object with USD currency.
+ */
 class Money
 {
     const ROUND_HALF_UP = PHP_ROUND_HALF_UP;
@@ -27,14 +33,14 @@ class Money
 
     /**
      * Create a Money instance
-     * @param  float $amount    Amount
+     * @param  int|float $amount    Amount
      * @param  \Money\Currency $currency
      * @throws \Money\InvalidArgumentException
      */
     public function __construct($amount, Currency $currency)
     {
-        if (!is_float($amount)) {
-            throw new InvalidArgumentException("The first parameter of Money must be a float.");
+        if (!is_numeric($amount)) {
+            throw new InvalidArgumentException("The first parameter of Money must be numeric.");
         }
         $this->amount = $amount;
         $this->currency = $currency;
@@ -49,7 +55,7 @@ public function __construct($amount, Currency $currency)
      */
     public static function __callStatic($method, $arguments)
     {
-        return new Money($arguments[0], new Currency($method));
+        return new Money((float) $arguments[0], new Currency($method));
     }
 
     /**
@@ -243,7 +249,7 @@ public function allocate(array $ratios)
     /** @return bool */
     public function isZero()
     {
-        return $this->amount === 0;
+        return $this->amount == 0;
     }
 
     /** @return bool */
@@ -277,21 +283,6 @@ public static function stringToUnits( $string )
         return (int) $units;
     }
 
-    public function format()
-    {
-        return '$' . number_format($this->getAmount() / 100, 2);
-    }
-
-    /**
-     * Convert into formatted amount (hardcoded to USD for the time being).
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return number_format($this->getAmount() / 100, 2);
-    }
-
     /**
      * Extracts a formatted money string.
      * @example echo Money::USD(500)->formattedString();
@@ -328,18 +319,13 @@ public function formattedString()
         return $prefix . $value . $suffix;
     }
 
-    public function format()
-    {
-        return '$' . number_format($this->getAmount() / 100, 2);
-    }
-
     /**
      * Convert into formatted amount (hardcoded to USD for the time being).
      *
      * @return string
      */
     public function __toString()
     {
-        return number_format($this->getAmount() / 100, 2);
+        return $this->formattedString();
     }
 }

tests/Money/Tests/MoneyTest.php

@@ -36,19 +36,11 @@ public function testGetters()
     }
 
     /**
-     * @expectedException Money\InvalidArgumentException
-     */
-    public function testDecimalsThrowException()
-    {
-        $money = new Money(0.01, new Currency('EUR'));
-    }
-
-    /**
-     * @expectedException Money\InvalidArgumentException
+     * @expectedException \Money\InvalidArgumentException
      */
     public function testStringThrowsException()
     {
-        $money = new Money('100', new Currency('EUR'));
+        new Money('f100', new Currency('EUR'));
     }
 
     public function testEquality()
@@ -78,7 +70,7 @@ public function testAddition()
     }
 
     /**
-     * @expectedException Money\InvalidArgumentException
+     * @expectedException \Money\InvalidArgumentException
      */
     public function testDifferentCurrenciesCannotBeAdded()
     {
@@ -102,7 +94,7 @@ public function testSubtraction()
     }
 
     /**
-     * @expectedException Money\InvalidArgumentException
+     * @expectedException \Money\InvalidArgumentException
      */
     public function testDifferentCurrenciesCannotBeSubtracted()
     {
@@ -149,7 +141,7 @@ public function testComparison()
     {
         $euro1 = new Money(1, new Currency('EUR'));
         $euro2 = new Money(2, new Currency('EUR'));
-        $usd = new Money(1, new Currency('USD'));
+        // TODO $usd = new Money(1, new Currency('USD'));
 
         $this->assertTrue($euro2->greaterThan($euro1));
         $this->assertFalse($euro1->greaterThan($euro2));
@@ -162,7 +154,7 @@ public function testComparison()
     }
 
     /**
-     * @expectedException Money\InvalidArgumentException
+     * @expectedException \Money\InvalidArgumentException
      */
     public function testDifferentCurrenciesCannotBeCompared()
     {