Merge pull request #106 from silinternational/feature/fix-name-in-get

Make sure the name property of a GoogleUser is a GoogleName object

Author: mtompset

SilMock/Google/Service/Directory/UsersResource.php

@@ -60,8 +60,13 @@ public function get($userKey)
         }
 
         $newUser = new \Google_Service_Directory_User();
-        ObjectUtils::initialize($newUser, json_decode($userEntry['data'], true));
-        
+        $decodedData = json_decode($userEntry['data'], true);
+        $nameArray = $decodedData['name'] ?? [];
+        ObjectUtils::initialize($newUser, $decodedData);
+        $newName = new \Google_Service_Directory_UserName();
+        ObjectUtils::initialize($newName, $nameArray);
+        $newUser->setName($newName);
+
         // find its aliases in the database and populate its aliases property
         $aliases = $this->getAliasesForUser($userKey);
 

SilMock/tests/Google/Service/SampleUser.php

@@ -3,8 +3,7 @@
 namespace SilMock\tests\Google\Service;
 
 use Google_Service_Directory_User;
-use Google_Service_Directory_Aliases;
-use Google_Service_Directory_Alias;
+use Google\Service\Directory\UserName;
 use SilMock\Google\Service\GoogleFixtures;
 use SilMock\Google\Service\Directory;
 
@@ -24,6 +23,12 @@ public function setupSampleUser(string $dataFile, bool $withAliases = false): ?G
         $newUser->isEnrolledIn2Sv = true;
         $newUser->isEnforcedIn2Sv = false;
         //  $newUser->$suspensionReason = ''; // string
+        $newName = new UserName();
+        $newName->givenName = 'Johnathan';
+        $newName->familyName = 'Smith';
+        $newName->fullName = 'Johnathan Doe Smith';
+        $newName->displayName = 'John Doe Smith';
+        $newUser->name = $newName;
 
         if ($withAliases) {
             $newUser->aliases = [ '[email protected]', '[email protected]' ];