[WIP] Symfony 3.0 upgrade

src/Oro/Bundle/AddressBundle/Controller/Api/Rest/AddressController.php

@@ -2,20 +2,20 @@
 
 namespace Oro\Bundle\AddressBundle\Controller\Api\Rest;
 
-use Symfony\Component\Form\Form;
-use Symfony\Component\HttpFoundation\Response;
-
 use FOS\RestBundle\Controller\Annotations\NamePrefix;
-use FOS\RestBundle\Controller\Annotations\RouteResource;
 use FOS\RestBundle\Controller\Annotations\QueryParam;
-use FOS\RestBundle\Routing\ClassResourceInterface;
 
+use FOS\RestBundle\Controller\Annotations\RouteResource;
+use FOS\RestBundle\Routing\ClassResourceInterface;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use Oro\Bundle\AddressBundle\Entity\Manager\AddressManager;
 
 use Oro\Bundle\SecurityBundle\Annotation\Acl;
-use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler;
+
 use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController;
-use Oro\Bundle\AddressBundle\Entity\Manager\AddressManager;
+use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler;
+use Symfony\Component\Form\Form;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * @RouteResource("address")

src/Oro/Bundle/AddressBundle/Controller/Api/Rest/AddressTypeController.php

@@ -2,19 +2,19 @@
 
 namespace Oro\Bundle\AddressBundle\Controller\Api\Rest;
 
-use Symfony\Component\HttpFoundation\Response;
-
-use FOS\RestBundle\Routing\ClassResourceInterface;
 use FOS\Rest\Util\Codes;
-use FOS\RestBundle\Controller\FOSRestController;
+
 use FOS\RestBundle\Controller\Annotations\NamePrefix;
 use FOS\RestBundle\Controller\Annotations\RouteResource;
-
+use FOS\RestBundle\Controller\FOSRestController;
+use FOS\RestBundle\Routing\ClassResourceInterface;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 
-use Oro\Bundle\SecurityBundle\Annotation\Acl;
 use Oro\Bundle\AddressBundle\Entity\AddressType;
 
