@@ -9,7 +9,6 @@ |
||
9 | 9 | use FOS\RestBundle\Util\Codes; |
10 | 10 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
11 | 11 | use Symfony\Component\HttpFoundation\Response; |
12 | - |
|
13 | 12 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
14 | 13 | |
15 | 14 | /** |
@@ -3,12 +3,9 @@ |
||
3 | 3 | namespace Oro\Bundle\AddressBundle\Entity; |
4 | 4 | |
5 | 5 | use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; |
6 | - |
|
7 | 6 | use Doctrine\Common\Util\ClassUtils; |
8 | 7 | use Doctrine\ORM\Mapping as ORM; |
9 | - |
|
10 | 8 | use Symfony\Component\Validator\Context\ExecutionContextInterface; |
11 | - |
|
12 | 9 | use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\ConfigField; |
13 | 10 | use Oro\Bundle\FormBundle\Entity\EmptyItem; |
14 | 11 | use Oro\Bundle\LocaleBundle\Model\AddressInterface; |
@@ -4,12 +4,9 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\ORM\Mapping as ORM; |
6 | 6 | use Doctrine\Common\Collections\ArrayCollection; |
7 | - |
|
8 | 7 | use Gedmo\Mapping\Annotation as Gedmo; |
9 | 8 | use Gedmo\Translatable\Translatable; |
10 | - |
|
11 | 9 | use JMS\Serializer\Annotation as JMS; |
12 | - |
|
13 | 10 | use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; |
14 | 11 | use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\ConfigField; |
15 | 12 | use Oro\Bundle\AddressBundle\Model\ExtendCountry; |
@@ -2,7 +2,6 @@ |
||
2 | 2 | namespace Oro\Bundle\AddressBundle\Form\EventListener; |
3 | 3 | |
4 | 4 | use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress; |
5 | - |
|
6 | 5 | use Symfony\Component\Form\FormEvent; |
7 | 6 | use Symfony\Component\Form\FormEvents; |
8 | 7 | use Symfony\Component\PropertyAccess\PropertyAccess; |
@@ -2,7 +2,6 @@ |
||
2 | 2 | namespace Oro\Bundle\AddressBundle\Form\EventListener; |
3 | 3 | |
4 | 4 | use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress; |
5 | - |
|
6 | 5 | use Symfony\Component\Form\FormEvent; |
7 | 6 | use Symfony\Component\Form\FormEvents; |
8 | 7 | use Symfony\Component\PropertyAccess\PropertyAccess; |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Oro\Bundle\AddressBundle\Form\Handler; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Persistence\ObjectManager; |
6 | - |
|
7 | 6 | use Symfony\Component\Form\FormInterface; |
8 | 7 | use Symfony\Component\HttpFoundation\Request; |
9 | - |
|
10 | 8 | use Oro\Bundle\AddressBundle\Entity\AbstractAddress; |
11 | 9 | |
12 | 10 | class AddressHandler |
@@ -4,14 +4,11 @@ |
||
4 | 4 | |
5 | 5 | use Oro\Bundle\MigrationBundle\Fixture\VersionedFixtureInterface; |
6 | 6 | use Symfony\Component\Yaml\Yaml; |
7 | - |
|
8 | 7 | use Doctrine\Common\Persistence\ObjectManager; |
9 | 8 | use Doctrine\ORM\EntityRepository; |
10 | - |
|
11 | 9 | use Oro\Bundle\TranslationBundle\DataFixtures\AbstractTranslatableEntityFixture; |
12 | 10 | use Oro\Bundle\AddressBundle\Entity\Country; |
13 | 11 | use Oro\Bundle\AddressBundle\Entity\Region; |
14 | - |
|
15 | 12 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
16 | 13 | use Symfony\Component\DependencyInjection\ContainerInterface; |
17 | 14 |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Collections\Collection; |
6 | 6 | use Doctrine\Common\Util\ClassUtils; |
7 | - |
|
8 | 7 | use Symfony\Component\PropertyAccess\PropertyAccess; |
9 | - |
|
10 | 8 | use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; |
11 | 9 | use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; |
12 | 10 |
@@ -369,7 +369,7 @@ |
||
369 | 369 | |
370 | 370 | /** |
371 | 371 | * @param int|null $id |
372 | - * @return AbstractAddress|\PHPUnit_Framework_MockObject_MockObject |
|
372 | + * @return AbstractAddress |
|
373 | 373 | */ |
374 | 374 | protected function createAddress($id = null) |
375 | 375 | { |
@@ -2,8 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Oro\Bundle\AddressBundle\Tests\Entity; |
4 | 4 | |
5 | -use Symfony\Component\Validator\ExecutionContext; |
|
6 | - |
|
7 | 5 | use Oro\Bundle\AddressBundle\Entity\AbstractAddress; |
8 | 6 | use Oro\Bundle\AddressBundle\Entity\Country; |
9 | 7 | use Oro\Bundle\AddressBundle\Entity\Region; |