@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Oro\Bundle\SecurityBundle\Acl\AccessLevel; |
6 | 6 | use Symfony\Component\Security\Core\SecurityContextInterface; |
7 | - |
|
8 | 7 | use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; |
9 | 8 | use Oro\Bundle\SecurityBundle\Acl\Domain\OneShotIsGrantedObserver; |
10 | 9 | use Oro\Bundle\SecurityBundle\Acl\Voter\AclVoter; |
@@ -4,11 +4,9 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\PropertyAccess\PropertyAccess; |
6 | 6 | use Symfony\Component\PropertyAccess\PropertyAccessor; |
7 | - |
|
8 | 7 | use Doctrine\Common\Util\ClassUtils; |
9 | 8 | use Doctrine\Common\Persistence\ManagerRegistry; |
10 | 9 | use Doctrine\ORM\EntityRepository; |
11 | - |
|
12 | 10 | use Oro\Bundle\ImportExportBundle\Event\StrategyEvent; |
13 | 11 | use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; |
14 | 12 | use Oro\Bundle\SecurityBundle\SecurityFacade; |
@@ -4,17 +4,13 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Util\ClassUtils; |
6 | 6 | use Doctrine\ORM\Event\LifecycleEventArgs; |
7 | - |
|
8 | 7 | use Symfony\Component\PropertyAccess\PropertyAccess; |
9 | 8 | use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; |
10 | 9 | use Symfony\Component\Security\Core\SecurityContextInterface; |
11 | - |
|
12 | 10 | use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; |
13 | 11 | use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; |
14 | 12 | use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; |
15 | - |
|
16 | 13 | use Oro\Bundle\OrganizationBundle\Form\Type\OwnershipType; |
17 | - |
|
18 | 14 | use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationContextTokenInterface; |
19 | 15 | |
20 | 16 | class RecordOwnerDataListener |
@@ -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\UserBundle\Entity\User; |
11 | 9 | use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; |
12 | 10 |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Oro\Bundle\OrganizationBundle\Form\Handler; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Symfony\Component\Form\FormInterface; |
8 | 7 | use Symfony\Component\HttpFoundation\Request; |
9 | - |
|
10 | 8 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
11 | 9 | |
12 | 10 | class OrganizationHandler |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use Symfony\Component\Form\FormEvent; |
8 | 8 | use Symfony\Component\Form\FormEvents; |
9 | 9 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; |
10 | - |
|
11 | 10 | use Oro\Bundle\SecurityBundle\SecurityFacade; |
12 | 11 | use Oro\Bundle\OrganizationBundle\Entity\Manager\BusinessUnitManager; |
13 | 12 | use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; |
@@ -4,13 +4,11 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | 6 | use Doctrine\ORM\PersistentCollection; |
7 | - |
|
8 | 7 | use Symfony\Component\Form\AbstractType; |
9 | 8 | use Symfony\Component\Form\FormBuilderInterface; |
10 | 9 | use Symfony\Component\Form\FormInterface; |
11 | 10 | use Symfony\Component\Form\FormView; |
12 | 11 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; |
13 | - |
|
14 | 12 | use Oro\Bundle\SecurityBundle\SecurityFacade; |
15 | 13 | use Oro\Bundle\OrganizationBundle\Entity\Manager\BusinessUnitManager; |
16 | 14 |
@@ -11,7 +11,6 @@ |
||
11 | 11 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; |
12 | 12 | use Symfony\Component\Security\Core\SecurityContext; |
13 | 13 | use Symfony\Component\Validator\Constraints\NotBlank; |
14 | - |
|
15 | 14 | use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationToken; |
16 | 15 | |
17 | 16 | class OrganizationType extends AbstractType |
@@ -302,8 +302,8 @@ |
||
302 | 302 | |
303 | 303 | /** |
304 | 304 | * @param int $id |
305 | - * @param array $organizations |
|
306 | - * @param array $bUnits |
|
305 | + * @param Organization[] $organizations |
|
306 | + * @param BusinessUnit[] $bUnits |
|
307 | 307 | * @return User |
308 | 308 | */ |
309 | 309 | protected function getCurrentUser($id, array $organizations, array $bUnits) |
@@ -3,12 +3,10 @@ |
||
3 | 3 | namespace Oro\Bundle\OrganizationBundle\Tests\Unit\Entity\Manager; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Collections\ArrayCollection; |
6 | - |
|
7 | 6 | use Oro\Bundle\OrganizationBundle\Entity\Manager\BusinessUnitManager; |
8 | 7 | use Oro\Bundle\OrganizationBundle\Tests\Unit\Fixture\Entity\BusinessUnit; |
9 | 8 | use Oro\Bundle\OrganizationBundle\Tests\Unit\Fixture\Entity\Organization; |
10 | 9 | use Oro\Bundle\OrganizationBundle\Tests\Unit\Fixture\Entity\User; |
11 | - |
|
12 | 10 | use Oro\Bundle\SecurityBundle\Acl\AccessLevel; |
13 | 11 | use Oro\Bundle\SecurityBundle\Owner\OwnerTree; |
14 | 12 |