@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | * Gets all privileges associated with the given security identity. |
85 | 85 | * |
86 | 86 | * @param SID $sid |
87 | - * @return ArrayCollection|AclPrivilege[] |
|
87 | + * @return ArrayCollection |
|
88 | 88 | */ |
89 | 89 | public function getPrivileges(SID $sid) |
90 | 90 | { |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * Associates privileges with the given security identity. |
151 | 151 | * |
152 | 152 | * @param SID $sid |
153 | - * @param ArrayCollection|AclPrivilege[] $privileges |
|
153 | + * @param ArrayCollection $privileges |
|
154 | 154 | * @throws \RuntimeException |
155 | 155 | * |
156 | 156 | * @SuppressWarnings(PHPMD.NPathComplexity) |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | * @param array $context |
245 | 245 | * @param array $rootKeys |
246 | 246 | * @param SID $sid |
247 | - * @param ArrayCollection|AclPrivilege[] $privileges |
|
247 | + * @param ArrayCollection $privileges |
|
248 | 248 | */ |
249 | 249 | protected function initSaveContext(array &$context, array $rootKeys, SID $sid, ArrayCollection $privileges) |
250 | 250 | { |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | * Sorts the given privileges by name in alphabetical order. |
450 | 450 | * The root privilege is moved at the top of the list. |
451 | 451 | * |
452 | - * @param ArrayCollection|AclPrivilege[] $privileges [input/output] |
|
452 | + * @param ArrayCollection $privileges [input/output] |
|
453 | 453 | */ |
454 | 454 | protected function sortPrivileges(ArrayCollection &$privileges) |
455 | 455 | { |
@@ -2,16 +2,13 @@ |
||
2 | 2 | |
3 | 3 | namespace Oro\Bundle\SecurityBundle\Acl\Persistence; |
4 | 4 | |
5 | -use Symfony\Component\Security\Acl\Domain\ObjectIdentity; |
|
5 | +use Symfony\Component\Security\Acl\Domain\ObjectIdentity as OID; |
|
6 | 6 | use Symfony\Component\Security\Acl\Exception\NotAllAclsFoundException; |
7 | 7 | use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface as SID; |
8 | -use Symfony\Component\Security\Acl\Domain\ObjectIdentity as OID; |
|
9 | 8 | use Symfony\Component\Security\Acl\Model\EntryInterface; |
10 | 9 | use Symfony\Component\Security\Acl\Model\AclInterface; |
11 | 10 | use Symfony\Component\Translation\TranslatorInterface; |
12 | - |
|
13 | 11 | use Doctrine\Common\Collections\ArrayCollection; |
14 | - |
|
15 | 12 | use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdentityFactory; |
16 | 13 | use Oro\Bundle\SecurityBundle\Acl\AccessLevel; |
17 | 14 | use Oro\Bundle\SecurityBundle\Acl\Permission\MaskBuilder; |
@@ -13,11 +13,11 @@ |
||
13 | 13 | private $organization; |
14 | 14 | |
15 | 15 | /** |
16 | - * @param string|object $user The username (like a nickname, email address, etc.), |
|
16 | + * @param \Oro\Bundle\UserBundle\Entity\User $user The username (like a nickname, email address, etc.), |
|
17 | 17 | * or a UserInterface instance |
18 | 18 | * or an object implementing a __toString method. |
19 | 19 | * @param Organization $organization The organization |
20 | - * @param RoleInterface[]|string[] $roles An array of roles |
|
20 | + * @param RoleInterface[] $roles An array of roles |
|
21 | 21 | */ |
22 | 22 | public function __construct($user, Organization $organization, array $roles = []) |
23 | 23 | { |
@@ -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; |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | * |
163 | 163 | * @param SelectStatement $ast |
164 | 164 | * @param AclConditionStorage $storage |
165 | - * @param $permission |
|
165 | + * @param string $permission |
|
166 | 166 | */ |
167 | 167 | protected function processSubselects(SelectStatement $ast, AclConditionStorage $storage, $permission) |
168 | 168 | { |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | * |
305 | 305 | * @param IdentificationVariableDeclaration $declaration |
306 | 306 | * @param $key |
307 | - * @param $permission |
|
307 | + * @param string $permission |
|
308 | 308 | * |
309 | 309 | * @return JoinAssociationCondition|null |
310 | 310 | */ |
@@ -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 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
72 | - * @param array $joinConditions |
|
72 | + * @param integer[] $joinConditions |
|
73 | 73 | */ |
74 | 74 | public function setJoinConditions($joinConditions) |
75 | 75 | { |
@@ -123,7 +123,7 @@ |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | /** |
126 | - * @return ContainerInterface |
|
126 | + * @return ContainerAwareInterface |
|
127 | 127 | */ |
128 | 128 | protected function getContainer() |
129 | 129 | { |
@@ -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; |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | /** |
136 | 136 | * Gets the owning organization id for the given user id |
137 | 137 | * |
138 | - * @param int|string $userId |
|
138 | + * @param string $userId |
|
139 | 139 | * @return int|string|null |
140 | 140 | */ |
141 | 141 | public function getUserOrganizationId($userId) |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | /** |
162 | 162 | * Gets the owning business unit id for the given user id |
163 | 163 | * |
164 | - * @param int|string $userId |
|
164 | + * @param string $userId |
|
165 | 165 | * @return int|string|null |
166 | 166 | */ |
167 | 167 | public function getUserBusinessUnitId($userId) |
@@ -310,8 +310,8 @@ discard block |
||
310 | 310 | /** |
311 | 311 | * Add the given business unit to the tree |
312 | 312 | * |
313 | - * @param int|string $businessUnitId |
|
314 | - * @param int|string|null $owningOrganizationId |
|
313 | + * @param string $businessUnitId |
|
314 | + * @param null|string $owningOrganizationId |
|
315 | 315 | * |
316 | 316 | * @deprecated 1.8.0:2.1.0 use OwnerTree::addLocalEntity method |
317 | 317 | */ |
@@ -110,7 +110,7 @@ |
||
110 | 110 | |
111 | 111 | /** |
112 | 112 | * @param Query $query |
113 | - * @param $expr |
|
113 | + * @param \Oro\Bundle\SearchBundle\Query\Criteria\ExpressionBuilder $expr |
|
114 | 114 | */ |
115 | 115 | protected function addOrganizationLimits(Query $query, $expr) |
116 | 116 | { |
@@ -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; |
@@ -346,6 +346,9 @@ discard block |
||
346 | 346 | ); |
347 | 347 | } |
348 | 348 | |
349 | + /** |
|
350 | + * @param ObjectIdentity $oid |
|
351 | + */ |
|
349 | 352 | protected function getAcl($oid = null, $entriesInheriting = true) |
350 | 353 | { |
351 | 354 | static $id = 1; |
@@ -385,7 +388,7 @@ discard block |
||
385 | 388 | |
386 | 389 | /** |
387 | 390 | * @param string $permission |
388 | - * @param object $object |
|
391 | + * @param TestEntity $object |
|
389 | 392 | * @return array|null may return null if permission/object combination is not supported |
390 | 393 | */ |
391 | 394 | private function getMasks($permission, $object) |
@@ -395,7 +398,7 @@ discard block |
||
395 | 398 | |
396 | 399 | /** |
397 | 400 | * @param string $permission |
398 | - * @param mixed $object |
|
401 | + * @param TestEntity $object |
|
399 | 402 | * @return MaskBuilder |
400 | 403 | */ |
401 | 404 | private function getMaskBuilder($permission, $object) |
@@ -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; |
@@ -65,7 +65,7 @@ |
||
65 | 65 | /** |
66 | 66 | * @param bool $isSupports |
67 | 67 | * @param string $group |
68 | - * @return \PHPUnit_Framework_MockObject_MockObject|AclGroupProviderInterface |
|
68 | + * @return AclGroupProviderInterface |
|
69 | 69 | */ |
70 | 70 | protected function getAclGroupProviderMock($isSupports = true, $group = '') |
71 | 71 | { |