Completed
Pull Request — master (#361)
by Ramūnas
37:16
created
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.
src/Oro/Bundle/UserBundle/Entity/User.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -865,6 +865,7 @@
 block discarded – undo
865 865
     /**
866 866
      * {@inheritdoc}
867 867
      *
868
+     * @param string[] $tags
868 869
      * @return User
869 870
      */
870 871
     public function setTags($tags)
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/UserSoap.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,6 @@
 block discarded – undo
3 3
 namespace Oro\Bundle\UserBundle\Entity;
4 4
 
5 5
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
6
-use Doctrine\ORM\Mapping as ORM;
7
-
8 6
 use Oro\Bundle\SoapBundle\Entity\SoapEntityInterface;
9 7
 
10 8
 /**
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/EventListener/OwnerUserGridListener.php 1 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/Form/Handler/AclRoleHandler.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
     }
267 267
 
268 268
     /**
269
-     * @param ArrayCollection|AclPrivilege[] $sortedPrivileges
269
+     * @param ArrayCollection $sortedPrivileges
270 270
      * @param array $config
271 271
      */
272 272
     protected function applyOptions(ArrayCollection $sortedPrivileges, array $config)
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 
295 295
     /**
296 296
      * @param AbstractRole $role
297
-     * @return ArrayCollection|AclPrivilege[]
297
+     * @return ArrayCollection
298 298
      */
299 299
     protected function getRolePrivileges(AbstractRole $role)
300 300
     {
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
     /**
347 347
      * @param ArrayCollection $privileges
348 348
      * @param array $rootIds
349
-     * @return ArrayCollection|AclPrivilege[]
349
+     * @return ArrayCollection
350 350
      */
351 351
     protected function filterPrivileges(ArrayCollection $privileges, array $rootIds)
352 352
     {
Please login to merge, or discard this patch.
Unused Use Statements   -3 removed lines patch added patch discarded remove patch
@@ -6,14 +6,11 @@
 block discarded – undo
6 6
 use Symfony\Component\HttpFoundation\Request;
7 7
 use Symfony\Component\Form\FormInterface;
8 8
 use Symfony\Component\Security\Acl\Model\AclCacheInterface;
9
-
10 9
 use Doctrine\Common\Persistence\ObjectManager;
11 10
 use Doctrine\Common\Collections\ArrayCollection;
12 11
 use Doctrine\Common\Persistence\ManagerRegistry;
13 12
 use Doctrine\Common\Util\ClassUtils;
14
-
15 13
 use Oro\Bundle\UserBundle\Entity\User;
16
-use Oro\Bundle\UserBundle\Form\Type\AclRoleType;
17 14
 use Oro\Bundle\UserBundle\Entity\AbstractRole;
18 15
 use Oro\Bundle\UserBundle\Entity\AbstractUser;
19 16
 use Oro\Bundle\SecurityBundle\Model\AclPermission;
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Mailer/BaseProcessor.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 
51 51
     /**
52 52
      * @param UserInterface $user
53
-     * @param array         $templateData
53
+     * @param string[]         $templateData
54 54
      * @param string        $type
55 55
      *
56 56
      * @return int          The return value is the number of recipients who were accepted for delivery
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.
Bundle/UserBundle/Tests/Unit/DependencyInjection/OroUserExtensionTest.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
     }
110 110
 
111 111
     /**
112
-     * @param mixed  $value
112
+     * @param integer  $value
113 113
      * @param string $key
114 114
      */
115 115
     protected function assertParameter($value, $key)
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.