UserName VO fix no. 2 (revert "fix") & check guild before creating en…

…tity
chonsser · Jun 15, 2017 · 93b0c63 · 93b0c63
1 parent 509ccfc
commit 93b0c63
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/Provider/Discord.php b/src/Provider/Discord.php
@@ -140,16 +140,18 @@ protected function createResourceOwner(array $response, AccessToken $token)
         );
 
         foreach ($guilds as $key => $guild) {
-            $_guild = new Guild();
-
-            $_guild
-                ->setId($guild['id'])
-                ->setName(new GuildName($guild['name']))
-                ->setIcon($guild['icon'])
-                ->setOwner($guild['owner'])
-                ->setPermissions($guild['permissions']);
-
-            $user->addGuild($_guild);
+            if($guild['id'] !== null){
+                $_guild = new Guild();
+
+                $_guild
+                    ->setId($guild['id'])
+                    ->setName(new GuildName($guild['name']))
+                    ->setIcon($guild['icon'])
+                    ->setOwner($guild['owner'])
+                    ->setPermissions($guild['permissions']);
+
+                $user->addGuild($_guild);
+            }
         }
 
         return $user;

diff --git a/src/Provider/ValueObject/UserName.php b/src/Provider/ValueObject/UserName.php
@@ -50,11 +50,11 @@ private function guardUserName($user_name)
 
         $name_length = strlen($user_name);
 
-        if ($name_length >= self::MAX_LENGTH) {
+        if ($name_length > self::MAX_LENGTH) {
             throw new InvalidUserNameException("Username must have less than " . self::MAX_LENGTH . " characters");
         }
 
-        if ($name_length <= self::MIN_LENGTH) {
+        if ($name_length < self::MIN_LENGTH) {
             throw new InvalidUserNameException("Username must have more than " . self::MIN_LENGTH . " characters");
         }
     }