@@ -117,6 +117,10 @@ discard block |
||
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
120 | + /** |
|
121 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
122 | + * @param string $roleName |
|
123 | + */ |
|
120 | 124 | public function deleteAcl($login, $roleName, $username, $email) |
121 | 125 | { |
122 | 126 | $login->openRoles('Oro\Bundle\UserBundle') |
@@ -132,6 +136,10 @@ discard block |
||
132 | 136 | ->checkContextMenu($email, 'Delete'); |
133 | 137 | } |
134 | 138 | |
139 | + /** |
|
140 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
141 | + * @param string $roleName |
|
142 | + */ |
|
135 | 143 | public function updateAcl($login, $roleName, $username, $email) |
136 | 144 | { |
137 | 145 | $login->openRoles('Oro\Bundle\UserBundle') |
@@ -147,6 +155,10 @@ discard block |
||
147 | 155 | ->checkContextMenu($email, 'Edit'); |
148 | 156 | } |
149 | 157 | |
158 | + /** |
|
159 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
160 | + * @param string $roleName |
|
161 | + */ |
|
150 | 162 | public function createAcl($login, $roleName, $username) |
151 | 163 | { |
152 | 164 | $login->openRoles('Oro\Bundle\UserBundle') |
@@ -165,6 +177,10 @@ discard block |
||
165 | 177 | ); |
166 | 178 | } |
167 | 179 | |
180 | + /** |
|
181 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
182 | + * @param string $roleName |
|
183 | + */ |
|
168 | 184 | public function viewListAcl($login, $roleName, $username) |
169 | 185 | { |
170 | 186 | $login->openRoles('Oro\Bundle\UserBundle') |
@@ -3,13 +3,10 @@ |
||
3 | 3 | namespace Oro\Bundle\OrganizationBundle\Controller; |
4 | 4 | |
5 | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
6 | -use Symfony\Component\HttpFoundation\JsonResponse; |
|
7 | 6 | use Symfony\Component\HttpFoundation\Request; |
8 | 7 | use Symfony\Component\HttpFoundation\Response; |
9 | - |
|
10 | 8 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
11 | 9 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
12 | - |
|
13 | 10 | use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; |
14 | 11 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
15 | 12 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
@@ -63,7 +63,7 @@ |
||
63 | 63 | * @param User $user |
64 | 64 | * @param string $name |
65 | 65 | * |
66 | - * @return null|Organization |
|
66 | + * @return Organization[] |
|
67 | 67 | */ |
68 | 68 | public function getEnabledUserOrganizationByName(User $user, $name) |
69 | 69 | { |
@@ -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; |
@@ -2,9 +2,7 @@ |
||
2 | 2 | namespace Oro\Bundle\OrganizationBundle\Entity\Repository; |
3 | 3 | |
4 | 4 | use Doctrine\ORM\EntityRepository; |
5 | -use Doctrine\ORM\Query\Expr; |
|
6 | 5 | use Doctrine\ORM\QueryBuilder; |
7 | - |
|
8 | 6 | use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; |
9 | 7 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
10 | 8 | use Oro\Bundle\UserBundle\Entity\User; |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | |
304 | 304 | /** |
305 | 305 | * @param FormBuilderInterface|FormInterface $builder |
306 | - * @param $dataClass |
|
306 | + * @param string $dataClass |
|
307 | 307 | * @param string $permission |
308 | 308 | * @param array $data |
309 | 309 | * @param int $entityId |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | } |
477 | 477 | |
478 | 478 | /** |
479 | - * @return null|User |
|
479 | + * @return User |
|
480 | 480 | */ |
481 | 481 | protected function getCurrentUser() |
482 | 482 | { |
@@ -579,7 +579,7 @@ discard block |
||
579 | 579 | /** |
580 | 580 | * Get organization from security facade |
581 | 581 | * |
582 | - * @return bool|Organization |
|
582 | + * @return Organization |
|
583 | 583 | */ |
584 | 584 | protected function getOrganization() |
585 | 585 | { |
@@ -6,15 +6,10 @@ |
||
6 | 6 | use Doctrine\Common\Util\ClassUtils; |
7 | 7 | use Doctrine\ORM\EntityManager; |
8 | 8 | use Doctrine\ORM\Query\Expr\OrderBy; |
9 | - |
|
10 | 9 | use JMS\JobQueueBundle\Entity\Job; |
11 | - |
|
12 | 10 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
13 | - |
|
14 | 11 | use Oro\Bundle\BatchBundle\ORM\Query\BufferedQueryResultIterator; |
15 | - |
|
16 | 12 | use Oro\Bundle\EntityBundle\ORM\DoctrineHelper; |
17 | - |
|
18 | 13 | use Oro\Bundle\SearchBundle\Command\IndexCommand; |
19 | 14 | use Oro\Bundle\SearchBundle\Entity\Query as QueryLog; |
20 | 15 | use Oro\Bundle\SearchBundle\Event\BeforeSearchEvent; |
@@ -302,8 +302,8 @@ |
||
302 | 302 | |
303 | 303 | /** |
304 | 304 | * @param int $id |
305 | - * @param array $organizations |
|
306 | - * @param array $bUnits |
|
305 | + * @param Organization[] $organizations |
|
306 | + * @param BusinessUnit[] $bUnits |
|
307 | 307 | * @return User |
308 | 308 | */ |
309 | 309 | protected function getCurrentUser($id, array $organizations, array $bUnits) |
@@ -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 |
@@ -172,6 +172,9 @@ |
||
172 | 172 | $this->subscriber->postSetData($event); |
173 | 173 | } |
174 | 174 | |
175 | + /** |
|
176 | + * @param Tag $entity |
|
177 | + */ |
|
175 | 178 | protected function prepareEntityManager($entity) |
176 | 179 | { |
177 | 180 | $entityClass = ClassUtils::getClass($entity); |
@@ -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 |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |
43 | - * @param object $entity |
|
43 | + * @param \Oro\Bundle\OrganizationBundle\Entity\BusinessUnit $entity |
|
44 | 44 | * @return string |
45 | 45 | */ |
46 | 46 | public function getOwnerType($entity) |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | } |
56 | 56 | |
57 | 57 | /** |
58 | - * @param object $entity |
|
58 | + * @param \Oro\Bundle\OrganizationBundle\Tests\Unit\Fixture\Entity\Entity $entity |
|
59 | 59 | * |
60 | 60 | * @return null|object |
61 | 61 | */ |
@@ -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; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * Get sorting mode. |
69 | 69 | * Can be ASC, DESC or null. |
70 | 70 | * |
71 | - * @return string|null |
|
71 | + * @return string |
|
72 | 72 | */ |
73 | 73 | public function getSorting() |
74 | 74 | { |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * |
95 | 95 | * Note: getFunc name is used instead of getFunction due a problem with JS |
96 | 96 | * |
97 | - * @return array|null |
|
97 | + * @return string |
|
98 | 98 | */ |
99 | 99 | public function getFunc() |
100 | 100 | { |