@@ -4,13 +4,10 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
6 | 6 | use Symfony\Component\HttpFoundation\Request; |
7 | - |
|
8 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
9 | 8 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
10 | - |
|
11 | 9 | use Oro\Bundle\UserBundle\Entity\Group; |
12 | 10 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
13 | -use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
|
14 | 11 | |
15 | 12 | /** |
16 | 13 | * @Route("/group") |
@@ -3,11 +3,9 @@ |
||
3 | 3 | namespace Oro\Bundle\UserBundle\Controller; |
4 | 4 | |
5 | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
6 | - |
|
7 | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
8 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
9 | 8 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
10 | - |
|
11 | 9 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
12 | 10 | use Oro\Bundle\EntityBundle\Tools\EntityRoutingHelper; |
13 | 11 | use Oro\Bundle\UserBundle\Entity\User; |
@@ -4,10 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
6 | 6 | use Symfony\Component\HttpFoundation\Request; |
7 | - |
|
8 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
9 | 8 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
10 | - |
|
11 | 9 | use Oro\Bundle\UserBundle\Entity\Role; |
12 | 10 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
13 | 11 |
@@ -5,8 +5,6 @@ |
||
5 | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
6 | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
7 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
8 | - |
|
9 | -use Oro\Bundle\UserBundle\Entity\User; |
|
10 | 8 | use Oro\Bundle\UserBundle\Entity\Status; |
11 | 9 | use Symfony\Component\HttpFoundation\Response; |
12 | 10 |
@@ -4,17 +4,13 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\JsonResponse; |
6 | 6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
7 | - |
|
8 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
9 | 8 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
10 | - |
|
11 | 9 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
12 | 10 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
13 | 11 | use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationToken; |
14 | - |
|
15 | 12 | use Oro\Bundle\UserBundle\Entity\User; |
16 | 13 | use Oro\Bundle\UserBundle\Entity\UserApi; |
17 | - |
|
18 | 14 | use Oro\Bundle\OrganizationBundle\Entity\Manager\BusinessUnitManager; |
19 | 15 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
20 | 16 |
@@ -5,9 +5,7 @@ |
||
5 | 5 | use Doctrine\Common\Collections\ArrayCollection; |
6 | 6 | use Doctrine\Common\Collections\Collection; |
7 | 7 | use Doctrine\ORM\Mapping as ORM; |
8 | - |
|
9 | 8 | use Symfony\Component\Security\Core\Role\RoleInterface; |
10 | - |
|
11 | 9 | use Oro\Bundle\DataAuditBundle\Metadata\Annotation as Oro; |
12 | 10 | use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\ConfigField; |
13 | 11 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | /** |
101 | 101 | * Deletes a user |
102 | 102 | * |
103 | - * @param object $user |
|
103 | + * @param User $user |
|
104 | 104 | */ |
105 | 105 | public function deleteUser($user) |
106 | 106 | { |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | /** |
181 | 181 | * Reloads a user |
182 | 182 | * |
183 | - * @param object $user |
|
183 | + * @param User $user |
|
184 | 184 | */ |
185 | 185 | public function reloadUser($user) |
186 | 186 | { |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | } |
259 | 259 | |
260 | 260 | /** |
261 | - * @param OroUserInterface|string $user |
|
261 | + * @param UserInterface $user |
|
262 | 262 | * @return PasswordEncoderInterface |
263 | 263 | */ |
264 | 264 | protected function getEncoder($user) |
@@ -7,14 +7,12 @@ |
||
7 | 7 | use Doctrine\Common\Persistence\ObjectRepository; |
8 | 8 | use Doctrine\ORM\EntityManager; |
9 | 9 | use Doctrine\ORM\QueryBuilder; |
10 | - |
|
11 | 10 | use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
12 | 11 | use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface; |
13 | 12 | use Symfony\Component\Security\Core\Exception\UnsupportedUserException; |
14 | 13 | use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; |
15 | 14 | use Symfony\Component\Security\Core\User\UserInterface as SecurityUserInterface; |
16 | 15 | use Symfony\Component\Security\Core\User\UserProviderInterface; |
17 | - |
|
18 | 16 | use Oro\Bundle\UserBundle\Entity\UserInterface as OroUserInterface; |
19 | 17 | |
20 | 18 | class BaseUserManager implements UserProviderInterface |
@@ -23,7 +23,6 @@ |
||
23 | 23 | /** |
24 | 24 | * Get user query builder |
25 | 25 | * |
26 | - * @param Group $role |
|
27 | 26 | * @return QueryBuilder |
28 | 27 | */ |
29 | 28 | public function getUserQueryBuilder(Group $group) |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | 6 | use Doctrine\ORM\QueryBuilder; |
7 | - |
|
8 | 7 | use Oro\Bundle\UserBundle\Entity\Repository\GroupRepository; |
9 | 8 | use Oro\Bundle\UserBundle\Entity\Group; |
10 | 9 |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | 6 | use Doctrine\ORM\QueryBuilder; |
7 | - |
|
8 | 7 | use Oro\Bundle\UserBundle\Entity\Repository\RoleRepository; |
9 | 8 | use Oro\Bundle\UserBundle\Entity\Role; |
10 | 9 |