From 82e868590a94344468e11b175cac620caf2cac4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Samotn=C3=BD?= Date: Fri, 19 Dec 2025 15:36:50 +0100 Subject: [PATCH 1/2] triv: make address fields nullable as default --- lib/Model/Address.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/Model/Address.php b/lib/Model/Address.php index 1a319fe..93418fb 100644 --- a/lib/Model/Address.php +++ b/lib/Model/Address.php @@ -10,27 +10,27 @@ namespace Raiaccept\RaiacceptApiClient\Model; class Address { - public string $addressStreet1; - public string $addressStreet2; - public string $addressStreet3; - public string $city; - public string $country; - public string $firstName; - public string $lastName; - public string $postalCode; - public string $state; + public ?string $addressStreet1; + public ?string $addressStreet2; + public ?string $addressStreet3; + public ?string $city; + public ?string $country; + public ?string $firstName; + public ?string $lastName; + public ?string $postalCode; + public ?string $state; public static function fromArray(array $data): self { $instance = new self(); - $instance->addressStreet1 = $data['addressStreet1'] ?? ''; - $instance->addressStreet2 = $data['addressStreet2'] ?? ''; - $instance->addressStreet3 = $data['addressStreet3'] ?? ''; - $instance->city = $data['city'] ?? ''; - $instance->country = $data['country'] ?? ''; - $instance->firstName = $data['firstName'] ?? ''; - $instance->lastName = $data['lastName'] ?? ''; - $instance->postalCode = $data['postalCode'] ?? ''; - $instance->state = $data['state'] ?? ''; + $instance->addressStreet1 = $data['addressStreet1'] ?? null; + $instance->addressStreet2 = $data['addressStreet2'] ?? null; + $instance->addressStreet3 = $data['addressStreet3'] ?? null; + $instance->city = $data['city'] ?? null; + $instance->country = $data['country'] ?? null; + $instance->firstName = $data['firstName'] ?? null; + $instance->lastName = $data['lastName'] ?? null; + $instance->postalCode = $data['postalCode'] ?? null; + $instance->state = $data['state'] ?? null; return $instance; } } From ce7acca35ae883b4719c38794a4136799f04756d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Samotn=C3=BD?= Date: Fri, 19 Dec 2025 15:58:17 +0100 Subject: [PATCH 2/2] triv: guard address fields against empty strings --- lib/Model/Address.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/Model/Address.php b/lib/Model/Address.php index 93418fb..5efc22b 100644 --- a/lib/Model/Address.php +++ b/lib/Model/Address.php @@ -22,15 +22,15 @@ class Address { public static function fromArray(array $data): self { $instance = new self(); - $instance->addressStreet1 = $data['addressStreet1'] ?? null; - $instance->addressStreet2 = $data['addressStreet2'] ?? null; - $instance->addressStreet3 = $data['addressStreet3'] ?? null; - $instance->city = $data['city'] ?? null; - $instance->country = $data['country'] ?? null; - $instance->firstName = $data['firstName'] ?? null; - $instance->lastName = $data['lastName'] ?? null; - $instance->postalCode = $data['postalCode'] ?? null; - $instance->state = $data['state'] ?? null; + $instance->addressStreet1 = ($data['addressStreet1'] ?? '') !== '' ? $data['addressStreet1'] : null; + $instance->addressStreet2 = ($data['addressStreet2'] ?? '') !== '' ? $data['addressStreet2'] : null; + $instance->addressStreet3 = ($data['addressStreet3'] ?? '') !== '' ? $data['addressStreet3'] : null; + $instance->city = ($data['city'] ?? '') !== '' ? $data['city'] : null; + $instance->country = ($data['country'] ?? '') !== '' ? $data['country'] : null; + $instance->firstName = ($data['firstName'] ?? '') !== '' ? $data['firstName'] : null; + $instance->lastName = ($data['lastName'] ?? '') !== '' ? $data['lastName'] : null; + $instance->postalCode = ($data['postalCode'] ?? '') !== '' ? $data['postalCode'] : null; + $instance->state = ($data['state'] ?? '') !== '' ? $data['state'] : null; return $instance; } }