@@ -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 | { |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Doctrine\ORM\Event\OnClearEventArgs; |
6 | 6 | use Doctrine\ORM\Event\OnFlushEventArgs; |
7 | 7 | use Doctrine\ORM\Event\PostFlushEventArgs; |
8 | - |
|
9 | 8 | use Oro\Bundle\SearchBundle\EventListener\IndexListener; |
10 | 9 | use Oro\Bundle\SearchBundle\Provider\SearchMappingProvider; |
11 | 10 | use Oro\Bundle\SearchBundle\Tests\Unit\Fixture\Entity\Product; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\SearchBundle\Tests\Unit\EventListener\ORM; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\Mapping\ClassMetadataInfo; |
6 | - |
|
7 | 6 | use Oro\Bundle\EntityBundle\ORM\DatabaseDriverInterface; |
8 | 7 | use Oro\Bundle\SearchBundle\Engine\Orm\PdoMysql; |
9 | 8 | use Oro\Bundle\SearchBundle\Entity\IndexText; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\SearchBundle\Tests\Unit\Fixture\Entity; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\Mapping as ORM; |
6 | - |
|
7 | 6 | use Oro\Bundle\SearchBundle\Tests\Unit\Fixture\Attribute; |
8 | 7 | |
9 | 8 | /** |
@@ -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 | { |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Doctrine\ORM\Mapping\ClassMetadata; |
7 | 7 | use Doctrine\ORM\Query\Expr\Func; |
8 | 8 | use Doctrine\ORM\EntityRepository; |
9 | - |
|
10 | 9 | use Oro\Bundle\SearchBundle\Tests\Unit\Formatter\Stub\Category; |
11 | 10 | use Oro\Bundle\SearchBundle\Tests\Unit\Formatter\Stub\Product; |
12 | 11 | use Oro\Bundle\SearchBundle\Query\Result\Item; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | |
4 | 4 | use Oro\Bundle\SearchBundle\Query\Criteria\Comparison; |
5 | 5 | use Oro\Bundle\SearchBundle\Tests\Unit\Fixture\Entity\Product; |
6 | - |
|
7 | 6 | use Oro\Bundle\SearchBundle\Query\Result; |
8 | 7 | use Oro\Bundle\SearchBundle\Query\Result\Item; |
9 | 8 | use Oro\Bundle\SearchBundle\Query\Query; |
@@ -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 | */ |
@@ -10,7 +10,6 @@ |
||
10 | 10 | use Symfony\Component\Security\Acl\Exception\InvalidDomainObjectException; |
11 | 11 | use Symfony\Component\Security\Acl\Exception\AclNotFoundException; |
12 | 12 | use Symfony\Component\Security\Acl\Model\EntryInterface; |
13 | - |
|
14 | 13 | use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdentityFactory; |
15 | 14 | use Oro\Bundle\SecurityBundle\Acl\Dbal\MutableAclProvider; |
16 | 15 | use Oro\Bundle\SecurityBundle\Acl\Extension\AclExtensionSelector; |
@@ -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; |
@@ -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 | { |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\SecurityBundle\Annotation\Loader; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Annotations\Reader as AnnotationReader; |
6 | - |
|
7 | 6 | use Oro\Bundle\SecurityBundle\DependencyInjection\OroSecurityExtension; |
8 | 7 | use Oro\Bundle\SecurityBundle\Metadata\AclAnnotationStorage; |
9 | 8 |