Skip to content

Commit a28819c

Browse files
authored
Merge pull request #114 from silinternational/develop
Release 2.11.4 -- Handle null user name fields gracefully
2 parents 9fc35a9 + ac79b62 commit a28819c

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

SilMock/Google/Service/Directory/UsersResource.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -356,12 +356,14 @@ public function listUsers($parameters = [])
356356
$userEntry = json_decode($userRecord['data'], true);
357357
if ($this->doesUserMatch($userEntry, $parameters['query'])) {
358358
/** @var \Google_Service_Directory_UserName $newName */
359+
$nameEntry = $userEntry['name'] ?? null;
360+
$givenName = $nameEntry['givenName'] ?? null;
361+
$familyName = $nameEntry['familyName'] ?? null;
362+
$fullName = $nameEntry['fullName'] ?? trim($givenName . ' ' . $familyName);
359363
$newName = new \Google_Service_Directory_UserName([
360-
'familyName' => $userEntry['name']['familyName'],
361-
'fullName' =>
362-
$userEntry['name']['fullName'] ??
363-
$userEntry['name']['givenName'] . ' ' . $userEntry['name']['familyName'],
364-
'givenName' => $userEntry['name']['givenName'],
364+
'familyName' => $familyName,
365+
'fullName' => $fullName,
366+
'givenName' => $givenName,
365367
]);
366368
$userEntry['customerId'] = $userEntry['primaryEmail'];
367369
/** @var \Google_Service_Directory_User $newEntry */

0 commit comments

Comments
 (0)