Completed
Pull Request — master (#352)
by php-br
48:18
created
src/Oro/Bundle/UserBundle/Autocomplete/UserAclHandler.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -223,7 +223,7 @@
 block discarded – undo
223 223
      * @param string       $name
224 224
      * @param object|array $item
225 225
      *
226
-     * @return mixed
226
+     * @return \Oro\Bundle\AttachmentBundle\Entity\File
227 227
      */
228 228
     protected function getPropertyValue($name, $item)
229 229
     {
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -4,9 +4,7 @@
 block discarded – undo
4 4
 
5 5
 use Doctrine\Common\EventManager;
6 6
 use Doctrine\DBAL\Driver\Connection;
7
-
8 7
 use Symfony\Component\Filesystem\Filesystem;
9
-
10 8
 use Oro\Component\TestUtils\ORM\Mocks\DriverMock;
11 9
 use Oro\Component\TestUtils\ORM\Mocks\EntityManagerMock;
12 10
 
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Autocomplete/UserWithoutCurrentHandler.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     /**
16 16
      * @param SecurityFacade    $securityFacade
17 17
      * @param AttachmentManager $attachmentManager
18
-     * @param array             $userEntityName
18
+     * @param string             $userEntityName
19 19
      * @param array             $properties
20 20
      */
21 21
     public function __construct(
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Controller/Api/Rest/UserController.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -318,6 +318,7 @@
 block discarded – undo
318 318
 
319 319
     /**
320 320
      * {@inheritdoc}
321
+     * @param User $entity
321 322
      */
322 323
     protected function getPreparedItem($entity, $resultFields = [])
323 324
     {
Please login to merge, or discard this patch.
Unused Use Statements   -6 removed lines patch added patch discarded remove patch
@@ -3,21 +3,15 @@
 block discarded – undo
3 3
 namespace Oro\Bundle\UserBundle\EventListener;
4 4
 
5 5
 use Symfony\Component\Security\Core\SecurityContextInterface;
6
-
7 6
 use Doctrine\ORM\EntityManager;
8
-
9 7
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
10 8
 use Oro\Bundle\DataGridBundle\Event\BuildBefore;
11
-
12 9
 use Oro\Bundle\SecurityBundle\Acl\AccessLevel;
13 10
 use Oro\Bundle\SecurityBundle\Acl\Voter\AclVoter;
14 11
 use Oro\Bundle\SecurityBundle\Acl\Domain\OneShotIsGrantedObserver;
15 12
 use Oro\Bundle\SecurityBundle\Owner\OwnerTreeProvider;
16
-
17 13
 use Oro\Bundle\UserBundle\Entity\User;
18
-
19 14
 use Oro\Bundle\OrganizationBundle\Entity\Organization;
20
-
21 15
 use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink;
22 16
 
23 17
 /**
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Controller/GroupController.php 1 patch
Unused Use Statements   -3 removed lines patch added patch discarded remove patch
@@ -4,13 +4,10 @@
 block discarded – undo
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")
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Controller/StatusController.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -5,8 +5,6 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Controller/UserController.php 1 patch
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -4,17 +4,13 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Entity/BaseUserManager.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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)
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -4,9 +4,7 @@
 block discarded – undo
4 4
 
5 5
 use Doctrine\Common\EventManager;
6 6
 use Doctrine\DBAL\Driver\Connection;
7
-
8 7
 use Symfony\Component\Filesystem\Filesystem;
9
-
10 8
 use Oro\Component\TestUtils\ORM\Mocks\DriverMock;
11 9
 use Oro\Component\TestUtils\ORM\Mocks\EntityManagerMock;
12 10
 
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Entity/Manager/GroupManager.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,6 @@
 block discarded – undo
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)
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace Oro\Component\PropertyAccess\Tests\Unit;
4 4
 
5 5
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
6
-
7 6
 use Oro\Component\PropertyAccess\PropertyAccessor;
8 7
 use Oro\Component\PropertyAccess\Tests\Unit\Fixtures\TestClass;
9 8
 use Oro\Component\PropertyAccess\Tests\Unit\Fixtures\TestClassMagicCall;
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Entity/Manager/UserPermissionApiEntityManager.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
      *
100 100
      * @param User $user
101 101
      *
102
-     * @return TokenInterface|null The previous security token
102
+     * @return OrganizationContextTokenInterface The previous security token
103 103
      *
104 104
      * @throws \UnexpectedValueException
105 105
      * @throws AccessDeniedException
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -4,9 +4,7 @@
 block discarded – undo
4 4
 
5 5
 use Doctrine\Common\EventManager;
6 6
 use Doctrine\DBAL\Driver\Connection;
7
-
8 7
 use Symfony\Component\Filesystem\Filesystem;
9
-
10 8
 use Oro\Component\TestUtils\ORM\Mocks\DriverMock;
11 9
 use Oro\Component\TestUtils\ORM\Mocks\EntityManagerMock;
12 10
 
Please login to merge, or discard this patch.