@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
123 | - * @param $tagsNames |
|
123 | + * @param string[] $tagsNames |
|
124 | 124 | * @return Tag[] |
125 | 125 | */ |
126 | 126 | protected function createTags($tagsNames) |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | /** |
230 | 230 | * Persist object |
231 | 231 | * |
232 | - * @param mixed $manager |
|
232 | + * @param EntityManager $manager |
|
233 | 233 | * @param mixed $object |
234 | 234 | */ |
235 | 235 | private function persist($manager, $object) |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | /** |
241 | 241 | * Flush objects |
242 | 242 | * |
243 | - * @param mixed $manager |
|
243 | + * @param EntityManager $manager |
|
244 | 244 | */ |
245 | 245 | private function flush($manager) |
246 | 246 | { |
@@ -3,19 +3,15 @@ |
||
3 | 3 | |
4 | 4 | use Doctrine\Common\DataFixtures\AbstractFixture; |
5 | 5 | use Doctrine\Common\DataFixtures\DependentFixtureInterface; |
6 | - |
|
7 | 6 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
8 | 7 | use Oro\Bundle\TagBundle\Entity\Tag; |
9 | 8 | use Oro\Bundle\TagBundle\Entity\TagManager; |
10 | 9 | use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationToken; |
11 | - |
|
12 | 10 | use Symfony\Component\DependencyInjection\ContainerInterface; |
13 | 11 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
14 | - |
|
15 | 12 | use Doctrine\Common\Persistence\ObjectManager; |
16 | 13 | use Doctrine\ORM\EntityRepository; |
17 | 14 | use Doctrine\ORM\EntityManager; |
18 | - |
|
19 | 15 | use OroCRM\Bundle\AccountBundle\Entity\Account; |
20 | 16 | use OroCRM\Bundle\ContactBundle\Entity\Contact; |
21 | 17 | use Oro\Bundle\UserBundle\Entity\User; |
@@ -5,10 +5,8 @@ |
||
5 | 5 | use Doctrine\Common\DataFixtures\AbstractFixture; |
6 | 6 | use Doctrine\Common\DataFixtures\DependentFixtureInterface; |
7 | 7 | use Doctrine\Common\Persistence\ObjectManager; |
8 | - |
|
9 | 8 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
10 | 9 | use Symfony\Component\DependencyInjection\ContainerInterface; |
11 | - |
|
12 | 10 | use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationToken; |
13 | 11 | use Oro\Bundle\UserBundle\Entity\User; |
14 | 12 | use OroCRM\Bundle\AccountBundle\Entity\Account; |
@@ -132,7 +132,7 @@ |
||
132 | 132 | |
133 | 133 | /** |
134 | 134 | * @param ObjectManager $manager |
135 | - * @param $name |
|
135 | + * @param string $name |
|
136 | 136 | * @return BusinessUnit |
137 | 137 | */ |
138 | 138 | protected function getBusinessUnit(ObjectManager $manager, $name) |
@@ -7,10 +7,8 @@ |
||
7 | 7 | use Doctrine\Common\Persistence\ObjectManager; |
8 | 8 | use Doctrine\ORM\EntityRepository; |
9 | 9 | use Doctrine\ORM\EntityManager; |
10 | - |
|
11 | 10 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
12 | 11 | use Symfony\Component\DependencyInjection\ContainerInterface; |
13 | - |
|
14 | 12 | use Oro\Bundle\DataAuditBundle\Tests\Unit\Fixture\Repository\UserRepository; |
15 | 13 | use Oro\Bundle\TagBundle\Entity\TagManager; |
16 | 14 | use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; |
@@ -8,11 +8,9 @@ |
||
8 | 8 | use Doctrine\Common\Persistence\ObjectManager; |
9 | 9 | use Doctrine\ORM\EntityRepository; |
10 | 10 | use Doctrine\ORM\EntityManager; |
11 | - |
|
12 | 11 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
13 | 12 | use Symfony\Component\DependencyInjection\ContainerInterface; |
14 | 13 | use Symfony\Component\Security\Core\SecurityContext; |
15 | - |
|
16 | 14 | use Oro\Bundle\CalendarBundle\Entity\Calendar; |
17 | 15 | use Oro\Bundle\CalendarBundle\Entity\CalendarEvent; |
18 | 16 | use Oro\Bundle\CalendarBundle\Entity\CalendarProperty; |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | * @param string $firstName |
130 | 130 | * @param string $lastName |
131 | 131 | * @param \DateTime $birthday |
132 | - * @param mixed $role |
|
132 | + * @param Role $role |
|
133 | 133 | * @return User |
134 | 134 | */ |
135 | 135 | private function createUser($username, $email, $firstName, $lastName, $birthday, $role) |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | /** |
256 | 256 | * Persist object |
257 | 257 | * |
258 | - * @param mixed $object |
|
258 | + * @param User $object |
|
259 | 259 | * @return void |
260 | 260 | */ |
261 | 261 | private function persist($object) |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | } |
275 | 275 | |
276 | 276 | /** |
277 | - * @param $name |
|
277 | + * @param string $name |
|
278 | 278 | * @return BusinessUnit |
279 | 279 | */ |
280 | 280 | protected function getBusinessUnit($name) |
@@ -4,11 +4,9 @@ |
||
4 | 4 | use Doctrine\ORM\EntityManager; |
5 | 5 | use Symfony\Component\DependencyInjection\ContainerInterface; |
6 | 6 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
7 | - |
|
8 | 7 | use Doctrine\Common\DataFixtures\AbstractFixture; |
9 | 8 | use Doctrine\Common\Persistence\ObjectManager; |
10 | 9 | use Doctrine\Common\DataFixtures\DependentFixtureInterface; |
11 | - |
|
12 | 10 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
13 | 11 | use Oro\Bundle\UserBundle\Entity\Role; |
14 | 12 | use Oro\Bundle\UserBundle\Entity\UserManager; |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
9 | 9 | use Symfony\Component\DependencyInjection\ContainerInterface; |
10 | 10 | use Symfony\Component\Yaml\Yaml; |
11 | - |
|
12 | 11 | use Oro\Bundle\UserBundle\Entity\Role; |
13 | 12 | use Oro\Bundle\SecurityBundle\Acl\Persistence\AclManager; |
14 | 13 | use Oro\Bundle\OrganizationBundle\Migrations\Data\ORM\LoadOrganizationAndBusinessUnitData; |
@@ -5,9 +5,7 @@ |
||
5 | 5 | use OroCRM\Bundle\MagentoBundle\Entity\IntegrationAwareInterface; |
6 | 6 | use Symfony\Component\Security\Acl\Model\ObjectIdentityInterface; |
7 | 7 | use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; |
8 | - |
|
9 | 8 | use Oro\Bundle\SecurityBundle\Acl\Voter\AbstractEntityVoter; |
10 | - |
|
11 | 9 | use OroCRM\Bundle\MagentoBundle\Model\ChannelSettingsProvider; |
12 | 10 | |
13 | 11 | abstract class AbstractTwoWaySyncVoter extends AbstractEntityVoter |
@@ -3,22 +3,17 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MagentoBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityNotFoundException; |
6 | - |
|
7 | 6 | use Symfony\Component\HttpFoundation\JsonResponse; |
8 | 7 | use Symfony\Component\HttpFoundation\Response; |
9 | - |
|
10 | 8 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
11 | 9 | use FOS\RestBundle\Routing\ClassResourceInterface; |
12 | 10 | use FOS\RestBundle\Util\Codes; |
13 | - |
|
14 | 11 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
15 | - |
|
16 | 12 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
17 | 13 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
18 | 14 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
19 | 15 | use Oro\Bundle\AddressBundle\Entity\AddressType; |
20 | 16 | use Oro\Bundle\SecurityBundle\Exception\ForbiddenException; |
21 | - |
|
22 | 17 | use OroCRM\Bundle\MagentoBundle\Entity\Cart; |
23 | 18 | use OroCRM\Bundle\MagentoBundle\Entity\CartAddress; |
24 | 19 |
@@ -3,13 +3,10 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MagentoBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\Response; |
6 | - |
|
7 | 6 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
8 | 7 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
9 | 8 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
10 | - |
|
11 | 9 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
12 | - |
|
13 | 10 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
14 | 11 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
15 | 12 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |