@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\SecurityBundle\Tests\Unit\Stub; |
4 | 4 | |
5 | 5 | use Symfony\Component\DependencyInjection\ContainerInterface; |
6 | - |
|
7 | 6 | use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; |
8 | 7 | use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; |
9 | 8 |
@@ -73,7 +73,7 @@ |
||
73 | 73 | /** |
74 | 74 | * Check if ACL resource is granted for current user |
75 | 75 | * |
76 | - * @param string|string[] $attributes Can be a role name(s), permission name(s), an ACL annotation id |
|
76 | + * @param string $attributes Can be a role name(s), permission name(s), an ACL annotation id |
|
77 | 77 | * or something else, it depends on registered security voters |
78 | 78 | * @param mixed $object A domain object, object identity or object identity descriptor (id:type) |
79 | 79 | * |
@@ -4,16 +4,13 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\Form\FormInterface; |
6 | 6 | use Symfony\Component\HttpFoundation\Response; |
7 | - |
|
8 | 7 | use FOS\RestBundle\Util\Codes; |
9 | 8 | use FOS\RestBundle\Routing\ClassResourceInterface; |
10 | 9 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
11 | 10 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
12 | 11 | use FOS\RestBundle\Controller\Annotations\Get; |
13 | 12 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
14 | - |
|
15 | 13 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
16 | - |
|
17 | 14 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
18 | 15 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
19 | 16 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
@@ -4,12 +4,9 @@ |
||
4 | 4 | |
5 | 5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
6 | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
7 | - |
|
8 | 7 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
9 | - |
|
10 | 8 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
11 | 9 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
12 | - |
|
13 | 10 | use Oro\Bundle\UIBundle\Route\Router; |
14 | 11 | use Oro\Bundle\SegmentBundle\Entity\Segment; |
15 | 12 | use Oro\Bundle\SegmentBundle\Entity\SegmentType; |
@@ -5,10 +5,8 @@ |
||
5 | 5 | use Doctrine\Common\Collections\ArrayCollection; |
6 | 6 | use Doctrine\DBAL\Driver\Statement; |
7 | 7 | use Doctrine\ORM\EntityManager; |
8 | -use Doctrine\ORM\Query; |
|
9 | 8 | use Doctrine\ORM\QueryBuilder; |
10 | 9 | use Doctrine\ORM\Query\Parameter; |
11 | - |
|
12 | 10 | use Oro\Bundle\EntityBundle\ORM\DatabaseDriverInterface; |
13 | 11 | use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; |
14 | 12 | use Oro\Bundle\SegmentBundle\Entity\Segment; |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Doctrine\Common\Util\ClassUtils; |
6 | 6 | use Doctrine\ORM\EntityRepository; |
7 | 7 | use Doctrine\ORM\QueryBuilder; |
8 | - |
|
9 | 8 | use Oro\Bundle\SegmentBundle\Entity\Segment; |
10 | 9 | use Oro\Bundle\SegmentBundle\Entity\SegmentSnapshot; |
11 | 10 |
@@ -90,7 +90,7 @@ |
||
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
93 | - * @return int |
|
93 | + * @return string |
|
94 | 94 | */ |
95 | 95 | public function getEntityId() |
96 | 96 | { |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Doctrine\Common\Util\ClassUtils; |
6 | 6 | use Doctrine\ORM\Event\LifecycleEventArgs; |
7 | 7 | use Doctrine\ORM\Event\PostFlushEventArgs; |
8 | - |
|
9 | 8 | use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; |
10 | 9 | |
11 | 10 | class DoctrinePreRemoveListener |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\Form\FormInterface; |
6 | 6 | use Symfony\Component\HttpFoundation\Request; |
7 | - |
|
8 | 7 | use Doctrine\Common\Persistence\ObjectManager; |
9 | - |
|
10 | 8 | use Oro\Bundle\SegmentBundle\Entity\Segment; |
11 | 9 | |
12 | 10 | class SegmentHandler |