@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | /** |
| 108 | - * @return mixed |
|
| 108 | + * @return string |
|
| 109 | 109 | */ |
| 110 | 110 | public function getSortBy() |
| 111 | 111 | { |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |
| 116 | - * @return mixed |
|
| 116 | + * @return string|null |
|
| 117 | 117 | */ |
| 118 | 118 | public function getSortOrder() |
| 119 | 119 | { |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | /** |
| 100 | 100 | * Get entity class name from alias |
| 101 | 101 | * |
| 102 | - * @param $aliasName |
|
| 102 | + * @param string $aliasName |
|
| 103 | 103 | * |
| 104 | 104 | * @return bool|string |
| 105 | 105 | */ |
@@ -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; |
@@ -238,7 +238,7 @@ |
||
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
| 241 | - * @return \PHPUnit_Framework_MockObject_MockObject |
|
| 241 | + * @return \Doctrine\ORM\EntityManagerInterface |
|
| 242 | 242 | */ |
| 243 | 243 | protected function createEntityManager() |
| 244 | 244 | { |
@@ -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; |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | * |
| 131 | 131 | * @param string $entityName |
| 132 | 132 | * @param array $entities |
| 133 | - * @param array $entityIds |
|
| 133 | + * @param integer[] $entityIds |
|
| 134 | 134 | * @return EntityRepository |
| 135 | 135 | */ |
| 136 | 136 | protected function prepareEntityRepository($entityName, array $entities, array $entityIds) |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | /** |
| 226 | 226 | * Get list of test indexer rows |
| 227 | 227 | * |
| 228 | - * @return array |
|
| 228 | + * @return Item[] |
|
| 229 | 229 | */ |
| 230 | 230 | protected function getIndexerRows() |
| 231 | 231 | { |
@@ -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; |
@@ -66,8 +66,8 @@ |
||
| 66 | 66 | /** |
| 67 | 67 | * Trim and highlight text by search string |
| 68 | 68 | * |
| 69 | - * @param $text |
|
| 70 | - * @param $searchString |
|
| 69 | + * @param string $text |
|
| 70 | + * @param string $searchString |
|
| 71 | 71 | * @param int $symbolCount |
| 72 | 72 | * |
| 73 | 73 | * @return string |
@@ -242,7 +242,7 @@ |
||
| 242 | 242 | * getOid('Entity:AcmeBundle:SomeEntity') |
| 243 | 243 | * getOid('Action:Some Action') |
| 244 | 244 | * |
| 245 | - * @param mixed $val An domain object, object identity descriptor (id:type) or ACL annotation |
|
| 245 | + * @param string $val An domain object, object identity descriptor (id:type) or ACL annotation |
|
| 246 | 246 | * @return OID |
| 247 | 247 | * @throws InvalidDomainObjectException |
| 248 | 248 | */ |
@@ -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; |
@@ -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 | |