Skip to content

Commit ca8c298

Browse files
authored
triv: make address fields nullable as default (#4)
* triv: make address fields nullable as default * triv: guard address fields against empty strings
1 parent 63f1a15 commit ca8c298

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

lib/Model/Address.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@
1010
namespace Raiaccept\RaiacceptApiClient\Model;
1111

1212
class Address {
13-
public string $addressStreet1;
14-
public string $addressStreet2;
15-
public string $addressStreet3;
16-
public string $city;
17-
public string $country;
18-
public string $firstName;
19-
public string $lastName;
20-
public string $postalCode;
21-
public string $state;
13+
public ?string $addressStreet1;
14+
public ?string $addressStreet2;
15+
public ?string $addressStreet3;
16+
public ?string $city;
17+
public ?string $country;
18+
public ?string $firstName;
19+
public ?string $lastName;
20+
public ?string $postalCode;
21+
public ?string $state;
2222

2323
public static function fromArray(array $data): self {
2424
$instance = new self();
25-
$instance->addressStreet1 = $data['addressStreet1'] ?? '';
26-
$instance->addressStreet2 = $data['addressStreet2'] ?? '';
27-
$instance->addressStreet3 = $data['addressStreet3'] ?? '';
28-
$instance->city = $data['city'] ?? '';
29-
$instance->country = $data['country'] ?? '';
30-
$instance->firstName = $data['firstName'] ?? '';
31-
$instance->lastName = $data['lastName'] ?? '';
32-
$instance->postalCode = $data['postalCode'] ?? '';
33-
$instance->state = $data['state'] ?? '';
25+
$instance->addressStreet1 = ($data['addressStreet1'] ?? '') !== '' ? $data['addressStreet1'] : null;
26+
$instance->addressStreet2 = ($data['addressStreet2'] ?? '') !== '' ? $data['addressStreet2'] : null;
27+
$instance->addressStreet3 = ($data['addressStreet3'] ?? '') !== '' ? $data['addressStreet3'] : null;
28+
$instance->city = ($data['city'] ?? '') !== '' ? $data['city'] : null;
29+
$instance->country = ($data['country'] ?? '') !== '' ? $data['country'] : null;
30+
$instance->firstName = ($data['firstName'] ?? '') !== '' ? $data['firstName'] : null;
31+
$instance->lastName = ($data['lastName'] ?? '') !== '' ? $data['lastName'] : null;
32+
$instance->postalCode = ($data['postalCode'] ?? '') !== '' ? $data['postalCode'] : null;
33+
$instance->state = ($data['state'] ?? '') !== '' ? $data['state'] : null;
3434
return $instance;
3535
}
3636
}

0 commit comments

Comments
 (0)