+use Oro\Bundle\SecurityBundle\Annotation\Acl;
+use Symfony\Component\HttpFoundation\Response;
+
 /**
  * @RouteResource("addresstype")
  * @NamePrefix("oro_api_")

src/Oro/Bundle/AddressBundle/Controller/Api/Rest/CountryController.php

@@ -3,9 +3,9 @@
 namespace Oro\Bundle\AddressBundle\Controller\Api\Rest;
 
 use FOS\Rest\Util\Codes;
-use FOS\RestBundle\Controller\FOSRestController;
 use FOS\RestBundle\Controller\Annotations\NamePrefix;
 use FOS\RestBundle\Controller\Annotations\RouteResource;
+use FOS\RestBundle\Controller\FOSRestController;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
 use Symfony\Component\HttpFoundation\Response;

src/Oro/Bundle/AddressBundle/Controller/Api/Rest/CountryRegionsController.php

@@ -2,18 +2,18 @@
 
 namespace Oro\Bundle\AddressBundle\Controller\Api\Rest;
 
-use Symfony\Component\HttpFoundation\Response;
 use Doctrine\ORM\Query;
 use FOS\Rest\Util\Codes;
-use FOS\RestBundle\Controller\FOSRestController;
 use FOS\RestBundle\Controller\Annotations\NamePrefix;
 use FOS\RestBundle\Controller\Annotations\RouteResource;
+use FOS\RestBundle\Controller\FOSRestController;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
-use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
-
 use Oro\Bundle\AddressBundle\Entity\Country;
 use Oro\Bundle\AddressBundle\Entity\Repository\RegionRepository;
 
+use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
+use Symfony\Component\HttpFoundation\Response;
+
 /**
  * @RouteResource("country/regions")
  * @NamePrefix("oro_api_country_")

src/Oro/Bundle/AddressBundle/Controller/Api/Rest/RegionController.php

@@ -3,14 +3,14 @@
 namespace Oro\Bundle\AddressBundle\Controller\Api\Rest;
 
 use FOS\Rest\Util\Codes;
-use FOS\RestBundle\Controller\FOSRestController;
 use FOS\RestBundle\Controller\Annotations\NamePrefix;
+use FOS\RestBundle\Controller\Annotations\QueryParam;
 use FOS\RestBundle\Controller\Annotations\RouteResource;
-use Symfony\Component\HttpFoundation\Response;
+use FOS\RestBundle\Controller\FOSRestController;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
-use Symfony\Component\Routing\Annotation\Route;
-use FOS\RestBundle\Controller\Annotations\QueryParam;
 use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * @RouteResource("region")

src/Oro/Bundle/AddressBundle/Controller/Api/Soap/AddressController.php

@@ -2,13 +2,13 @@
 
 namespace Oro\Bundle\AddressBundle\Controller\Api\Soap;
 
-use Symfony\Component\Form\FormInterface;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
+use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
 
 use Oro\Bundle\SoapBundle\Controller\Api\Soap\SoapController;
 use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager;
 use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler;
-use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
+use Symfony\Component\Form\FormInterface;
 
 /**
  * TODO: Discuss ACL impl.

src/Oro/Bundle/AddressBundle/Controller/Api/Soap/AddressTypeController.php

@@ -2,10 +2,10 @@
 
 namespace Oro\Bundle\AddressBundle\Controller\Api\Soap;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
+
 use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 /**
  * TODO: Discuss ACL impl.

src/Oro/Bundle/AddressBundle/Controller/Api/Soap/CountryController.php

@@ -2,12 +2,12 @@
 
 namespace Oro\Bundle\AddressBundle\Controller\Api\Soap;
 
-use Symfony\Component\DependencyInjection\ContainerAware;
-use Doctrine\Common\Persistence\ObjectManager;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
+use Doctrine\Common\Persistence\ObjectManager;
+use Oro\Bundle\AddressBundle\Entity\Address;
 use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
 
-use Oro\Bundle\AddressBundle\Entity\Address;
+use Symfony\Component\DependencyInjection\ContainerAware;
 
 /**
  * TODO: Discuss ACL impl.

src/Oro/Bundle/AddressBundle/Controller/Api/Soap/RegionController.php

@@ -2,15 +2,15 @@
 
 namespace Oro\Bundle\AddressBundle\Controller\Api\Soap;
 
-use Symfony\Component\DependencyInjection\ContainerAware;
-use Doctrine\Common\Persistence\ObjectManager;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
-use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
-
+use Doctrine\Common\Persistence\ObjectManager;
 use Oro\Bundle\AddressBundle\Entity\Address;
 use Oro\Bundle\AddressBundle\Entity\Country;
+
 use Oro\Bundle\AddressBundle\Entity\Region;
 use Oro\Bundle\AddressBundle\Entity\Repository\RegionRepository;
+use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
+use Symfony\Component\DependencyInjection\ContainerAware;
 
 /**
  * TODO: Discuss ACL impl.

src/Oro/Bundle/AddressBundle/DataFixtures/ORM/LoadCountryData.php

@@ -2,15 +2,15 @@
 
 namespace Oro\Bundle\AddressBundle\DataFixtures\ORM;
 
-use Symfony\Component\Yaml\Yaml;
-use Symfony\Component\Finder\Finder;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\EntityRepository;
-
-use Oro\Bundle\TranslationBundle\DataFixtures\AbstractTranslatableEntityFixture;
 use Oro\Bundle\AddressBundle\Entity\Country;
 use Oro\Bundle\AddressBundle\Entity\Region;
 
+use Oro\Bundle\TranslationBundle\DataFixtures\AbstractTranslatableEntityFixture;
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Yaml\Yaml;
+
 class LoadCountryData extends AbstractTranslatableEntityFixture
 {
     const COUNTRY_PREFIX = 'country';

src/Oro/Bundle/AddressBundle/Datagrid/CountryDatagridHelper.php

@@ -2,11 +2,11 @@
 
 namespace Oro\Bundle\AddressBundle\Datagrid;
 
-use Doctrine\ORM\Query;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
 
-use Oro\Bundle\DataGridBundle\Event\BuildAfter;
 use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
+use Oro\Bundle\DataGridBundle\Event\BuildAfter;
 
 class CountryDatagridHelper
 {

src/Oro/Bundle/AddressBundle/DependencyInjection/OroAddressExtension.php

@@ -2,10 +2,10 @@
 
 namespace Oro\Bundle\AddressBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * This is the class that loads and manages your bundle configuration

src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php

@@ -2,14 +2,14 @@
 
 namespace Oro\Bundle\AddressBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
+use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 
-use Symfony\Component\Validator\ExecutionContext;
+use Doctrine\ORM\Mapping as ORM;
 
-use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
+use Oro\Bundle\LocaleBundle\Model\AddressInterface;
 
 use Oro\Bundle\LocaleBundle\Model\FullNameInterface;
-use Oro\Bundle\LocaleBundle\Model\AddressInterface;
+use Symfony\Component\Validator\ExecutionContext;
 
 /**
  * Address

src/Oro/Bundle/AddressBundle/Entity/AbstractEmail.php

@@ -2,10 +2,10 @@
 
 namespace Oro\Bundle\AddressBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 
+use Doctrine\ORM\Mapping as ORM;
+
 /**
  * @ORM\MappedSuperclass
  */

