@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\Security\Core\Authentication\Token\AbstractToken; |
6 | 6 | use Symfony\Component\Security\Core\Role\RoleInterface; |
7 | - |
|
8 | 7 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
9 | 8 | |
10 | 9 | class OrganizationToken extends AbstractToken implements OrganizationContextTokenInterface |
@@ -3,11 +3,9 @@ |
||
3 | 3 | namespace Oro\Bundle\SecurityBundle\EventListener; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\Event\OnFlushEventArgs; |
6 | - |
|
7 | 6 | use Symfony\Component\Security\Core\Util\ClassUtils; |
8 | 7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
9 | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
10 | - |
|
11 | 9 | use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; |
12 | 10 | use Oro\Bundle\SecurityBundle\Owner\OwnerTreeProviderInterface; |
13 | 11 |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\PropertyAccess\PropertyAccess; |
6 | 6 | use Symfony\Component\PropertyAccess\PropertyAccessor; |
7 | - |
|
8 | 7 | use Oro\Bundle\SearchBundle\Event\PrepareEntityMapEvent; |
9 | 8 | use Oro\Bundle\SearchBundle\Event\SearchMappingCollectEvent; |
10 | 9 | use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; |
@@ -3,14 +3,12 @@ |
||
3 | 3 | namespace Oro\Bundle\SecurityBundle\Http\Firewall; |
4 | 4 | |
5 | 5 | use Psr\Log\LoggerInterface; |
6 | - |
|
7 | 6 | use Symfony\Component\HttpKernel\Event\GetResponseEvent; |
8 | 7 | use Symfony\Component\Security\Core\SecurityContextInterface; |
9 | 8 | use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface; |
10 | 9 | use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface; |
11 | 10 | use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; |
12 | 11 | use Symfony\Component\Security\Core\Exception\AuthenticationException; |
13 | - |
|
14 | 12 | use Oro\Bundle\OrganizationBundle\Entity\Manager\OrganizationManager; |
15 | 13 | use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationContextTokenInterface; |
16 | 14 | use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationToken; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\SecurityBundle\Migrations\Schema; |
4 | 4 | |
5 | 5 | use Psr\Log\LoggerInterface; |
6 | - |
|
7 | 6 | use Oro\Bundle\MigrationBundle\Migration\ArrayLogger; |
8 | 7 | use Oro\Bundle\MigrationBundle\Migration\ParametrizedMigrationQuery; |
9 | 8 |
@@ -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 | */ |
@@ -13,9 +13,7 @@ |
||
13 | 13 | use Doctrine\ORM\Query\AST\IdentificationVariableDeclaration; |
14 | 14 | use Doctrine\ORM\EntityManager; |
15 | 15 | use Doctrine\ORM\Mapping\ClassMetadataInfo; |
16 | - |
|
17 | 16 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
18 | - |
|
19 | 17 | use Oro\Bundle\SecurityBundle\ORM\Walker\Condition\AclConditionStorage; |
20 | 18 | use Oro\Bundle\SecurityBundle\ORM\Walker\Condition\SubRequestAclConditionStorage; |
21 | 19 | use Oro\Bundle\SecurityBundle\ORM\Walker\Condition\AclCondition; |
@@ -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 | { |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
7 | 7 | use Symfony\Component\DependencyInjection\ContainerInterface; |
8 | 8 | use Symfony\Component\Security\Acl\Exception\InvalidDomainObjectException; |
9 | - |
|
10 | 9 | use Oro\Bundle\SecurityBundle\Acl\Extension\AccessLevelOwnershipDecisionMakerInterface; |
11 | 10 | use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; |
12 | 11 | use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; |
@@ -3,11 +3,9 @@ |
||
3 | 3 | namespace Oro\Bundle\SecurityBundle\Owner; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Util\Inflector; |
6 | - |
|
7 | 6 | use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException; |
8 | 7 | use Symfony\Component\PropertyAccess\PropertyAccess; |
9 | 8 | use Symfony\Component\Security\Core\Util\ClassUtils; |
10 | - |
|
11 | 9 | use Oro\Component\PropertyAccess\PropertyAccessor; |
12 | 10 | use Oro\Bundle\SecurityBundle\Owner\Metadata\MetadataProviderInterface; |
13 | 11 | use Oro\Bundle\EntityBundle\Exception\InvalidEntityException; |