3 files changed, 16 insertions, 12 deletions

diff --git a/src/Wallabag/GroupBundle/Entity/Group.php b/src/Wallabag/GroupBundle/Entity/Group.php
index 31c82837..28b0227c 100644
--- a/src/Wallabag/GroupBundle/Entity/Group.php
+++ b/src/Wallabag/GroupBundle/Entity/Group.php
@@ -13,9 +13,8 @@ use Wallabag\UserBundle\Entity\User;
  */
 class Group extends BaseGroup
 {
-
     /**
-     * User Roles
+     * User Roles.
      */
 
     /** User can only preview presentations */
@@ -34,7 +33,7 @@ class Group extends BaseGroup
     const ROLE_ADMIN = 10;
 
     /**
-     * Group join access
+     * Group join access.
      */
 
     /** Any user can join the group */
@@ -99,9 +98,10 @@ class Group extends BaseGroup
     {
         $userObj = new ArrayCollection();
         foreach ($this->users as $userGroup) {
-            /** @var UserGroup $userGroup */
+            /* @var UserGroup $userGroup */
             $userObj->add($userGroup->getUser());
         }
+
         return $userObj;
     }
 
@@ -177,24 +177,26 @@ class Group extends BaseGroup
     public function getRequests()
     {
         $requests = new ArrayCollection();
-        foreach ($this->users as $user) /** @var UserGroup $user */
+        foreach ($this->users as $user) /* @var UserGroup $user */
         {
             if (!$user->isAccepted()) {
                 $requests->add($user->getUser());
             }
         }
+
         return $requests;
     }
 
     public function getInvited()
     {
         $invited = new ArrayCollection();
-        foreach ($this->users as $userGroup) /** @var UserGroup $userGroup */
+        foreach ($this->users as $userGroup) /* @var UserGroup $userGroup */
         {
             if ($userGroup->getInvitation()) {
                 $invited->add($userGroup);
             }
         }
+
         return $invited;
     }
 }
diff --git a/src/Wallabag/GroupBundle/Entity/Invitation.php b/src/Wallabag/GroupBundle/Entity/Invitation.php
index 6946bede..e944b348 100644
--- a/src/Wallabag/GroupBundle/Entity/Invitation.php
+++ b/src/Wallabag/GroupBundle/Entity/Invitation.php
@@ -6,6 +6,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ * @ORM\Table(name="invitation")
  */
 class Invitation
 {
@@ -42,7 +43,7 @@ class Invitation
     /**
      * @return \DateTime
      */
-    public function getDate(): \DateTime
+    public function getDate()
     {
         return $this->date;
     }
@@ -58,7 +59,7 @@ class Invitation
     /**
      * @return mixed
      */
-    public function getUserGroup(): UserGroup
+    public function getUserGroup()
     {
         return $this->userGroup;
     }
diff --git a/src/Wallabag/GroupBundle/Entity/UserGroup.php b/src/Wallabag/GroupBundle/Entity/UserGroup.php
index 22d1400a..0c40b0d3 100644
--- a/src/Wallabag/GroupBundle/Entity/UserGroup.php
+++ b/src/Wallabag/GroupBundle/Entity/UserGroup.php
@@ -3,15 +3,13 @@
 namespace Wallabag\GroupBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use FOS\UserBundle\Model\GroupInterface;
-use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Wallabag\UserBundle\Entity\User;
 
 /**
  * @ORM\Entity(repositoryClass="Wallabag\GroupBundle\Repository\UserGroupRepository")
  * @UniqueEntity({"user_id", "group_id"})
- * @ORM\Table(name="fos_user_group")
+ * @ORM\Table(name="user_group")
  */
 class UserGroup
 {
@@ -52,7 +50,8 @@ class UserGroup
 
     /**
      * UserGroup constructor.
-     * @param User $user
+     *
+     * @param User  $user
      * @param Group $group
      * @param $role
      */
@@ -90,11 +89,13 @@ class UserGroup
 
     /**
      * @param int $role
+     *
      * @return UserGroup
      */
     public function setRole($role)
     {
         $this->role = $role;
+
         return $this;
     }