@@ -3,21 +3,15 @@ |
||
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 | /** |
@@ -266,7 +266,7 @@ discard block |
||
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 |
||
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 |
||
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 | { |
@@ -6,14 +6,11 @@ |
||
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; |
@@ -50,7 +50,7 @@ |
||
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 |
@@ -3,7 +3,6 @@ |
||
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; |
@@ -109,7 +109,7 @@ |
||
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) |
@@ -3,7 +3,6 @@ |
||
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; |
@@ -85,7 +85,7 @@ |
||
85 | 85 | /** |
86 | 86 | * @param object $entity |
87 | 87 | * @param bool $duplicate |
88 | - * @return \PHPUnit_Framework_MockObject_MockObject|LifecycleEventArgs |
|
88 | + * @return LifecycleEventArgs |
|
89 | 89 | */ |
90 | 90 | protected function getPrePersistEvent($entity, $duplicate = false) |
91 | 91 | { |
@@ -3,7 +3,6 @@ |
||
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; |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\Config\Definition\Builder\TreeBuilder; |
6 | 6 | use Symfony\Component\Config\Definition\ConfigurationInterface; |
7 | -use Symfony\Component\Config\Definition\Builder\NodeBuilder; |
|
8 | 7 | |
9 | 8 | class Configuration implements ConfigurationInterface |
10 | 9 | { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Oro\Bundle\WorkflowBundle\Configuration; |
4 | 4 | |
5 | -use Symfony\Component\Yaml\Yaml; |
|
6 | 5 | use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException; |
7 | 6 | |
8 | 7 | class WorkflowConfigurationProvider extends AbstractConfigurationProvider |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * @AclAncestor("oro_workflow") |
29 | 29 | * @param string $workflowName |
30 | 30 | * @param string $transitionName |
31 | - * @return array |
|
31 | + * @return \Symfony\Component\HttpFoundation\Response |
|
32 | 32 | */ |
33 | 33 | public function startTransitionAction($workflowName, $transitionName) |
34 | 34 | { |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * @AclAncestor("oro_workflow") |
78 | 78 | * @param string $transitionName |
79 | 79 | * @param WorkflowItem $workflowItem |
80 | - * @return array |
|
80 | + * @return \Symfony\Component\HttpFoundation\Response |
|
81 | 81 | */ |
82 | 82 | public function transitionAction($transitionName, WorkflowItem $workflowItem) |
83 | 83 | { |
@@ -7,11 +7,8 @@ |
||
7 | 7 | use Oro\Bundle\WorkflowBundle\Event\StartTransitionEvent; |
8 | 8 | use Oro\Bundle\WorkflowBundle\Event\StartTransitionEvents; |
9 | 9 | use Oro\Bundle\WorkflowBundle\Model\WorkflowManager; |
10 | - |
|
11 | 10 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
12 | 11 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
13 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
|
14 | - |
|
15 | 12 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
16 | 13 | |
17 | 14 | /** |
@@ -355,7 +355,7 @@ |
||
355 | 355 | } |
356 | 356 | |
357 | 357 | /** |
358 | - * @return array |
|
358 | + * @return string[] |
|
359 | 359 | */ |
360 | 360 | public static function getAllowedEvents() |
361 | 361 | { |
@@ -4,9 +4,7 @@ |
||
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 |