Allow to set amount as integer (#179)

* Allow to set amount as integer

Author: barryvdh

src/Common/Message/AbstractRequest.php

@@ -305,17 +305,23 @@ protected function getCurrencies()
     }
 
     /**
+     * @param  string|int|null $amount
      * @return null|Money
      * @throws InvalidRequestException
      */
     private function getMoney($amount = null)
     {
+        $currencyCode = $this->getCurrency() ?: 'USD';
+        $currency = new Currency($currencyCode);
+
         $amount = $amount !== null ? $amount : $this->getParameter('amount');
 
-        if ($amount !== null) {
+        if ($amount === null) {
+            return null;
+        } elseif (is_integer($amount)) {
+            $money = new Money($amount, $currency);
+        } else {
             $moneyParser = new DecimalMoneyParser($this->getCurrencies());
-            $currencyCode = $this->getCurrency() ?: 'USD';
-            $currency = new Currency($currencyCode);
 
             $number = Number::fromString($amount);
 
@@ -327,19 +333,19 @@ private function getMoney($amount = null)
             }
 
             $money = $moneyParser->parse((string) $number, $currency);
+        }
 
-            // Check for a negative amount.
-            if (!$this->negativeAmountAllowed && $money->isNegative()) {
-                throw new InvalidRequestException('A negative amount is not allowed.');
-            }
-
-            // Check for a zero amount.
-            if (!$this->zeroAmountAllowed && $money->isZero()) {
-                throw new InvalidRequestException('A zero amount is not allowed.');
-            }
+        // Check for a negative amount.
+        if (!$this->negativeAmountAllowed && $money->isNegative()) {
+            throw new InvalidRequestException('A negative amount is not allowed.');
+        }
 
-            return $money;
+        // Check for a zero amount.
+        if (!$this->zeroAmountAllowed && $money->isZero()) {
+            throw new InvalidRequestException('A zero amount is not allowed.');
         }
+
+        return $money;
     }
 
     /**
@@ -362,12 +368,12 @@ public function getAmount()
     /**
      * Sets the payment amount.
      *
-     * @param string $value
+     * @param string|null $value
      * @return AbstractRequest Provides a fluent interface
      */
     public function setAmount($value)
     {
-        return $this->setParameter('amount', $value);
+        return $this->setParameter('amount', $value !== null ? (string) $value : null);
     }
 
     /**
@@ -384,6 +390,17 @@ public function getAmountInteger()
         }
     }
 
+    /**
+     * Sets the payment amount as integer.
+     *
+     * @param int $value
+     * @return AbstractRequest Provides a fluent interface
+     */
+    public function setAmountInteger($value)
+    {
+        return $this->setParameter('amount', (int) $value);
+    }
+
     /**
      * Get the payment currency code.
      *
@@ -446,11 +463,12 @@ public function getCurrencyDecimalPlaces()
     /**
      * Format an amount for the payment currency.
      *
+     * @param string $amount
      * @return string
      */
     public function formatCurrency($amount)
     {
-        $money = $this->getMoney($amount);
+        $money = $this->getMoney((string) $amount);
         $formatter = new DecimalMoneyFormatter($this->getCurrencies());
 
         return $formatter->format($money);

tests/Omnipay/Common/Message/AbstractRequestTest.php

@@ -197,6 +197,13 @@ public function testGetAmountInteger()
         $this->assertSame(1366, $this->request->getAmountInteger());
     }
 
+    public function testSetAmountInteger()
+    {
+        $this->assertSame($this->request, $this->request->setAmountInteger(1366));
+        $this->assertSame(1366, $this->request->getAmountInteger());
+        $this->assertSame('13.66', $this->request->getAmount());
+    }
+
     public function testGetAmountIntegerNoDecimals()
     {
         $this->assertSame($this->request, $this->request->setCurrency('JPY'));
@@ -410,6 +417,13 @@ public function testCanValidateExistingParameters()
         $this->assertNull($this->request->validate('testMode', 'token'));
     }
 
+    public function testCanValidateAmountInteger()
+    {
+        $this->request->setAmountInteger(1);
+
+        $this->assertNull($this->request->validate('amount'));
+    }
+
     /**
      * @expectedException \Omnipay\Common\Exception\InvalidRequestException
      */