Pass amount as decimal instead of integer

Author: amacneil

src/Omnipay/Common/Message/AbstractRequest.php

@@ -163,22 +163,31 @@ public function setCardReference($value)
 
     public function getAmount()
     {
-        return $this->getParameter('amount');
+        $amount = $this->getParameter('amount');
+        if ($amount) {
+            if (!is_float($amount) &&
+                $this->getCurrencyDecimalPlaces() > 0 &&
+                false === strpos((string) $amount, '.')) {
+                throw new InvalidRequestException("Please specify amount as a string or float, with decimal places (e.g. '10.00' to represent $10.00).");
+            }
+
+            return number_format(
+                $amount,
+                $this->getCurrencyDecimalPlaces(),
+                '.',
+                ''
+            );
+        }
     }
 
     public function setAmount($value)
     {
-        return $this->setParameter('amount', (int) $value);
+        return $this->setParameter('amount', $value);
     }
 
-    public function getAmountDecimal()
+    public function getAmountInteger()
     {
-        return number_format(
-            $this->getAmount() / $this->getCurrencyDecimalFactor(),
-            $this->getCurrencyDecimalPlaces(),
-            '.',
-            ''
-        );
+        return (int) round($this->getAmount() * $this->getCurrencyDecimalFactor());
     }
 
     public function getCurrency()

tests/Omnipay/Common/Message/AbstractRequestTest.php

@@ -25,8 +25,8 @@ public function setUp()
 
     public function testInitializeWithParams()
     {
-        $this->assertSame($this->request, $this->request->initialize(array('amount' => 123)));
-        $this->assertSame(123, $this->request->getAmount());
+        $this->assertSame($this->request, $this->request->initialize(array('amount' => '1.23')));
+        $this->assertSame('1.23', $this->request->getAmount());
     }
 
     public function testCard()
@@ -61,27 +61,67 @@ public function testCardReference()
 
     public function testAmount()
     {
-        $this->assertSame($this->request, $this->request->setAmount(200));
-        $this->assertSame(200, $this->request->getAmount());
+        $this->assertSame($this->request, $this->request->setAmount('2.00'));
+        $this->assertSame('2.00', $this->request->getAmount());
     }
 
-    public function testAmountCastsToInteger()
+    public function testAmountWithFloat()
     {
-        $this->assertSame($this->request, $this->request->setAmount('6.1'));
-        $this->assertSame(6, $this->request->getAmount());
+        $this->assertSame($this->request, $this->request->setAmount(2.0));
+        $this->assertSame('2.00', $this->request->getAmount());
     }
 
-    public function testGetAmountDecimal()
+    public function testAmountWithEmpty()
     {
-        $this->assertSame($this->request, $this->request->setAmount(1366));
-        $this->assertSame('13.66', $this->request->getAmountDecimal());
+        $this->assertSame($this->request, $this->request->setAmount(null));
+        $this->assertSame(null, $this->request->getAmount());
     }
 
-    public function testGetAmountDecimalNoDecimals()
+    public function testGetAmountNoDecimals()
     {
         $this->assertSame($this->request, $this->request->setCurrency('JPY'));
-        $this->assertSame($this->request, $this->request->setAmount(1366));
-        $this->assertSame('1366', $this->request->getAmountDecimal());
+        $this->assertSame($this->request, $this->request->setAmount('1366'));
+        $this->assertSame('1366', $this->request->getAmount());
+    }
+
+    public function testGetAmountNoDecimalsRounding()
+    {
+        $this->assertSame($this->request, $this->request->setAmount('136.5'));
+        $this->assertSame($this->request, $this->request->setCurrency('JPY'));
+        $this->assertSame('137', $this->request->getAmount());
+    }
+
+    /**
+     * @expectedException Omnipay\Common\Exception\InvalidRequestException
+     */
+    public function testAmountWithIntThrowsException()
+    {
+        // ambiguous value, avoid errors upgrading from v0.9
+        $this->assertSame($this->request, $this->request->setAmount(10));
+        $this->request->getAmount();
+    }
+
+    /**
+     * @expectedException Omnipay\Common\Exception\InvalidRequestException
+     */
+    public function testAmountWithIntStringThrowsException()
+    {
+        // ambiguous value, avoid errors upgrading from v0.9
+        $this->assertSame($this->request, $this->request->setAmount('10'));
+        $this->request->getAmount();
+    }
+
+    public function testGetAmountInteger()
+    {
+        $this->assertSame($this->request, $this->request->setAmount('13.66'));
+        $this->assertSame(1366, $this->request->getAmountInteger());
+    }
+
+    public function testGetAmountIntegerNoDecimals()
+    {
+        $this->assertSame($this->request, $this->request->setCurrency('JPY'));
+        $this->assertSame($this->request, $this->request->setAmount('1366'));
+        $this->assertSame(1366, $this->request->getAmountInteger());
     }
 
     public function testCurrency()