Drop float support for transferAmount

php-sepa-xml · Jun 19, 2020 · 36b3216 · 36b3216
1 parent e3b77b4
commit 36b3216
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 153 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,5 @@ project.xml
 Session.vim
 bin/
 /vendor/
-composer.lock
+composer.lock
+.phpunit.result.cache
diff --git a/src/TransferInformation/BaseTransferInformation.php b/src/TransferInformation/BaseTransferInformation.php
@@ -43,9 +43,9 @@ class BaseTransferInformation implements TransferInformationInterface
     protected $bic;
 
     /**
-     * Must be between 0.01 and 999999999.99
+     * Amount in cents; must be between 1 and 99999999999
      *
-     * @var string
+     * @var int
      */
     protected $transferAmount;
 
@@ -101,24 +101,12 @@ class BaseTransferInformation implements TransferInformationInterface
     protected $postalAddress;
 
     /**
-     * @param string|int|float $amount If int is provided, the amount should be in cents
-     *                                 If float is provided, the amount will be multiply by 100
-     *                                 If string is provided, it depends on the value
+     * @param int $amount amount in cents
      * @param string $iban
      * @param string $name
-     *
-     * @throws InvalidArgumentException
      */
     public function __construct($amount, $iban, $name)
     {
-        $amount += 0;
-        if (is_float($amount)) {
-            if (!function_exists('bcscale')) {
-                throw new InvalidArgumentException('Using floats for amount is only possible with bcmath enabled');
-            }
-            bcscale(2);
-            $amount = (integer)bcmul(sprintf('%01.4F', $amount), '100');
-        }
         $this->transferAmount = $amount;
         $this->iban = $iban;
         $this->name = StringHelper::sanitizeString($name);
@@ -133,7 +121,7 @@ public function accept(DomBuilderInterface $domBuilder)
     }
 
     /**
-     * @return mixed
+     * @return int
      */
     public function getTransferAmount()
     {

diff --git a/src/TransferInformation/CustomerCreditTransferInformation.php b/src/TransferInformation/CustomerCreditTransferInformation.php
@@ -25,7 +25,7 @@
 class CustomerCreditTransferInformation extends BaseTransferInformation
 {
     /**
-     * @param string $amount
+     * @param int $amount amount in cents
      * @param string $iban
      * @param string $name
      * @param string $identification

diff --git a/src/TransferInformation/CustomerDirectDebitTransferInformation.php b/src/TransferInformation/CustomerDirectDebitTransferInformation.php
@@ -57,7 +57,7 @@ class CustomerDirectDebitTransferInformation extends BaseTransferInformation
     protected $originalMandateId = null;
 
     /**
-     * @param string $amount
+     * @param int $amount amount in cents
      * @param string $iban
      * @param string $name
      * @param string $identification

diff --git a/tests/Functional/CustomerCreditValidationPain00100103Test.php b/tests/Functional/CustomerCreditValidationPain00100103Test.php
@@ -20,7 +20,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Digitick\Sepa\Tests;
+namespace Digitick\Sepa\Tests\Functional;
 
 use Digitick\Sepa\DomBuilder\CustomerCreditTransferDomBuilder;
 use Digitick\Sepa\GroupHeader;
@@ -69,7 +69,7 @@ public function testSinglePaymentSingleTransWithMoreInfo($scenario)
         $groupHeader->setIssuer('Issuing Party');
         $sepaFile = new CustomerCreditTransferFile($groupHeader);
 
-        $transfer = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         if ($scenario['bic'] !== '') {
             $transfer->setBic($scenario['bic']);
         }

diff --git a/tests/Functional/CustomerCreditValidationTest.php b/tests/Functional/CustomerCreditValidationTest.php
@@ -20,7 +20,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Digitick\Sepa\Tests;
+namespace Digitick\Sepa\Tests\Functional;
 
 use Digitick\Sepa\DomBuilder\CustomerCreditTransferDomBuilder;
 use Digitick\Sepa\Exception\InvalidTransferFileConfiguration;
@@ -75,7 +75,7 @@ public function testSinglePaymentSingleTrans($schema)
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerCreditTransferFile($groupHeader);
 
-        $transfer = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setRemittanceInformation('Transaction Description');
         $transfer->setEndToEndIdentification(uniqid());
@@ -111,12 +111,12 @@ public function testSinglePaymentMultiTrans($schema)
         $sepaFile = new CustomerCreditTransferFile($groupHeader);
         $payment = new PaymentInformation('Payment Info ID', 'FR1420041010050500013M02606', 'PSSTFRPPMON', 'My Corp');
 
-        $transfer = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setRemittanceInformation('Transaction description');
         $payment->addTransfer($transfer);
 
-        $transfer = new CustomerCreditTransferInformation('5000.00', 'BE30001216371411', 'GHI Semiconductors');
+        $transfer = new CustomerCreditTransferInformation(500000, 'BE30001216371411', 'GHI Semiconductors');
         $transfer->setBic('DDDDBEBB');
         $transfer->setRemittanceInformation('Transaction description');
         $payment->addTransfer($transfer);
@@ -163,12 +163,12 @@ public function testControlSumAndTransactionCount($schema)
         $sepaFile = new CustomerCreditTransferFile($groupHeader);
         $payment = new PaymentInformation('Payment Info ID', 'FR1420041010050500013M02606', 'PSSTFRPPMON', 'My Corp');
 
-        $transfer = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setRemittanceInformation('Transaction description');
         $payment->addTransfer($transfer);
 
-        $transfer = new CustomerCreditTransferInformation('5000.00', 'BE30001216371411', 'GHI Semiconductors');
+        $transfer = new CustomerCreditTransferInformation(500000, 'BE30001216371411', 'GHI Semiconductors');
         $transfer->setBic('DDDDBEBB');
         $transfer->setRemittanceInformation('Transaction description');
         $payment->addTransfer($transfer);
@@ -205,7 +205,7 @@ public function testPaymentMetaData($schema)
         $payment->setDueDate(new \DateTime('20.11.2012'));
         $payment->setInstructionPriority('NORM');
 
-        $transfer = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setRemittanceInformation('Transaction description');
         $payment->addTransfer($transfer);
@@ -254,7 +254,7 @@ public function testCreditorAddressGeneration(array $address)
         $payment = new PaymentInformation('Payment Info ID', 'FR1420041010050500013M02606', 'PSSTFRPPMON', 'My Corp');
         $payment->setDueDate(new \DateTime('20.11.2012'));
 
-        $transfer = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setRemittanceInformation('Transaction description');
 
@@ -316,12 +316,12 @@ public function testMultiPaymentMultiTrans($schema)
 
         $payment1 = new PaymentInformation('account settlement', 'FR1420041010050500013M02606', 'PSSTFRPPMON', 'My Corp');
 
-        $transfer1 = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer1 = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer1->setBic('OKOYFIHH');
         $transfer1->setRemittanceInformation('Transaction description');
         $payment1->addTransfer($transfer1);
 
-        $transfer2 = new CustomerCreditTransferInformation('5000.00', 'BE30001216371411', 'GHI Semiconductors');
+        $transfer2 = new CustomerCreditTransferInformation(500000, 'BE30001216371411', 'GHI Semiconductors');
         $transfer2->setBic('DDDDBEBB');
         $transfer2->setRemittanceInformation('Transaction description');
         $payment1->addTransfer($transfer2);
@@ -330,12 +330,12 @@ public function testMultiPaymentMultiTrans($schema)
 
         $payment2 = new PaymentInformation('account settlement', 'FR1420041010050500013M02606', 'PSSTFRPPMON', 'My Corp');
 
-        $transfer1 = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer1 = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer1->setBic('OKOYFIHH');
         $transfer1->setRemittanceInformation('Transaction description');
         $payment2->addTransfer($transfer1);
 
-        $transfer2 = new CustomerCreditTransferInformation('5000.00', 'BE30001216371411', 'GHI Semiconductors');
+        $transfer2 = new CustomerCreditTransferInformation(500000, 'BE30001216371411', 'GHI Semiconductors');
         $transfer2->setBic('DDDDBEBB');
         $transfer2->setRemittanceInformation('Transaction description');
         $payment2->addTransfer($transfer2);
@@ -378,7 +378,7 @@ public function testUmlautConversion($schema)
         $payment->setSequenceType(PaymentInformation::S_ONEOFF);
         $payment->setCreditorId('Only A-Z without äöüßÄÖÜ creditorSchemeId');
 
-        $transfer = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Only A-Z without äöüßÄÖÜ creditorName');
+        $transfer = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Only A-Z without äöüßÄÖÜ creditorName');
         $transfer->setBic('OKOYFIHH');
         $transfer->setRemittanceInformation('Only A-Z without äöüßÄÖÜ remittanceInformation');
         $payment->addTransfer($transfer);
@@ -425,7 +425,7 @@ public function testSinglePaymentOtherCreationDateTimeFormat($schema)
         $groupHeader->setCreationDateTimeFormat($dateTimeFormat);
         $sepaFile = new CustomerCreditTransferFile($groupHeader);
 
-        $transfer = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setRemittanceInformation('Transaction Description');
         $transfer->setEndToEndIdentification(uniqid());
@@ -465,7 +465,7 @@ public function testSinglePaymentSingleTransWithoutRemitttanceInformation($schem
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerCreditTransferFile($groupHeader);
 
-        $transfer = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setEndToEndIdentification(uniqid());
         $transfer->setInstructionId(uniqid());
@@ -499,7 +499,7 @@ public function testSinglePaymentSingleTransWithStructuredCreditorReference($sch
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerCreditTransferFile($groupHeader);
 
-        $transfer = new CustomerCreditTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerCreditTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setEndToEndIdentification(uniqid());
         $transfer->setInstructionId(uniqid());

diff --git a/tests/Functional/CustomerDirectDebitValidationPain00800302Test.php b/tests/Functional/CustomerDirectDebitValidationPain00800302Test.php
@@ -20,7 +20,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Digitick\Sepa\Tests;
+namespace Digitick\Sepa\Tests\Functional;
 
 use Digitick\Sepa\DomBuilder\CustomerDirectDebitTransferDomBuilder;
 use Digitick\Sepa\Exception\InvalidTransferFileConfiguration;
@@ -63,7 +63,7 @@ public function test_given_country_is_returned_For_path()
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerDirectDebitTransferFile($groupHeader);
 
-        $transfer = new CustomerDirectDebitTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerDirectDebitTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setMandateSignDate(new \DateTime('16.08.2013'));
         $transfer->setMandateId('ABCDE');
         $transfer->setRemittanceInformation('Transaction Description');
@@ -109,7 +109,7 @@ public function test_multiple_address_lines_are_added_with_array()
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerDirectDebitTransferFile($groupHeader);
 
-        $transfer = new CustomerDirectDebitTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerDirectDebitTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setMandateSignDate(new \DateTime('16.08.2013'));
         $transfer->setMandateId('ABCDE');
         $transfer->setRemittanceInformation('Transaction Description');
@@ -153,7 +153,7 @@ public function testValidationFailureSeqType()
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerDirectDebitTransferFile($groupHeader);
 
-        $transfer = new CustomerDirectDebitTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerDirectDebitTransferInformation(2, 'FI1350001540000056', 'Their Corp');
 
         $payment = new PaymentInformation('Payment Info ID', 'FR1420041010050500013M02606', 'PSSTFRPPMON', 'My Corp');
         $payment->addTransfer($transfer);
@@ -172,7 +172,7 @@ public function testValidationFailureCreditorId()
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerDirectDebitTransferFile($groupHeader);
 
-        $transfer = new CustomerDirectDebitTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerDirectDebitTransferInformation(2, 'FI1350001540000056', 'Their Corp');
 
         $payment = new PaymentInformation('Payment Info ID', 'FR1420041010050500013M02606', 'PSSTFRPPMON', 'My Corp');
         $payment->setSequenceType(PaymentInformation::S_ONEOFF);

diff --git a/tests/Functional/CustomerDirectDebitValidationTest.php b/tests/Functional/CustomerDirectDebitValidationTest.php
@@ -20,7 +20,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Digitick\Sepa\Tests;
+namespace Digitick\Sepa\Tests\Functional;
 
 use Digitick\Sepa\DomBuilder\CustomerDirectDebitTransferDomBuilder;
 use Digitick\Sepa\Exception\InvalidTransferFileConfiguration;
@@ -72,7 +72,7 @@ public function testSinglePaymentSingleTrans($schema)
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerDirectDebitTransferFile($groupHeader);
 
-        $transfer = new CustomerDirectDebitTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerDirectDebitTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setMandateSignDate(new \DateTime('16.08.2013'));
         $transfer->setMandateId('ABCDE');
@@ -108,7 +108,7 @@ public function testSinglePaymentSingleTransWithStructuredCreditorReference($sch
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerDirectDebitTransferFile($groupHeader);
 
-        $transfer = new CustomerDirectDebitTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerDirectDebitTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setMandateSignDate(new \DateTime('16.08.2013'));
         $transfer->setMandateId('ABCDE');
@@ -157,7 +157,7 @@ public function testValidationFailureSeqType($schema)
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerDirectDebitTransferFile($groupHeader);
 
-        $transfer = new CustomerDirectDebitTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerDirectDebitTransferInformation(2, 'FI1350001540000056', 'Their Corp');
 
         $payment = new PaymentInformation('Payment Info ID', 'FR1420041010050500013M02606', 'PSSTFRPPMON', 'My Corp');
         $payment->addTransfer($transfer);
@@ -181,7 +181,7 @@ public function testValidationFailureCreditorId($schema)
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerDirectDebitTransferFile($groupHeader);
 
-        $transfer = new CustomerDirectDebitTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerDirectDebitTransferInformation(2, 'FI1350001540000056', 'Their Corp');
 
         $payment = new PaymentInformation('Payment Info ID', 'FR1420041010050500013M02606', 'PSSTFRPPMON', 'My Corp');
         $payment->setSequenceType(PaymentInformation::S_ONEOFF);
@@ -209,7 +209,7 @@ public function testUmlautConversion($schema)
         $payment->setSequenceType(PaymentInformation::S_ONEOFF);
         $payment->setCreditorId('Only A-Z without äöüßÄÖÜ creditorSchemeId');
 
-        $transfer = new CustomerDirectDebitTransferInformation('0.02', 'FI1350001540000056', 'Only A-Z without äöüßÄÖÜ debtorName');
+        $transfer = new CustomerDirectDebitTransferInformation(2, 'FI1350001540000056', 'Only A-Z without äöüßÄÖÜ debtorName');
         $transfer->setBic('OKOYFIHH');
         $transfer->setRemittanceInformation('Only A-Z without äöüßÄÖÜ remittanceInformation');
         $transfer->setMandateSignDate(new \DateTime());
@@ -264,7 +264,7 @@ public function testDomBuilderAcceptsPainFormatAsConstructor($scenario)
         $groupHeader = new GroupHeader('transferID', 'Me');
         $sepaFile = new CustomerDirectDebitTransferFile($groupHeader);
 
-        $transfer = new CustomerDirectDebitTransferInformation('0.02', 'FI1350001540000056', 'Their Corp');
+        $transfer = new CustomerDirectDebitTransferInformation(2, 'FI1350001540000056', 'Their Corp');
         $transfer->setBic('OKOYFIHH');
         $transfer->setMandateSignDate(new \DateTime('16.08.2013'));
         $transfer->setMandateId('ABCDE');

diff --git a/tests/Unit/TransferFile/Facade/CustomerCreditFacadeTest.php b/tests/Unit/TransferFile/Facade/CustomerCreditFacadeTest.php
@@ -36,7 +36,7 @@ public function testValidFileCreationWithFacade($schema)
         $credit->addTransfer(
             'firstPayment',
             array(
-                'amount' => '500',
+                'amount' => 500,
                 'creditorIban' => 'FI1350001540000056',
                 'creditorBic' => 'OKOYFIHH',
                 'creditorName' => 'Their Company',
@@ -73,7 +73,7 @@ public function testValidFileCreationWithFacadeWithoutDebtorBic($schema)
         $credit->addTransfer(
             'firstPayment',
             array(
-                'amount' => '500',
+                'amount' => 500,
                 'creditorIban' => 'FI1350001540000056',
                 'creditorName' => 'Their Company',
                 'remittanceInformation' => 'Purpose of this credit'