src/Oro/Bundle/AddressBundle/Entity/AbstractPhone.php

@@ -2,10 +2,10 @@
 
 namespace Oro\Bundle\AddressBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 
+use Doctrine\ORM\Mapping as ORM;
+
 /**
  * @ORM\MappedSuperclass
  */

src/Oro/Bundle/AddressBundle/Entity/AbstractTypedAddress.php

@@ -2,11 +2,11 @@
 
 namespace Oro\Bundle\AddressBundle\Entity;
 
-use Doctrine\Common\Collections\Collection;
+use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\Collection;
 
-use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
+use Doctrine\ORM\Mapping as ORM;
 
 use Oro\Bundle\AddressBundle\Entity\AddressType;
 

src/Oro/Bundle/AddressBundle/Entity/AddressType.php

@@ -2,10 +2,10 @@
 
 namespace Oro\Bundle\AddressBundle\Entity;
 
+use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Gedmo\Translatable\Translatable;
-use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 
 /**
  * AddressType

src/Oro/Bundle/AddressBundle/Entity/Country.php

@@ -2,12 +2,12 @@
 
 namespace Oro\Bundle\AddressBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
+use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
-use Gedmo\Translatable\Translatable;
 
-use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
+use Gedmo\Translatable\Translatable;
 
 /**
  * Country

src/Oro/Bundle/AddressBundle/Entity/Region.php

@@ -2,9 +2,9 @@
 
 namespace Oro\Bundle\AddressBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
 use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Gedmo\Translatable\Translatable;
 

src/Oro/Bundle/AddressBundle/Entity/Repository/RegionRepository.php

@@ -2,8 +2,8 @@
 
 namespace Oro\Bundle\AddressBundle\Entity\Repository;
 
-use Doctrine\ORM\Query;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 
 use Oro\Bundle\AddressBundle\Entity\Country;

src/Oro/Bundle/AddressBundle/Form/EventListener/AddressCountryAndRegionSubscriber.php

@@ -1,14 +1,14 @@
 <?php
 namespace Oro\Bundle\AddressBundle\Form\EventListener;
 
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Doctrine\Common\Persistence\ObjectManager;
-
 use Oro\Bundle\AddressBundle\Entity\Country;
 use Oro\Bundle\AddressBundle\Entity\Repository\RegionRepository;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Form\FormEvent;
+
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\FormFactoryInterface;
 
 class AddressCountryAndRegionSubscriber implements EventSubscriberInterface
 {

src/Oro/Bundle/AddressBundle/Form/EventListener/FixAddressesPrimaryAndTypesSubscriber.php

@@ -1,12 +1,12 @@
 <?php
 namespace Oro\Bundle\AddressBundle\Form\EventListener;
 
+use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\PropertyAccess\PropertyAccess;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress;
+use Symfony\Component\PropertyAccess\PropertyAccess;
 
 /**
  * When address is created/updated from single form, it will ensure the rules of one primary address and address types

src/Oro/Bundle/AddressBundle/Form/EventListener/ItemCollectionTypeSubscriber.php

@@ -2,14 +2,14 @@
 
 namespace Oro\Bundle\AddressBundle\Form\EventListener;
 
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
+use Doctrine\Common\Collections\Collection;
+use Oro\Bundle\AddressBundle\Entity\EmptyItem;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Form\FormEvent;
 
-use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Form\FormEvents;
 
-use Oro\Bundle\AddressBundle\Entity\EmptyItem;
+use Symfony\Component\Form\FormInterface;
 
 class ItemCollectionTypeSubscriber implements EventSubscriberInterface
 {

src/Oro/Bundle/AddressBundle/Form/Handler/AddressHandler.php

@@ -4,10 +4,10 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 
+use Oro\Bundle\AddressBundle\Entity\AbstractAddress;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\HttpFoundation\Request;
 
-use Oro\Bundle\AddressBundle\Entity\AbstractAddress;
+use Symfony\Component\HttpFoundation\Request;
 
 class AddressHandler
 {