PHPSDK-134: Fix errors when only reference is set, within the CustomerDetails object (#337)

Author: danielcivit

src/Api/Transactions/OrderRequest.php

@@ -473,14 +473,14 @@ public function getData(): array
      */
     protected function validate(array $data): bool
     {
-        if (!$data['plugin']) {
-            throw new InvalidArgumentException('Required plugin details are missing');
-        }
-
         if ($this->strictMode) {
             (new TotalAmountValidator())->validate($data);
         }
 
+        if (!$data['plugin']) {
+            throw new InvalidArgumentException('Required plugin details are missing');
+        }
+
         return true;
     }
 }

src/Api/Transactions/OrderRequest/Arguments/CustomerDetails.php

@@ -54,23 +54,23 @@ public function getData(): array
     {
         $address = $this->getAddress();
         $data = [
-            'firstname' => $this->getFirstName(),
-            'lastname' => $this->getLastName(),
-            'company_name' => $this->getCompanyName(),
-            'address1' => $address->getStreetName(),
-            'address2' => $address->getStreetNameAdditional(),
-            'house_number' => $this->getHouseNumber(),
-            'zip_code' => $address->getZipCode(),
-            'city' => $address->getCity(),
-            'state' => $address->getState(),
-            'country' => $address->getCountry() ? $address->getCountry()->getCode() : null,
+            'firstname' => $this->getFirstName() ?: null,
+            'lastname' => $this->getLastName() ?: null,
+            'company_name' => $this->getCompanyName() ?: null,
+            'address1' => $address ? $address->getStreetName() : null,
+            'address2' => $address ? $address->getStreetNameAdditional() : null,
+            'house_number' => $address ? $this->getHouseNumber() : null,
+            'zip_code' => $address ? $address->getZipCode() : null,
+            'city' => $address ? $address->getCity() : null,
+            'state' => $address ? $address->getState() : null,
+            'country' => $this->getCountryCode() ? $this->getCountryCode() : null,
             'phone' => $this->getPhoneNumber() ? $this->getPhoneNumber()->get() : null,
             'email' => $this->getEmailAddress() ? $this->getEmailAddress()->get() : null,
             'ip_address' => $this->getIpAddress() ? $this->getIpAddress()->get() : null,
             'locale' => $this->getLocale(),
-            'referrer' => $this->getReferrer(),
+            'referrer' => $this->getReferrer() ?: null,
             'forwarded_ip' => $this->getForwardedIp() ? $this->getForwardedIp()->get() : null,
-            'user_agent' => $this->getUserAgent(),
+            'user_agent' => $this->getUserAgent() ?: null,
             'reference' => $this->reference,
         ];
 
@@ -187,6 +187,20 @@ private function getHouseNumber(): string
         return $houseNumber;
     }
 
+    /**
+     * @return string|null
+     */
+    private function getCountryCode(): ?string
+    {
+        $address = $this->getAddress();
+
+        if (!$address) {
+            return null;
+        }
+
+        return $address->getCountry() ? $address->getCountry()->getCode(): null;
+    }
+
     /**
      * @param string $reference
      * @return $this

src/ValueObject/Customer.php

@@ -155,23 +155,23 @@ public function addPhoneNumberAsString(string $phoneNumber): Customer
     }
 
     /**
-     * @return IpAddress
+     * @return IpAddress|null
      */
     public function getIpAddress(): ?IpAddress
     {
         return $this->ipAddress;
     }
 
     /**
-     * @return EmailAddress
+     * @return EmailAddress|null
      */
     public function getEmailAddress(): ?EmailAddress
     {
         return $this->emailAddress;
     }
 
     /**
-     * @return Address
+     * @return Address|null
      */
     public function getAddress(): ?Address
     {
@@ -203,7 +203,7 @@ public function getCompanyName(): string
     }
 
     /**
-     * @return PhoneNumber
+     * @return PhoneNumber|null
      */
     public function getPhoneNumber(): ?PhoneNumber
     {

tests/Unit/Api/Transactions/OrderRequestTest.php

@@ -142,4 +142,19 @@ public function testRequestOrderWithTerminalId()
         $this->assertArrayHasKey('terminal_id', $data['gateway_info']);
         $this->assertEquals('terminal-id', $data['gateway_info']['terminal_id']);
     }
+
+    /**
+     * Test if we can add a customer object, only setting up the reference, and get the Order Request
+     */
+    public function testCreateAndAddCustomerReference()
+    {
+        $orderRequest = $this->createIdealOrderRedirectRequestFixture();
+        $customer = (new OrderRequest\Arguments\CustomerDetails())->addReference('customer-reference');
+        $orderRequest->addCustomer($customer);
+        $data = $orderRequest->getData();
+        $this->assertIsArray($data['customer']);
+        $this->assertEquals(2, count($data['customer']));
+        $this->assertEquals('customer-reference', $data['customer']['reference']);
+        $this->assertArrayNotHasKey('address1', $data['customer']);
+    }
 }