Merge pull request #116 from archin-software/bug/consumer-attribute-default

Twinfield expects string representation of boolean ("true"/"false")

Author: Willem Stuursma-Ruwen

src/CustomerAddress.php

@@ -53,12 +53,19 @@ public function setType($type)
         return $this;
     }
 
-    public function getDefault()
+    /**
+     * @return bool
+     */
+    public function getDefault() : bool
     {
         return $this->default;
     }
 
-    public function setDefault($default)
+    /**
+     * @param bool $default
+     * @return $this
+     */
+    public function setDefault(bool $default)
     {
         $this->default = $default;
         return $this;

src/CustomerBank.php

@@ -39,12 +39,19 @@ public function setID($ID)
         return $this;
     }
 
-    public function getDefault()
+    /**
+     * @return bool
+     */
+    public function getDefault() : bool
     {
         return $this->default;
     }
 
-    public function setDefault($default)
+    /**
+     * @param bool $default
+     * @return $this
+     */
+    public function setDefault(bool $default)
     {
         $this->default = $default;
         return $this;

src/DomDocuments/CustomersDocument.php

@@ -2,6 +2,7 @@
 namespace PhpTwinfield\DomDocuments;
 
 use PhpTwinfield\Customer;
+use PhpTwinfield\CustomerAddress;
 use PhpTwinfield\CustomerBank;
 use PhpTwinfield\Util;
 
@@ -201,14 +202,15 @@ public function addCustomer(Customer $customer): void
             $customerEl->appendChild($addressesElement);
 
             // Go through each address assigned to the customer
+            /** @var CustomerAddress $address */
             foreach ($addresses as $address) {
 
                 // Makes new address element
                 $addressElement = $this->createElement('address');
                 $addressesElement->appendChild($addressElement);
 
                 // Set attributes
-                $addressElement->setAttribute('default', $address->getDefault());
+                $addressElement->setAttribute('default', Util::formatBoolean($address->getDefault()));
                 $addressElement->setAttribute('type', $address->getType());
 
                 // Go through each address element and use the assigned method
@@ -257,7 +259,7 @@ public function addCustomer(Customer $customer): void
                 $banksElement->appendChild($bankElement);
 
                 // Set attributes
-                $bankElement->setAttribute('default', $bank->getDefault());
+                $bankElement->setAttribute('default', Util::formatBoolean($bank->getDefault()));
 
                 // Go through each bank element and use the assigned method
                 foreach ($bankTags as $tag => $method) {

src/Mappers/CustomerMapper.php

@@ -4,7 +4,9 @@
 use PhpTwinfield\Customer;
 use PhpTwinfield\CustomerAddress;
 use PhpTwinfield\CustomerBank;
+use PhpTwinfield\Exception;
 use PhpTwinfield\Response\Response;
+use PhpTwinfield\Util;
 
 /**
  * Maps a response DOMDocument to the corresponding entity.
@@ -22,6 +24,7 @@ class CustomerMapper extends BaseMapper
      * @access public
      * @param \PhpTwinfield\Response\Response $response
      * @return Customer
+     * @throws Exception
      */
     public static function map(Response $response)
     {
@@ -180,7 +183,7 @@ public static function map(Response $response)
                 $temp_address
                     ->setID($addressDOM->getAttribute('id'))
                     ->setType($addressDOM->getAttribute('type'))
-                    ->setDefault($addressDOM->getAttribute('default'));
+                    ->setDefault(Util::parseBoolean($addressDOM->getAttribute('default')));
 
                 // Loop through the element tags. Determine if it exists and set it if it does
                 foreach ($addressTags as $tag => $method) {
@@ -233,7 +236,7 @@ public static function map(Response $response)
                 // Set the attributes ( id, default )
                 $temp_bank
                     ->setID($bankDOM->getAttribute('id'))
-                    ->setDefault($bankDOM->getAttribute('default'));
+                    ->setDefault(Util::parseBoolean($bankDOM->getAttribute('default')));
 
                 // Loop through the element tags. Determine if it exists and set it if it does
                 foreach ($bankTags as $tag => $method) {

tests/IntegrationTests/CustomerIntegrationTest.php

@@ -78,7 +78,7 @@ public function testGetCustomerWorks()
 
         $this->assertSame('1', $address->getID());
         $this->assertSame('invoice', $address->getType());
-        $this->assertSame('true', $address->getDefault());
+        $this->assertSame(true, $address->getDefault());
         $this->assertSame('Customer 0', $address->getName());
         $this->assertSame('NL', $address->getCountry());
         $this->assertSame('Place', $address->getCity());
@@ -103,7 +103,7 @@ public function testGetCustomerWorks()
         $bank = $banks['-1'];
 
         $this->assertSame('-1', $bank->getID());
-        $this->assertSame('true', $bank->getDefault());
+        $this->assertSame(true, $bank->getDefault());
         $this->assertSame('Customer 1', $bank->getAscription());
         $this->assertSame('123456789', $bank->getAccountnumber());
         $this->assertSame('ABN Amro', $bank->getBankname());
@@ -178,7 +178,7 @@ public function testSendCustomerWorks()
         $address = new CustomerAddress();
         $address->setID('1');
         $address->setType('invoice');
-        $address->setDefault('true');
+        $address->setDefault(true);
         $address->setName('Customer 0');
         $address->setCountry('NL');
         $address->setCity('Place');
@@ -192,7 +192,7 @@ public function testSendCustomerWorks()
         $customer->addAddress($address);
 
         $bank = new CustomerBank();
-        $bank->setDefault('true');
+        $bank->setDefault(true);
         $bank->setAscription('Customer 1');
         $bank->setAccountnumber('123456789');
         $bank->setAddressField2('');

tests/UnitTests/DomDocuments/CustomersDocumentUnitTest.php

@@ -127,7 +127,7 @@ public function testXmlIsCreatedPerSpec()
             <comment>comment    comment</comment>
         </creditmanagement>
         <addresses>
-            <address default="1" type="invoice">
+            <address default="true" type="invoice">
                 <name>My Address</name>
                 <contact>My Contact</contact>
                 <country>nl</country>
@@ -145,7 +145,7 @@ public function testXmlIsCreatedPerSpec()
             </address>
         </addresses>
         <banks>
-            <bank default="1">
+            <bank default="true">
                 <ascription>ascriptor</ascription>
                 <accountnumber>account number</accountnumber>
                 <bankname>bank name</bankname>