diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-03-28 15:04:39 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2017-06-23 09:26:41 +0200 |
commit | 2585953e0dae631b65c59b0e31196d65bdde84df (patch) | |
tree | aa40f9658d13361c27399940e72d0d25e4b8d918 /src/Wallabag/GroupBundle/Entity/Group.php | |
parent | 2041810adbc6e663e4520337805c0003c77762e2 (diff) | |
download | wallabag-2585953e0dae631b65c59b0e31196d65bdde84df.tar.gz wallabag-2585953e0dae631b65c59b0e31196d65bdde84df.tar.zst wallabag-2585953e0dae631b65c59b0e31196d65bdde84df.zip |
Fixed typos
Diffstat (limited to 'src/Wallabag/GroupBundle/Entity/Group.php')
-rw-r--r-- | src/Wallabag/GroupBundle/Entity/Group.php | 14 |
1 files changed, 8 insertions, 6 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; | |||
13 | */ | 13 | */ |
14 | class Group extends BaseGroup | 14 | class Group extends BaseGroup |
15 | { | 15 | { |
16 | |||
17 | /** | 16 | /** |
18 | * User Roles | 17 | * User Roles. |
19 | */ | 18 | */ |
20 | 19 | ||
21 | /** User can only preview presentations */ | 20 | /** User can only preview presentations */ |
@@ -34,7 +33,7 @@ class Group extends BaseGroup | |||
34 | const ROLE_ADMIN = 10; | 33 | const ROLE_ADMIN = 10; |
35 | 34 | ||
36 | /** | 35 | /** |
37 | * Group join access | 36 | * Group join access. |
38 | */ | 37 | */ |
39 | 38 | ||
40 | /** Any user can join the group */ | 39 | /** Any user can join the group */ |
@@ -99,9 +98,10 @@ class Group extends BaseGroup | |||
99 | { | 98 | { |
100 | $userObj = new ArrayCollection(); | 99 | $userObj = new ArrayCollection(); |
101 | foreach ($this->users as $userGroup) { | 100 | foreach ($this->users as $userGroup) { |
102 | /** @var UserGroup $userGroup */ | 101 | /* @var UserGroup $userGroup */ |
103 | $userObj->add($userGroup->getUser()); | 102 | $userObj->add($userGroup->getUser()); |
104 | } | 103 | } |
104 | |||
105 | return $userObj; | 105 | return $userObj; |
106 | } | 106 | } |
107 | 107 | ||
@@ -177,24 +177,26 @@ class Group extends BaseGroup | |||
177 | public function getRequests() | 177 | public function getRequests() |
178 | { | 178 | { |
179 | $requests = new ArrayCollection(); | 179 | $requests = new ArrayCollection(); |
180 | foreach ($this->users as $user) /** @var UserGroup $user */ | 180 | foreach ($this->users as $user) /* @var UserGroup $user */ |
181 | { | 181 | { |
182 | if (!$user->isAccepted()) { | 182 | if (!$user->isAccepted()) { |
183 | $requests->add($user->getUser()); | 183 | $requests->add($user->getUser()); |
184 | } | 184 | } |
185 | } | 185 | } |
186 | |||
186 | return $requests; | 187 | return $requests; |
187 | } | 188 | } |
188 | 189 | ||
189 | public function getInvited() | 190 | public function getInvited() |
190 | { | 191 | { |
191 | $invited = new ArrayCollection(); | 192 | $invited = new ArrayCollection(); |
192 | foreach ($this->users as $userGroup) /** @var UserGroup $userGroup */ | 193 | foreach ($this->users as $userGroup) /* @var UserGroup $userGroup */ |
193 | { | 194 | { |
194 | if ($userGroup->getInvitation()) { | 195 | if ($userGroup->getInvitation()) { |
195 | $invited->add($userGroup); | 196 | $invited->add($userGroup); |
196 | } | 197 | } |
197 | } | 198 | } |
199 | |||
198 | return $invited; | 200 | return $invited; |
199 | } | 201 | } |
200 | } | 202 | } |