diff --git a/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/AddressController.php b/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/AddressController.php index 3803d542b48..ac36c60e4b2 100644 --- a/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/AddressController.php +++ b/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") diff --git a/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/AddressTypeController.php b/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/AddressTypeController.php index 7b4a4349f74..a9db0829f22 100644 --- a/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/AddressTypeController.php +++ b/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_") diff --git a/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/CountryController.php b/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/CountryController.php index 34b34ac9ba5..cb5e72e1696 100644 --- a/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/CountryController.php +++ b/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; diff --git a/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/CountryRegionsController.php b/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/CountryRegionsController.php index 5aa9a9a6f64..099be16e313 100644 --- a/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/CountryRegionsController.php +++ b/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_") diff --git a/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/RegionController.php b/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/RegionController.php index 5e12419ea80..f7489e029c2 100644 --- a/src/Oro/Bundle/AddressBundle/Controller/Api/Rest/RegionController.php +++ b/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") diff --git a/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/AddressController.php b/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/AddressController.php index e73979c711a..3ec3833eb5c 100644 --- a/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/AddressController.php +++ b/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. diff --git a/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/AddressTypeController.php b/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/AddressTypeController.php index 1f0bfd3c8bc..46299f57e2f 100644 --- a/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/AddressTypeController.php +++ b/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. diff --git a/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/CountryController.php b/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/CountryController.php index 402097092b7..df63ee602a3 100644 --- a/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/CountryController.php +++ b/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. diff --git a/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/RegionController.php b/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/RegionController.php index a4a61fd180a..ff5f8532734 100644 --- a/src/Oro/Bundle/AddressBundle/Controller/Api/Soap/RegionController.php +++ b/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. diff --git a/src/Oro/Bundle/AddressBundle/DataFixtures/ORM/LoadCountryData.php b/src/Oro/Bundle/AddressBundle/DataFixtures/ORM/LoadCountryData.php index ed6603f0f85..e032c9f5f24 100644 --- a/src/Oro/Bundle/AddressBundle/DataFixtures/ORM/LoadCountryData.php +++ b/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'; diff --git a/src/Oro/Bundle/AddressBundle/Datagrid/CountryDatagridHelper.php b/src/Oro/Bundle/AddressBundle/Datagrid/CountryDatagridHelper.php index 74eb65d215d..8221d382738 100644 --- a/src/Oro/Bundle/AddressBundle/Datagrid/CountryDatagridHelper.php +++ b/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 { diff --git a/src/Oro/Bundle/AddressBundle/DependencyInjection/OroAddressExtension.php b/src/Oro/Bundle/AddressBundle/DependencyInjection/OroAddressExtension.php index 774c62d5c6b..245135e60d7 100644 --- a/src/Oro/Bundle/AddressBundle/DependencyInjection/OroAddressExtension.php +++ b/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 diff --git a/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php b/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php index 3c4b615dd62..46b9367a32f 100644 --- a/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php +++ b/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 diff --git a/src/Oro/Bundle/AddressBundle/Entity/AbstractEmail.php b/src/Oro/Bundle/AddressBundle/Entity/AbstractEmail.php index 15d3663f3a1..562f7b49d4d 100644 --- a/src/Oro/Bundle/AddressBundle/Entity/AbstractEmail.php +++ b/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 */ diff --git a/src/Oro/Bundle/AddressBundle/Entity/AbstractPhone.php b/src/Oro/Bundle/AddressBundle/Entity/AbstractPhone.php index 04e6787f127..9ebb070fb5a 100644 --- a/src/Oro/Bundle/AddressBundle/Entity/AbstractPhone.php +++ b/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 */ diff --git a/src/Oro/Bundle/AddressBundle/Entity/AbstractTypedAddress.php b/src/Oro/Bundle/AddressBundle/Entity/AbstractTypedAddress.php index 7068f305bb1..102efb09555 100644 --- a/src/Oro/Bundle/AddressBundle/Entity/AbstractTypedAddress.php +++ b/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; diff --git a/src/Oro/Bundle/AddressBundle/Entity/AddressType.php b/src/Oro/Bundle/AddressBundle/Entity/AddressType.php index 3751248c5c7..5a7057c876e 100644 --- a/src/Oro/Bundle/AddressBundle/Entity/AddressType.php +++ b/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 diff --git a/src/Oro/Bundle/AddressBundle/Entity/Country.php b/src/Oro/Bundle/AddressBundle/Entity/Country.php index 9a7e19c8859..5ebc31d5f11 100644 --- a/src/Oro/Bundle/AddressBundle/Entity/Country.php +++ b/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 diff --git a/src/Oro/Bundle/AddressBundle/Entity/Region.php b/src/Oro/Bundle/AddressBundle/Entity/Region.php index e27ae3fb6ad..f1e108d9ee6 100644 --- a/src/Oro/Bundle/AddressBundle/Entity/Region.php +++ b/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; diff --git a/src/Oro/Bundle/AddressBundle/Entity/Repository/RegionRepository.php b/src/Oro/Bundle/AddressBundle/Entity/Repository/RegionRepository.php index f099dac10f1..03e1b5c9c8e 100644 --- a/src/Oro/Bundle/AddressBundle/Entity/Repository/RegionRepository.php +++ b/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; diff --git a/src/Oro/Bundle/AddressBundle/Form/EventListener/AddressCountryAndRegionSubscriber.php b/src/Oro/Bundle/AddressBundle/Form/EventListener/AddressCountryAndRegionSubscriber.php index fddac4902e8..c5b91d41fee 100644 --- a/src/Oro/Bundle/AddressBundle/Form/EventListener/AddressCountryAndRegionSubscriber.php +++ b/src/Oro/Bundle/AddressBundle/Form/EventListener/AddressCountryAndRegionSubscriber.php @@ -1,14 +1,14 @@ setDefaults( array( @@ -41,7 +41,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'address'; } diff --git a/src/Oro/Bundle/AddressBundle/Form/Type/AddressCollectionType.php b/src/Oro/Bundle/AddressBundle/Form/Type/AddressCollectionType.php index 3c4038ed5d7..1285a1dedc9 100644 --- a/src/Oro/Bundle/AddressBundle/Form/Type/AddressCollectionType.php +++ b/src/Oro/Bundle/AddressBundle/Form/Type/AddressCollectionType.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\AddressBundle\Form\Type; -use Symfony\Component\OptionsResolver\Options; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\AbstractType; +use Symfony\Component\OptionsResolver\Options; +use Symfony\Component\OptionsResolver\OptionsResolver; class AddressCollectionType extends AbstractType { /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setNormalizers( array( @@ -37,7 +37,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_address_collection'; } diff --git a/src/Oro/Bundle/AddressBundle/Form/Type/AddressType.php b/src/Oro/Bundle/AddressBundle/Form/Type/AddressType.php index 710695488a1..3a5ee5288b2 100644 --- a/src/Oro/Bundle/AddressBundle/Form/Type/AddressType.php +++ b/src/Oro/Bundle/AddressBundle/Form/Type/AddressType.php @@ -2,11 +2,13 @@ namespace Oro\Bundle\AddressBundle\Form\Type; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Oro\Bundle\AddressBundle\Form\EventListener\AddressCountryAndRegionSubscriber; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\TextType; +use Symfony\Component\Form\FormBuilderInterface; -use Oro\Bundle\AddressBundle\Form\EventListener\AddressCountryAndRegionSubscriber; +use Symfony\Component\OptionsResolver\OptionsResolver; class AddressType extends AbstractType { @@ -31,27 +33,27 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->addEventSubscriber($this->countryAndRegionSubscriber); $builder - ->add('id', 'hidden') - ->add('label', 'text', array('required' => false, 'label' => 'Label')) - ->add('namePrefix', 'text', array('required' => false, 'label' => 'Name Prefix')) - ->add('firstName', 'text', array('required' => false, 'label' => 'First Name')) - ->add('middleName', 'text', array('required' => false, 'label' => 'Middle Name')) - ->add('lastName', 'text', array('required' => false, 'label' => 'Last Name')) - ->add('nameSuffix', 'text', array('required' => false, 'label' => 'Name Suffix')) - ->add('organization', 'text', array('required' => false, 'label' => 'Organization')) + ->add('id', HiddenType::class) + ->add('label', TextType::class, array('required' => false, 'label' => 'Label')) + ->add('namePrefix', TextType::class, array('required' => false, 'label' => 'Name Prefix')) + ->add('firstName', TextType::class, array('required' => false, 'label' => 'First Name')) + ->add('middleName', TextType::class, array('required' => false, 'label' => 'Middle Name')) + ->add('lastName', TextType::class, array('required' => false, 'label' => 'Last Name')) + ->add('nameSuffix', TextType::class, array('required' => false, 'label' => 'Name Suffix')) + ->add('organization', TextType::class, array('required' => false, 'label' => 'Organization')) ->add('country', 'oro_country', array('required' => true, 'label' => 'Country')) - ->add('street', 'text', array('required' => true, 'label' => 'Street')) - ->add('street2', 'text', array('required' => false, 'label' => 'Street 2')) - ->add('city', 'text', array('required' => true, 'label' => 'City')) + ->add('street', TextType::class, array('required' => true, 'label' => 'Street')) + ->add('street2', TextType::class, array('required' => false, 'label' => 'Street 2')) + ->add('city', TextType::class, array('required' => true, 'label' => 'City')) ->add('state', 'oro_region', array('required' => false, 'label' => 'State')) - ->add('state_text', 'hidden', array('required' => false, 'label' => 'Custom State')) - ->add('postalCode', 'text', array('required' => true, 'label' => 'ZIP/Postal code')); + ->add('state_text', HiddenType::class, array('required' => false, 'label' => 'Custom State')) + ->add('postalCode', TextType::class, array('required' => true, 'label' => 'ZIP/Postal code')); } /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -66,7 +68,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_address'; } diff --git a/src/Oro/Bundle/AddressBundle/Form/Type/CountryType.php b/src/Oro/Bundle/AddressBundle/Form/Type/CountryType.php index 8c39b5e0e47..8521fc072a7 100644 --- a/src/Oro/Bundle/AddressBundle/Form/Type/CountryType.php +++ b/src/Oro/Bundle/AddressBundle/Form/Type/CountryType.php @@ -1,13 +1,13 @@ setDefaults( array( @@ -30,7 +30,7 @@ public function getParent() return 'genemu_jqueryselect2_translatable_entity'; } - public function getName() + public function getBlockPrefix() { return 'oro_country'; } diff --git a/src/Oro/Bundle/AddressBundle/Form/Type/EmailCollectionType.php b/src/Oro/Bundle/AddressBundle/Form/Type/EmailCollectionType.php index 880acc07de1..859635ee91b 100644 --- a/src/Oro/Bundle/AddressBundle/Form/Type/EmailCollectionType.php +++ b/src/Oro/Bundle/AddressBundle/Form/Type/EmailCollectionType.php @@ -17,7 +17,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_email_collection'; } diff --git a/src/Oro/Bundle/AddressBundle/Form/Type/EmailType.php b/src/Oro/Bundle/AddressBundle/Form/Type/EmailType.php index d369ed330be..503ad602901 100644 --- a/src/Oro/Bundle/AddressBundle/Form/Type/EmailType.php +++ b/src/Oro/Bundle/AddressBundle/Form/Type/EmailType.php @@ -3,6 +3,9 @@ namespace Oro\Bundle\AddressBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\EmailType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\RadioType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; @@ -14,10 +17,10 @@ class EmailType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('id', 'hidden') + ->add('id', HiddenType::class) ->add( 'email', - 'email', + EmailType::class, array( 'label' => 'Email', 'required' => true @@ -25,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'primary', - 'radio', + RadioType::class, array( 'label' => 'Primary', 'required' => false @@ -36,7 +39,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_email'; } diff --git a/src/Oro/Bundle/AddressBundle/Form/Type/ItemCollectionType.php b/src/Oro/Bundle/AddressBundle/Form/Type/ItemCollectionType.php index 6231831fb7f..5310834023d 100644 --- a/src/Oro/Bundle/AddressBundle/Form/Type/ItemCollectionType.php +++ b/src/Oro/Bundle/AddressBundle/Form/Type/ItemCollectionType.php @@ -2,13 +2,14 @@ namespace Oro\Bundle\AddressBundle\Form\Type; +use Oro\Bundle\AddressBundle\Form\EventListener\ItemCollectionTypeSubscriber; +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CollectionType; +use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\AddressBundle\Form\EventListener\ItemCollectionTypeSubscriber; +use Symfony\Component\OptionsResolver\OptionsResolver; class ItemCollectionType extends AbstractType { @@ -38,7 +39,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -59,13 +60,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ public function getParent() { - return 'collection'; + return CollectionType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_item_collection'; } diff --git a/src/Oro/Bundle/AddressBundle/Form/Type/PhoneCollectionType.php b/src/Oro/Bundle/AddressBundle/Form/Type/PhoneCollectionType.php index 80ff828184b..d12ea8e3a1a 100644 --- a/src/Oro/Bundle/AddressBundle/Form/Type/PhoneCollectionType.php +++ b/src/Oro/Bundle/AddressBundle/Form/Type/PhoneCollectionType.php @@ -17,7 +17,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_phone_collection'; } diff --git a/src/Oro/Bundle/AddressBundle/Form/Type/PhoneType.php b/src/Oro/Bundle/AddressBundle/Form/Type/PhoneType.php index 3a8f05a7d4e..15e59ba6fc5 100644 --- a/src/Oro/Bundle/AddressBundle/Form/Type/PhoneType.php +++ b/src/Oro/Bundle/AddressBundle/Form/Type/PhoneType.php @@ -3,6 +3,9 @@ namespace Oro\Bundle\AddressBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\RadioType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; class PhoneType extends AbstractType @@ -13,10 +16,10 @@ class PhoneType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('id', 'hidden') + ->add('id', HiddenType::class) ->add( 'phone', - 'text', + TextType::class, array( 'label' => 'Phone', 'required' => true @@ -24,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'primary', - 'radio', + RadioType::class, array( 'label' => 'Primary', 'required' => false @@ -35,7 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_phone'; } diff --git a/src/Oro/Bundle/AddressBundle/Form/Type/RegionType.php b/src/Oro/Bundle/AddressBundle/Form/Type/RegionType.php index fb9e68111f1..3c59f056a2e 100644 --- a/src/Oro/Bundle/AddressBundle/Form/Type/RegionType.php +++ b/src/Oro/Bundle/AddressBundle/Form/Type/RegionType.php @@ -6,8 +6,8 @@ use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\Options; +use Symfony\Component\OptionsResolver\OptionsResolver; class RegionType extends AbstractType { @@ -25,7 +25,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $choices = function (Options $options) { // show empty list if country is not selected @@ -73,7 +73,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_region'; } diff --git a/src/Oro/Bundle/AddressBundle/Form/Type/TypedAddressType.php b/src/Oro/Bundle/AddressBundle/Form/Type/TypedAddressType.php index 6f8cb751ad6..f626a18e0f8 100644 --- a/src/Oro/Bundle/AddressBundle/Form/Type/TypedAddressType.php +++ b/src/Oro/Bundle/AddressBundle/Form/Type/TypedAddressType.php @@ -2,11 +2,12 @@ namespace Oro\Bundle\AddressBundle\Form\Type; +use Oro\Bundle\AddressBundle\Form\EventListener\FixAddressesPrimaryAndTypesSubscriber; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\AddressBundle\Form\EventListener\FixAddressesPrimaryAndTypesSubscriber; +use Symfony\Component\OptionsResolver\OptionsResolver; class TypedAddressType extends AbstractType { @@ -35,7 +36,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'primary', - 'checkbox', + CheckboxType::class, array( 'label' => 'Primary', 'required' => false @@ -46,7 +47,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -67,7 +68,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_typed_address'; } diff --git a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/AddressNormalizer.php b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/AddressNormalizer.php index 753f2fd6915..61b70201e97 100644 --- a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/AddressNormalizer.php +++ b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/AddressNormalizer.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\AddressBundle\ImportExport\Serializer\Normalizer; -use Symfony\Component\PropertyAccess\PropertyAccess; -use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; - use Oro\Bundle\AddressBundle\Entity\AbstractAddress; use Oro\Bundle\AddressBundle\Entity\Country; use Oro\Bundle\AddressBundle\Entity\Region; +use Symfony\Component\PropertyAccess\PropertyAccess; +use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; +use Symfony\Component\Serializer\Normalizer\NormalizerInterface; + class AddressNormalizer implements NormalizerInterface, DenormalizerInterface { const ABSTRACT_ADDRESS_TYPE = 'Oro\Bundle\AddressBundle\Entity\AbstractAddress'; diff --git a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/AddressTypeNormalizer.php b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/AddressTypeNormalizer.php index 501d708faa6..d68ff10012a 100644 --- a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/AddressTypeNormalizer.php +++ b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/AddressTypeNormalizer.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\AddressBundle\ImportExport\Serializer\Normalizer; +use Oro\Bundle\AddressBundle\Entity\AddressType; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use Oro\Bundle\AddressBundle\Entity\AddressType; +use Symfony\Component\Serializer\Normalizer\NormalizerInterface; class AddressTypeNormalizer implements NormalizerInterface, DenormalizerInterface { diff --git a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/EmailNormalizer.php b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/EmailNormalizer.php index 450a965a1b2..ff716949cb3 100644 --- a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/EmailNormalizer.php +++ b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/EmailNormalizer.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\AddressBundle\ImportExport\Serializer\Normalizer; +use Oro\Bundle\AddressBundle\Entity\AbstractEmail; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use Oro\Bundle\AddressBundle\Entity\AbstractEmail; +use Symfony\Component\Serializer\Normalizer\NormalizerInterface; class EmailNormalizer implements NormalizerInterface, DenormalizerInterface { diff --git a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/PhoneNormalizer.php b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/PhoneNormalizer.php index 2ffc64bb0af..4976bcba6c2 100644 --- a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/PhoneNormalizer.php +++ b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/PhoneNormalizer.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\AddressBundle\ImportExport\Serializer\Normalizer; +use Oro\Bundle\AddressBundle\Entity\AbstractPhone; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use Oro\Bundle\AddressBundle\Entity\AbstractPhone; +use Symfony\Component\Serializer\Normalizer\NormalizerInterface; class PhoneNormalizer implements NormalizerInterface, DenormalizerInterface { diff --git a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/PrimaryItemCollectionNormalizer.php b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/PrimaryItemCollectionNormalizer.php index 6b579abf138..ac63f80bb38 100644 --- a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/PrimaryItemCollectionNormalizer.php +++ b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/PrimaryItemCollectionNormalizer.php @@ -5,8 +5,8 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Oro\Bundle\ImportExportBundle\Serializer\Normalizer\CollectionNormalizer; use Oro\Bundle\AddressBundle\Entity\PrimaryItem; +use Oro\Bundle\ImportExportBundle\Serializer\Normalizer\CollectionNormalizer; class PrimaryItemCollectionNormalizer extends CollectionNormalizer { diff --git a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/TypedAddressNormalizer.php b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/TypedAddressNormalizer.php index f2a9636baf6..9095d1294ee 100644 --- a/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/TypedAddressNormalizer.php +++ b/src/Oro/Bundle/AddressBundle/ImportExport/Serializer/Normalizer/TypedAddressNormalizer.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\AddressBundle\ImportExport\Serializer\Normalizer; -use Symfony\Component\Serializer\SerializerInterface; -use Symfony\Component\Serializer\SerializerAwareInterface; +use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress; +use Symfony\Component\Serializer\Exception\InvalidArgumentException; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use Symfony\Component\Serializer\Exception\InvalidArgumentException; +use Symfony\Component\Serializer\SerializerAwareInterface; -use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress; +use Symfony\Component\Serializer\SerializerInterface; class TypedAddressNormalizer implements DenormalizerInterface, NormalizerInterface, SerializerAwareInterface { diff --git a/src/Oro/Bundle/AddressBundle/OroAddressBundle.php b/src/Oro/Bundle/AddressBundle/OroAddressBundle.php index f87ec651d0c..c5fe1dccbc4 100644 --- a/src/Oro/Bundle/AddressBundle/OroAddressBundle.php +++ b/src/Oro/Bundle/AddressBundle/OroAddressBundle.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\AddressBundle; use Oro\Bundle\AddressBundle\DependencyInjection\Compiler\AddressProviderPass; -use Symfony\Component\HttpKernel\Bundle\Bundle; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroAddressBundle extends Bundle { diff --git a/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestAddressTypeApiTest.php b/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestAddressTypeApiTest.php index 9f87311a5f8..0431c6a12f4 100644 --- a/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestAddressTypeApiTest.php +++ b/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestAddressTypeApiTest.php @@ -1,9 +1,9 @@ assertInternalType('array', $result); $this->assertArrayHasKey(FormEvents::PRE_SET_DATA, $result); - $this->assertArrayHasKey(FormEvents::PRE_BIND, $result); + $this->assertArrayHasKey(FormEvents::PRE_SUBMIT, $result); } public function testPreSetDataEmptyAddress() diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/ItemCollectionTypeSubscriberTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/ItemCollectionTypeSubscriberTest.php index 88c5a984781..939f812c96e 100644 --- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/ItemCollectionTypeSubscriberTest.php +++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/ItemCollectionTypeSubscriberTest.php @@ -4,11 +4,11 @@ use Doctrine\Common\Collections\ArrayCollection; -use Symfony\Component\Form\Test\FormInterface; +use Oro\Bundle\AddressBundle\Form\EventListener\ItemCollectionTypeSubscriber; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; -use Oro\Bundle\AddressBundle\Form\EventListener\ItemCollectionTypeSubscriber; +use Symfony\Component\Form\Test\FormInterface; class ItemCollectionTypeSubscriberTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressApiTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressApiTypeTest.php index ba8bccaec07..a133f9788bb 100644 --- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressApiTypeTest.php +++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressApiTypeTest.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\AddressBundle\Tests\Unit\Form\Type; use Oro\Bundle\AddressBundle\Form\Type\AddressApiType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\FormBuilder; use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; +use Symfony\Component\Form\FormBuilder; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; class AddressApiTypeTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/CountryTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/CountryTypeTest.php index 45b41bfe011..166cb021325 100644 --- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/CountryTypeTest.php +++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/CountryTypeTest.php @@ -1,10 +1,10 @@ add( 'steps', - 'collection', + CollectionType::class, array( 'type' => new StepConfigurationType() ) @@ -30,7 +31,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -42,7 +43,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_batch_job_configuration'; } diff --git a/src/Oro/Bundle/BatchBundle/Form/Type/StepConfigurationType.php b/src/Oro/Bundle/BatchBundle/Form/Type/StepConfigurationType.php index 6e2bb675201..16f25f371e3 100644 --- a/src/Oro/Bundle/BatchBundle/Form/Type/StepConfigurationType.php +++ b/src/Oro/Bundle/BatchBundle/Form/Type/StepConfigurationType.php @@ -4,9 +4,9 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvent; +use Symfony\Component\Form\FormEvents; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Form type for step configuration @@ -72,7 +72,7 @@ function (FormEvent $event) use ($factory) { /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -84,7 +84,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_batch_step_configuration'; } diff --git a/src/Oro/Bundle/BatchBundle/Form/Type/StepElementConfigurationType.php b/src/Oro/Bundle/BatchBundle/Form/Type/StepElementConfigurationType.php index ac7ac899887..ff298ab10cb 100644 --- a/src/Oro/Bundle/BatchBundle/Form/Type/StepElementConfigurationType.php +++ b/src/Oro/Bundle/BatchBundle/Form/Type/StepElementConfigurationType.php @@ -4,9 +4,9 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvent; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\FormEvents; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Form type for step element configuration @@ -62,7 +62,7 @@ function (FormEvent $event) use ($factory) { /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -74,7 +74,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_batch_step_element_configuration'; } diff --git a/src/Oro/Bundle/BatchBundle/Item/Support/ArrayReader.php b/src/Oro/Bundle/BatchBundle/Item/Support/ArrayReader.php index 9628ef9fd4f..d005afb1bba 100644 --- a/src/Oro/Bundle/BatchBundle/Item/Support/ArrayReader.php +++ b/src/Oro/Bundle/BatchBundle/Item/Support/ArrayReader.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\BatchBundle\Item\Support; -use Oro\Bundle\BatchBundle\Item\ItemReaderInterface; use Oro\Bundle\BatchBundle\Entity\StepExecution; +use Oro\Bundle\BatchBundle\Item\ItemReaderInterface; /** * Simple reader that provides data from an array diff --git a/src/Oro/Bundle/BatchBundle/Job/DoctrineJobRepository.php b/src/Oro/Bundle/BatchBundle/Job/DoctrineJobRepository.php index 2efade35aeb..321374c3bcf 100644 --- a/src/Oro/Bundle/BatchBundle/Job/DoctrineJobRepository.php +++ b/src/Oro/Bundle/BatchBundle/Job/DoctrineJobRepository.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\BatchBundle\Job; use Doctrine\ORM\EntityManager; -use Oro\Bundle\BatchBundle\Entity\JobInstance; use Oro\Bundle\BatchBundle\Entity\JobExecution; +use Oro\Bundle\BatchBundle\Entity\JobInstance; /** * Class peristing JobExecution and StepExecution states diff --git a/src/Oro/Bundle/BatchBundle/Job/Job.php b/src/Oro/Bundle/BatchBundle/Job/Job.php index 2f44044abfa..93b00df997a 100644 --- a/src/Oro/Bundle/BatchBundle/Job/Job.php +++ b/src/Oro/Bundle/BatchBundle/Job/Job.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\BatchBundle\Job; -use Symfony\Component\Validator\Constraints as Assert; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Component\EventDispatcher\Event; -use Oro\Bundle\BatchBundle\Step\StepInterface; use Oro\Bundle\BatchBundle\Entity\JobExecution; use Oro\Bundle\BatchBundle\Event\EventInterface; use Oro\Bundle\BatchBundle\Event\JobExecutionEvent; +use Oro\Bundle\BatchBundle\Step\StepInterface; +use Symfony\Component\EventDispatcher\Event; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\Validator\Constraints as Assert; /** * Implementation of the {@link Job} interface. diff --git a/src/Oro/Bundle/BatchBundle/Job/JobRepositoryInterface.php b/src/Oro/Bundle/BatchBundle/Job/JobRepositoryInterface.php index 4e40b01a1af..291b7f00801 100644 --- a/src/Oro/Bundle/BatchBundle/Job/JobRepositoryInterface.php +++ b/src/Oro/Bundle/BatchBundle/Job/JobRepositoryInterface.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\BatchBundle\Job; -use Oro\Bundle\BatchBundle\Entity\JobInstance; use Oro\Bundle\BatchBundle\Entity\JobExecution; +use Oro\Bundle\BatchBundle\Entity\JobInstance; /** * Common interface for Job repositories which should handle how job are stored, updated diff --git a/src/Oro/Bundle/BatchBundle/Notification/MailNotifier.php b/src/Oro/Bundle/BatchBundle/Notification/MailNotifier.php index 4fabd07b96b..7753879b671 100644 --- a/src/Oro/Bundle/BatchBundle/Notification/MailNotifier.php +++ b/src/Oro/Bundle/BatchBundle/Notification/MailNotifier.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\BatchBundle\Notification; -use Symfony\Component\Security\Core\SecurityContextInterface; -use Oro\Bundle\BatchBundle\Monolog\Handler\BatchLogHandler; use Oro\Bundle\BatchBundle\Entity\JobExecution; +use Oro\Bundle\BatchBundle\Monolog\Handler\BatchLogHandler; +use Symfony\Component\Security\Core\SecurityContextInterface; /** * Notify Job execution result by mail diff --git a/src/Oro/Bundle/BatchBundle/ORM/Query/BufferedQueryResultIterator.php b/src/Oro/Bundle/BatchBundle/ORM/Query/BufferedQueryResultIterator.php index 8c19b68620f..502c2a3de62 100644 --- a/src/Oro/Bundle/BatchBundle/ORM/Query/BufferedQueryResultIterator.php +++ b/src/Oro/Bundle/BatchBundle/ORM/Query/BufferedQueryResultIterator.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\BatchBundle\ORM\Query; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\Query; +use Doctrine\ORM\QueryBuilder; /** * Iterates results of Query using buffer, allows to iterate large query diff --git a/src/Oro/Bundle/BatchBundle/ORM/Query/QueryCountCalculator.php b/src/Oro/Bundle/BatchBundle/ORM/Query/QueryCountCalculator.php index af8a27ea387..0a1d9e24515 100644 --- a/src/Oro/Bundle/BatchBundle/ORM/Query/QueryCountCalculator.php +++ b/src/Oro/Bundle/BatchBundle/ORM/Query/QueryCountCalculator.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\BatchBundle\ORM\Query; use Doctrine\ORM\Query; -use Doctrine\ORM\Query\Parser; use Doctrine\ORM\Query\Parameter; +use Doctrine\ORM\Query\Parser; use Doctrine\ORM\Query\QueryException; /** diff --git a/src/Oro/Bundle/BatchBundle/OroBatchBundle.php b/src/Oro/Bundle/BatchBundle/OroBatchBundle.php index 18b1de5d3e0..9fd1c6a62bd 100644 --- a/src/Oro/Bundle/BatchBundle/OroBatchBundle.php +++ b/src/Oro/Bundle/BatchBundle/OroBatchBundle.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\BatchBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Oro\Bundle\BatchBundle\DependencyInjection\Compiler; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; /** * Batch Bundle diff --git a/src/Oro/Bundle/BatchBundle/Step/AbstractStep.php b/src/Oro/Bundle/BatchBundle/Step/AbstractStep.php index 6a9a54359cd..c5b7daa3fb1 100644 --- a/src/Oro/Bundle/BatchBundle/Step/AbstractStep.php +++ b/src/Oro/Bundle/BatchBundle/Step/AbstractStep.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\BatchBundle\Step; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Component\EventDispatcher\Event; +use Oro\Bundle\BatchBundle\Entity\StepExecution; +use Oro\Bundle\BatchBundle\Event\EventInterface; +use Oro\Bundle\BatchBundle\Event\InvalidItemEvent; +use Oro\Bundle\BatchBundle\Event\StepExecutionEvent; use Oro\Bundle\BatchBundle\Job\BatchStatus; use Oro\Bundle\BatchBundle\Job\ExitStatus; -use Oro\Bundle\BatchBundle\Job\JobRepositoryInterface; use Oro\Bundle\BatchBundle\Job\JobInterruptedException; -use Oro\Bundle\BatchBundle\Entity\StepExecution; -use Oro\Bundle\BatchBundle\Event\StepExecutionEvent; -use Oro\Bundle\BatchBundle\Event\InvalidItemEvent; -use Oro\Bundle\BatchBundle\Event\EventInterface; +use Oro\Bundle\BatchBundle\Job\JobRepositoryInterface; +use Symfony\Component\EventDispatcher\Event; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; /** * A Step implementation that provides common behavior to subclasses, including registering and calling diff --git a/src/Oro/Bundle/BatchBundle/Step/ItemStep.php b/src/Oro/Bundle/BatchBundle/Step/ItemStep.php index c9d20a8c070..569721a31dc 100644 --- a/src/Oro/Bundle/BatchBundle/Step/ItemStep.php +++ b/src/Oro/Bundle/BatchBundle/Step/ItemStep.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\BatchBundle\Step; -use Symfony\Component\Validator\Constraints as Assert; -use Oro\Bundle\BatchBundle\Step\StepExecutionAwareInterface; use Oro\Bundle\BatchBundle\Entity\StepExecution; use Oro\Bundle\BatchBundle\Item\AbstractConfigurableStepElement; -use Oro\Bundle\BatchBundle\Item\ItemReaderInterface; +use Oro\Bundle\BatchBundle\Item\InvalidItemException; use Oro\Bundle\BatchBundle\Item\ItemProcessorInterface; +use Oro\Bundle\BatchBundle\Item\ItemReaderInterface; use Oro\Bundle\BatchBundle\Item\ItemWriterInterface; -use Oro\Bundle\BatchBundle\Item\InvalidItemException; +use Oro\Bundle\BatchBundle\Step\StepExecutionAwareInterface; +use Symfony\Component\Validator\Constraints as Assert; /** * Basic step implementation that read items, process them and write them diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/Connector/ConnectorRegistryTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/Connector/ConnectorRegistryTest.php index 5708e2414cd..572f93e2245 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/Connector/ConnectorRegistryTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/Connector/ConnectorRegistryTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\Connector; -use Monolog\Logger; use Monolog\Handler\TestHandler; +use Monolog\Logger; use Oro\Bundle\BatchBundle\Connector\ConnectorRegistry; use Oro\Bundle\BatchBundle\Entity\JobInstance; diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php index 1a1813a47ce..ef08b390d57 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\DependencyInjection; +use Oro\Bundle\BatchBundle\DependencyInjection\Configuration; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\Processor; -use Oro\Bundle\BatchBundle\DependencyInjection\Configuration; /** * Test related class diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/Entity/FieldMappingTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/Entity/FieldMappingTest.php index 632874bc2a2..5ea1cf6652e 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/Entity/FieldMappingTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/Entity/FieldMappingTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\Entity; -use Oro\Bundle\BatchBundle\Entity\ItemMapping; use Oro\Bundle\BatchBundle\Entity\FieldMapping; +use Oro\Bundle\BatchBundle\Entity\ItemMapping; /** * Test related class diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/Entity/ItemMappingTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/Entity/ItemMappingTest.php index 49eceee9e37..433c74d92af 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/Entity/ItemMappingTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/Entity/ItemMappingTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\Entity; -use Oro\Bundle\BatchBundle\Entity\ItemMapping; use Oro\Bundle\BatchBundle\Entity\FieldMapping; +use Oro\Bundle\BatchBundle\Entity\ItemMapping; /** * Test related class diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/EventListener/LoggerSubscriberTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/EventListener/LoggerSubscriberTest.php index 54374934c60..90051ae2cce 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/EventListener/LoggerSubscriberTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/EventListener/LoggerSubscriberTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\EventListener; -use Oro\Bundle\BatchBundle\EventListener\LoggerSubscriber; use Oro\Bundle\BatchBundle\Event\EventInterface; +use Oro\Bundle\BatchBundle\EventListener\LoggerSubscriber; /** * Test related class diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/EventListener/NotificationSubscriberTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/EventListener/NotificationSubscriberTest.php index 4382b54766a..0b297937ba4 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/EventListener/NotificationSubscriberTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/EventListener/NotificationSubscriberTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\EventListener; -use Oro\Bundle\BatchBundle\EventListener\NotificationSubscriber; use Oro\Bundle\BatchBundle\Event\EventInterface; +use Oro\Bundle\BatchBundle\EventListener\NotificationSubscriber; /** * Test related class diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobFactoryTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobFactoryTest.php index 0cb58184239..c94f428f4dd 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobFactoryTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobFactoryTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\Job; -use Monolog\Logger; use Monolog\Handler\TestHandler; +use Monolog\Logger; use Oro\Bundle\BatchBundle\Job\JobFactory; /** diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobInterruptedExceptionTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobInterruptedExceptionTest.php index 7ec68d94b58..ec29fb14058 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobInterruptedExceptionTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobInterruptedExceptionTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\Job; -use Oro\Bundle\BatchBundle\Job\JobInterruptedException; use Oro\Bundle\BatchBundle\Job\BatchStatus; +use Oro\Bundle\BatchBundle\Job\JobInterruptedException; /** * Tests related to the JobInterruptedException diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobTest.php index 3e31ced8512..c53b230fa35 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/Job/JobTest.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\Job; -use Oro\Bundle\BatchBundle\Step\ItemStep; use Oro\Bundle\BatchBundle\Entity\JobExecution; -use Oro\Bundle\BatchBundle\Job\Job; use Oro\Bundle\BatchBundle\Entity\JobInstance; use Oro\Bundle\BatchBundle\Job\BatchStatus; use Oro\Bundle\BatchBundle\Job\ExitStatus; -use Oro\Bundle\BatchBundle\Tests\Unit\Step\InterruptedStep; +use Oro\Bundle\BatchBundle\Job\Job; +use Oro\Bundle\BatchBundle\Step\ItemStep; use Oro\Bundle\BatchBundle\Tests\Unit\Step\IncompleteStep; +use Oro\Bundle\BatchBundle\Tests\Unit\Step\InterruptedStep; /** * Tests related to the Job class diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/ORM/Query/CountCalculatorTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/ORM/Query/CountCalculatorTest.php index 5b2913b6292..0efa0630b2b 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/ORM/Query/CountCalculatorTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/ORM/Query/CountCalculatorTest.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\ORM\Query; -use Doctrine\ORM\EntityManager; -use Doctrine\ORM\Configuration; -use Doctrine\ORM\Query; -use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Statement; use Doctrine\DBAL\Types\Type; +use Doctrine\ORM\Configuration; +use Doctrine\ORM\EntityManager; +use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Query; use Oro\Bundle\BatchBundle\ORM\Query\QueryCountCalculator; diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/AbstractStepTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/AbstractStepTest.php index 75ea8f326d8..d38a9d2c404 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/AbstractStepTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/AbstractStepTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\Job; -use Oro\Bundle\BatchBundle\Job\Job; -use Oro\Bundle\BatchBundle\Job\JobInterruptedException; use Oro\Bundle\BatchBundle\Job\BatchStatus; use Oro\Bundle\BatchBundle\Job\ExitStatus; +use Oro\Bundle\BatchBundle\Job\Job; +use Oro\Bundle\BatchBundle\Job\JobInterruptedException; /** * Tests related to the AbstractStep class diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/IncompleteStep.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/IncompleteStep.php index e941e753d80..5c86463853b 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/IncompleteStep.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/IncompleteStep.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\Step; -use Oro\Bundle\BatchBundle\Step\AbstractStep; -use Oro\Bundle\BatchBundle\Job\BatchStatus; use Oro\Bundle\BatchBundle\Entity\StepExecution; +use Oro\Bundle\BatchBundle\Job\BatchStatus; +use Oro\Bundle\BatchBundle\Step\AbstractStep; /** * Step used for test and always declared a incomplete execution diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/InterruptedStep.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/InterruptedStep.php index e2715facc86..20673561287 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/InterruptedStep.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/InterruptedStep.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\Step; -use Oro\Bundle\BatchBundle\Step\AbstractStep; use Oro\Bundle\BatchBundle\Entity\StepExecution; +use Oro\Bundle\BatchBundle\Step\AbstractStep; /** * Step used for test and always declared a stopped execution diff --git a/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/ItemStepTest.php b/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/ItemStepTest.php index cbd0f0bfd7b..288d031510f 100644 --- a/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/ItemStepTest.php +++ b/src/Oro/Bundle/BatchBundle/Tests/Unit/Step/ItemStepTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\BatchBundle\Tests\Unit\Step; -use Oro\Bundle\BatchBundle\Step\ItemStep; -use Oro\Bundle\BatchBundle\Job\BatchStatus; use Oro\Bundle\BatchBundle\Event\EventInterface; use Oro\Bundle\BatchBundle\Item\InvalidItemException; +use Oro\Bundle\BatchBundle\Job\BatchStatus; +use Oro\Bundle\BatchBundle\Step\ItemStep; /** * Tests related to the ItemStep class diff --git a/src/Oro/Bundle/CalendarBundle/Command/Cron/SendRemindersCommand.php b/src/Oro/Bundle/CalendarBundle/Command/Cron/SendRemindersCommand.php index 364bf0b4c12..eb9d9565289 100644 --- a/src/Oro/Bundle/CalendarBundle/Command/Cron/SendRemindersCommand.php +++ b/src/Oro/Bundle/CalendarBundle/Command/Cron/SendRemindersCommand.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\CalendarBundle\Command\Cron; +use Oro\Bundle\CalendarBundle\Notification\RemindersSender; use Oro\Bundle\CronBundle\Command\CronCommandInterface; +use Oro\Bundle\CronBundle\Command\Logger\OutputLogger; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Oro\Bundle\CronBundle\Command\Logger\OutputLogger; -use Oro\Bundle\CalendarBundle\Notification\RemindersSender; class SendRemindersCommand extends ContainerAwareCommand implements CronCommandInterface { diff --git a/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarConnectionController.php b/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarConnectionController.php index 4249b3bd1da..612eda62928 100644 --- a/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarConnectionController.php +++ b/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarConnectionController.php @@ -2,27 +2,27 @@ namespace Oro\Bundle\CalendarBundle\Controller\Api\Rest; -use Symfony\Component\HttpFoundation\Response; +use FOS\Rest\Util\Codes; +use FOS\RestBundle\Controller\Annotations\Get; use FOS\RestBundle\Controller\Annotations\NamePrefix; -use FOS\RestBundle\Controller\Annotations\RouteResource; use FOS\RestBundle\Controller\Annotations\QueryParam; -use FOS\RestBundle\Controller\Annotations\Get; +use FOS\RestBundle\Controller\Annotations\RouteResource; use FOS\RestBundle\Controller\FOSRestController; use FOS\RestBundle\Routing\ClassResourceInterface; -use FOS\Rest\Util\Codes; - use Nelmio\ApiDocBundle\Annotation\ApiDoc; +use Oro\Bundle\CalendarBundle\Entity\Calendar; + +use Oro\Bundle\CalendarBundle\Entity\CalendarConnection; +use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarConnectionRepository; +use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarRepository; use Oro\Bundle\SecurityBundle\Annotation\Acl; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; use Oro\Bundle\SecurityBundle\SecurityFacade; use Oro\Bundle\SoapBundle\Controller\Api\EntityManagerAwareInterface; use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; -use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarRepository; -use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarConnectionRepository; -use Oro\Bundle\CalendarBundle\Entity\Calendar; -use Oro\Bundle\CalendarBundle\Entity\CalendarConnection; +use Symfony\Component\HttpFoundation\Response; /** * @RouteResource("calendar") diff --git a/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarEventController.php b/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarEventController.php index f4204a9392b..44a67472d24 100644 --- a/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarEventController.php +++ b/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarEventController.php @@ -2,28 +2,28 @@ namespace Oro\Bundle\CalendarBundle\Controller\Api\Rest; -use Symfony\Component\Form\Form; -use Symfony\Component\HttpFoundation\Response; +use Doctrine\ORM\EntityRepository; +use FOS\Rest\Util\Codes; use FOS\RestBundle\Controller\Annotations\NamePrefix; -use FOS\RestBundle\Controller\Annotations\RouteResource; -use FOS\RestBundle\Controller\Annotations\QueryParam; use FOS\RestBundle\Controller\Annotations\Post; +use FOS\RestBundle\Controller\Annotations\QueryParam; +use FOS\RestBundle\Controller\Annotations\RouteResource; use FOS\RestBundle\Routing\ClassResourceInterface; -use FOS\Rest\Util\Codes; - use Nelmio\ApiDocBundle\Annotation\ApiDoc; +use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarEventRepository; + +use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarRepository; +use Oro\Bundle\ConfigBundle\Config\ConfigManager; use Oro\Bundle\SecurityBundle\Annotation\Acl; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; use Oro\Bundle\SecurityBundle\SecurityFacade; -use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler; use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; -use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarRepository; -use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarEventRepository; -use Doctrine\ORM\EntityRepository; -use Oro\Bundle\ConfigBundle\Config\ConfigManager; +use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler; +use Symfony\Component\Form\Form; +use Symfony\Component\HttpFoundation\Response; /** * @RouteResource("calendarevent") diff --git a/src/Oro/Bundle/CalendarBundle/Controller/CalendarController.php b/src/Oro/Bundle/CalendarBundle/Controller/CalendarController.php index 3a26cdc0453..1f2028dd2e1 100644 --- a/src/Oro/Bundle/CalendarBundle/Controller/CalendarController.php +++ b/src/Oro/Bundle/CalendarBundle/Controller/CalendarController.php @@ -2,20 +2,20 @@ namespace Oro\Bundle\CalendarBundle\Controller; +use Oro\Bundle\CalendarBundle\Entity\Calendar; +use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarRepository; use Oro\Bundle\CalendarBundle\Provider\CalendarDateTimeConfigProvider; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpFoundation\Request; - -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Oro\Bundle\SecurityBundle\Annotation\Acl; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; -use Oro\Bundle\SecurityBundle\SecurityFacade; +use Oro\Bundle\SecurityBundle\SecurityFacade; use Oro\Bundle\UserBundle\Entity\User; -use Oro\Bundle\CalendarBundle\Entity\Calendar; -use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarRepository; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; + +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; class CalendarController extends Controller { diff --git a/src/Oro/Bundle/CalendarBundle/DataFixtures/ORM/UpdateAclRoles.php b/src/Oro/Bundle/CalendarBundle/DataFixtures/ORM/UpdateAclRoles.php index 2f3b12f8eca..adbf88cdc40 100644 --- a/src/Oro/Bundle/CalendarBundle/DataFixtures/ORM/UpdateAclRoles.php +++ b/src/Oro/Bundle/CalendarBundle/DataFixtures/ORM/UpdateAclRoles.php @@ -3,11 +3,11 @@ namespace Oro\Bundle\CalendarBundle\DataFixtures\ORM; use Doctrine\Common\DataFixtures\AbstractFixture; -use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; +use Doctrine\Common\Persistence\ObjectManager; +use Oro\Bundle\SecurityBundle\Acl\Persistence\AclManager; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -use Oro\Bundle\SecurityBundle\Acl\Persistence\AclManager; class UpdateAclRoles extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface { diff --git a/src/Oro/Bundle/CalendarBundle/DependencyInjection/OroCalendarExtension.php b/src/Oro/Bundle/CalendarBundle/DependencyInjection/OroCalendarExtension.php index 17ca04b6d73..b67fb3469bd 100644 --- a/src/Oro/Bundle/CalendarBundle/DependencyInjection/OroCalendarExtension.php +++ b/src/Oro/Bundle/CalendarBundle/DependencyInjection/OroCalendarExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\CalendarBundle\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; class OroCalendarExtension extends Extension { diff --git a/src/Oro/Bundle/CalendarBundle/Entity/Calendar.php b/src/Oro/Bundle/CalendarBundle/Entity/Calendar.php index 32ad0da8caa..f04d1e1b23f 100644 --- a/src/Oro/Bundle/CalendarBundle/Entity/Calendar.php +++ b/src/Oro/Bundle/CalendarBundle/Entity/Calendar.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\CalendarBundle\Entity; -use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; -use Oro\Bundle\UserBundle\Entity\User; -use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; +use Doctrine\ORM\Mapping as ORM; use Oro\Bundle\EntityBundle\Exception\InvalidEntityException; +use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; +use Oro\Bundle\UserBundle\Entity\User; /** * @ORM\Entity(repositoryClass="Oro\Bundle\CalendarBundle\Entity\Repository\CalendarRepository") diff --git a/src/Oro/Bundle/CalendarBundle/EventListener/EntitySubscriber.php b/src/Oro/Bundle/CalendarBundle/EventListener/EntitySubscriber.php index e182db95f3f..55e13723367 100644 --- a/src/Oro/Bundle/CalendarBundle/EventListener/EntitySubscriber.php +++ b/src/Oro/Bundle/CalendarBundle/EventListener/EntitySubscriber.php @@ -3,12 +3,12 @@ namespace Oro\Bundle\CalendarBundle\EventListener; use Doctrine\Common\EventSubscriber; -use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\Events; use Doctrine\ORM\Event\LifecycleEventArgs; -use Doctrine\ORM\Event\PreUpdateEventArgs; use Doctrine\ORM\Event\OnFlushEventArgs; +use Doctrine\ORM\Event\PreUpdateEventArgs; +use Doctrine\ORM\Events; +use Doctrine\ORM\Mapping\ClassMetadata; use Oro\Bundle\CalendarBundle\Entity\Calendar; use Oro\Bundle\CalendarBundle\Entity\CalendarConnection; use Oro\Bundle\CalendarBundle\Entity\CalendarEvent; diff --git a/src/Oro/Bundle/CalendarBundle/Form/Handler/CalendarEventHandler.php b/src/Oro/Bundle/CalendarBundle/Form/Handler/CalendarEventHandler.php index 49f7e13df72..0513b869236 100644 --- a/src/Oro/Bundle/CalendarBundle/Form/Handler/CalendarEventHandler.php +++ b/src/Oro/Bundle/CalendarBundle/Form/Handler/CalendarEventHandler.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\CalendarBundle\Form\Handler; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Request; use Doctrine\Common\Persistence\ObjectManager; use Oro\Bundle\CalendarBundle\Entity\CalendarEvent; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\Request; class CalendarEventHandler { diff --git a/src/Oro/Bundle/CalendarBundle/Form/Type/CalendarEventApiType.php b/src/Oro/Bundle/CalendarBundle/Form/Type/CalendarEventApiType.php index eaacad67bc7..da2621bb6e4 100644 --- a/src/Oro/Bundle/CalendarBundle/Form/Type/CalendarEventApiType.php +++ b/src/Oro/Bundle/CalendarBundle/Form/Type/CalendarEventApiType.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\CalendarBundle\Form\Type; +use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; use Symfony\Component\Form\Extension\Core\Type\DateTimeType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; class CalendarEventApiType extends CalendarEventType { diff --git a/src/Oro/Bundle/CalendarBundle/Form/Type/CalendarEventType.php b/src/Oro/Bundle/CalendarBundle/Form/Type/CalendarEventType.php index 847665c1f17..9ce1e2b65e0 100644 --- a/src/Oro/Bundle/CalendarBundle/Form/Type/CalendarEventType.php +++ b/src/Oro/Bundle/CalendarBundle/Form/Type/CalendarEventType.php @@ -2,10 +2,12 @@ namespace Oro\Bundle\CalendarBundle\Form\Type; +use Oro\Bundle\CalendarBundle\Entity\CalendarEvent; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\CalendarBundle\Entity\CalendarEvent; +use Symfony\Component\OptionsResolver\OptionsResolver; class CalendarEventType extends AbstractType { @@ -15,17 +17,17 @@ class CalendarEventType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('title', 'textarea', array('required' => true)) + ->add('title', TextareaType::class, array('required' => true)) ->add('start', 'oro_datetime', array('required' => true)) ->add('end', 'oro_datetime', array('required' => true)) - ->add('allDay', 'checkbox', array('required' => false)) - ->add('reminder', 'checkbox', array('required' => false)); + ->add('allDay', CheckboxType::class, array('required' => false)) + ->add('reminder', CheckboxType::class, array('required' => false)); } /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -38,7 +40,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_calendar_event'; } diff --git a/src/Oro/Bundle/CalendarBundle/Notification/RemindersSender.php b/src/Oro/Bundle/CalendarBundle/Notification/RemindersSender.php index 8dc08db0b04..a9a79837262 100644 --- a/src/Oro/Bundle/CalendarBundle/Notification/RemindersSender.php +++ b/src/Oro/Bundle/CalendarBundle/Notification/RemindersSender.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\CalendarBundle\Notification; -use Psr\Log\LoggerInterface; -use Psr\Log\NullLogger; use Doctrine\ORM\EntityManager; use Oro\Bundle\CalendarBundle\Entity\CalendarEvent; use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarEventRepository; +use Oro\Bundle\CronBundle\Command\Logger\Exception\RaiseExceptionLoggerException; +use Oro\Bundle\CronBundle\Command\Logger\RaiseExceptionLogger; use Oro\Bundle\EmailBundle\Entity\Repository\EmailTemplateRepository; use Oro\Bundle\EmailBundle\Model\EmailTemplateInterface; use Oro\Bundle\NotificationBundle\Processor\EmailNotificationProcessor; -use Oro\Bundle\CronBundle\Command\Logger\RaiseExceptionLogger; -use Oro\Bundle\CronBundle\Command\Logger\Exception\RaiseExceptionLoggerException; +use Psr\Log\LoggerInterface; +use Psr\Log\NullLogger; class RemindersSender { diff --git a/src/Oro/Bundle/CalendarBundle/OroCalendarBundle.php b/src/Oro/Bundle/CalendarBundle/OroCalendarBundle.php index b89974320ad..ffe25485341 100644 --- a/src/Oro/Bundle/CalendarBundle/OroCalendarBundle.php +++ b/src/Oro/Bundle/CalendarBundle/OroCalendarBundle.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\CalendarBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Oro\Bundle\CalendarBundle\DependencyInjection\Compiler\TwigSandboxConfigurationPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroCalendarBundle extends Bundle { diff --git a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/CalendarTest.php b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/CalendarTest.php index 29b1817cbde..5315af7f4d8 100644 --- a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/CalendarTest.php +++ b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/CalendarTest.php @@ -5,8 +5,8 @@ use Oro\Bundle\CalendarBundle\Entity\Calendar; use Oro\Bundle\CalendarBundle\Entity\CalendarConnection; use Oro\Bundle\CalendarBundle\Entity\CalendarEvent; -use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\CalendarBundle\Tests\Unit\ReflectionUtil; +use Oro\Bundle\UserBundle\Entity\User; use Symfony\Component\PropertyAccess\PropertyAccess; class CalendarTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/Repository/CalendarConnectionRepositoryTest.php b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/Repository/CalendarConnectionRepositoryTest.php index 2d397e676c3..2f2ae7be345 100644 --- a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/Repository/CalendarConnectionRepositoryTest.php +++ b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/Repository/CalendarConnectionRepositoryTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\CalendarBundle\Tests\Unit\Entity\Repository; -use Doctrine\Tests\OrmTestCase; -use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\ORM\Mapping\Driver\AnnotationDriver; +use Doctrine\Tests\Mocks\EntityManagerMock; +use Doctrine\Tests\OrmTestCase; use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarConnectionRepository; class CalendarConnectionRepositoryTest extends OrmTestCase diff --git a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/Repository/CalendarEventRepositoryTest.php b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/Repository/CalendarEventRepositoryTest.php index 96989e2fe66..771f9704e4f 100644 --- a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/Repository/CalendarEventRepositoryTest.php +++ b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Entity/Repository/CalendarEventRepositoryTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\CalendarBundle\Tests\Unit\Entity\Repository; -use Doctrine\Tests\OrmTestCase; -use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\ORM\Mapping\Driver\AnnotationDriver; +use Doctrine\Tests\Mocks\EntityManagerMock; +use Doctrine\Tests\OrmTestCase; use Oro\Bundle\CalendarBundle\Entity\Repository\CalendarEventRepository; class CalendarEventRepositoryTest extends OrmTestCase diff --git a/src/Oro/Bundle/CalendarBundle/Tests/Unit/EventListener/EntitySubscriberTest.php b/src/Oro/Bundle/CalendarBundle/Tests/Unit/EventListener/EntitySubscriberTest.php index b8f6272462c..4ac181b7264 100644 --- a/src/Oro/Bundle/CalendarBundle/Tests/Unit/EventListener/EntitySubscriberTest.php +++ b/src/Oro/Bundle/CalendarBundle/Tests/Unit/EventListener/EntitySubscriberTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\CalendarBundle\Tests\Unit\EventListener; -use Doctrine\ORM\Events; use Doctrine\ORM\Event\LifecycleEventArgs; -use Doctrine\ORM\Event\PreUpdateEventArgs; use Doctrine\ORM\Event\OnFlushEventArgs; +use Doctrine\ORM\Event\PreUpdateEventArgs; +use Doctrine\ORM\Events; use Doctrine\ORM\Mapping\ClassMetadata; use Oro\Bundle\CalendarBundle\Entity\Calendar; use Oro\Bundle\CalendarBundle\Entity\CalendarConnection; diff --git a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Form/Type/CalendarEventApiTypeTest.php b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Form/Type/CalendarEventApiTypeTest.php index 23e74cc9683..a50281dab57 100644 --- a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Form/Type/CalendarEventApiTypeTest.php +++ b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Form/Type/CalendarEventApiTypeTest.php @@ -5,11 +5,11 @@ use Doctrine\ORM\Mapping\ClassMetadata; use Oro\Bundle\CalendarBundle\Entity\Calendar; use Oro\Bundle\CalendarBundle\Entity\CalendarEvent; +use Oro\Bundle\CalendarBundle\Form\Type\CalendarEventApiType; use Oro\Bundle\CalendarBundle\Tests\Unit\ReflectionUtil; use Oro\Bundle\FormBundle\Form\Type\EntityIdentifierType; use Symfony\Component\Form\PreloadedExtension; use Symfony\Component\Form\Test\TypeTestCase; -use Oro\Bundle\CalendarBundle\Form\Type\CalendarEventApiType; class CalendarEventApiTypeTest extends TypeTestCase { diff --git a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Notification/RemindersSenderTest.php b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Notification/RemindersSenderTest.php index 33f3efc786e..e9f49c74c9d 100644 --- a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Notification/RemindersSenderTest.php +++ b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Notification/RemindersSenderTest.php @@ -5,13 +5,13 @@ use Oro\Bundle\CalendarBundle\Entity\Calendar; use Oro\Bundle\CalendarBundle\Entity\CalendarEvent; use Oro\Bundle\CalendarBundle\Notification\EmailNotificationAdapter; -use Oro\Bundle\CronBundle\Command\Logger\Exception\RaiseExceptionLoggerException; -use Oro\Bundle\UserBundle\Entity\User; -use Psr\Log\LoggerInterface; use Oro\Bundle\CalendarBundle\Notification\RemindersSender; use Oro\Bundle\CalendarBundle\Notification\RemindTimeCalculator; -use Oro\Bundle\EmailBundle\Entity\EmailTemplate; use Oro\Bundle\CalendarBundle\Tests\Unit\ReflectionUtil; +use Oro\Bundle\CronBundle\Command\Logger\Exception\RaiseExceptionLoggerException; +use Oro\Bundle\EmailBundle\Entity\EmailTemplate; +use Oro\Bundle\UserBundle\Entity\User; +use Psr\Log\LoggerInterface; class RemindersSenderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/ConfigBundle/Config/ConfigManager.php b/src/Oro/Bundle/ConfigBundle/Config/ConfigManager.php index 94ab96cd039..c595da5729d 100644 --- a/src/Oro/Bundle/ConfigBundle/Config/ConfigManager.php +++ b/src/Oro/Bundle/ConfigBundle/Config/ConfigManager.php @@ -4,10 +4,10 @@ use Doctrine\Common\Persistence\ObjectManager; -use Symfony\Component\Form\FormInterface; - use Oro\Bundle\ConfigBundle\Entity\Config; + use Oro\Bundle\ConfigBundle\Entity\ConfigValue; +use Symfony\Component\Form\FormInterface; class ConfigManager { diff --git a/src/Oro/Bundle/ConfigBundle/Controller/ConfigurationController.php b/src/Oro/Bundle/ConfigBundle/Controller/ConfigurationController.php index 6cf2c9bbc0c..b1d3c0e939b 100644 --- a/src/Oro/Bundle/ConfigBundle/Controller/ConfigurationController.php +++ b/src/Oro/Bundle/ConfigBundle/Controller/ConfigurationController.php @@ -2,13 +2,14 @@ namespace Oro\Bundle\ConfigBundle\Controller; +use Oro\Bundle\ConfigBundle\Provider\SystemConfigurationFormProvider; +use Oro\Bundle\SecurityBundle\Annotation\Acl; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; + use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Bundle\FrameworkBundle\Controller\Controller; - -use Oro\Bundle\ConfigBundle\Provider\SystemConfigurationFormProvider; -use Oro\Bundle\SecurityBundle\Annotation\Acl; +use Symfony\Component\HttpFoundation\Request; class ConfigurationController extends Controller { @@ -26,7 +27,7 @@ class ConfigurationController extends Controller * group_name="" * ) */ - public function systemAction($activeGroup = null, $activeSubGroup = null) + public function systemAction(Request $request, $activeGroup = null, $activeSubGroup = null) { $provider = $this->get('oro_config.provider.system_configuration.form_provider'); @@ -37,7 +38,7 @@ public function systemAction($activeGroup = null, $activeSubGroup = null) if ($activeSubGroup !== null) { $form = $provider->getForm($activeSubGroup); - if ($this->get('oro_config.form.handler.config')->process($form, $this->getRequest())) { + if ($this->get('oro_config.form.handler.config')->process($form, $request)) { $this->get('session')->getFlashBag()->add( 'success', $this->get('translator')->trans('oro.config.controller.config.saved.message') diff --git a/src/Oro/Bundle/ConfigBundle/DependencyInjection/Compiler/ConfigPass.php b/src/Oro/Bundle/ConfigBundle/DependencyInjection/Compiler/ConfigPass.php index 5c301a5f8c6..cb98a7ec988 100644 --- a/src/Oro/Bundle/ConfigBundle/DependencyInjection/Compiler/ConfigPass.php +++ b/src/Oro/Bundle/ConfigBundle/DependencyInjection/Compiler/ConfigPass.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\ConfigBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\Config\Definition\Processor; +use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; class ConfigPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/ConfigBundle/DependencyInjection/Compiler/SystemConfigurationPass.php b/src/Oro/Bundle/ConfigBundle/DependencyInjection/Compiler/SystemConfigurationPass.php index 6190da5aecf..83bb3762949 100644 --- a/src/Oro/Bundle/ConfigBundle/DependencyInjection/Compiler/SystemConfigurationPass.php +++ b/src/Oro/Bundle/ConfigBundle/DependencyInjection/Compiler/SystemConfigurationPass.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\ConfigBundle\DependencyInjection\Compiler; -use Symfony\Component\Yaml\Yaml; -use Symfony\Component\DependencyInjection\ContainerBuilder; +use Oro\Bundle\ConfigBundle\DependencyInjection\SystemConfiguration\ProcessorDecorator; +use Oro\Bundle\ConfigBundle\Provider\FormProvider; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; -use Oro\Bundle\ConfigBundle\Provider\FormProvider; -use Oro\Bundle\ConfigBundle\DependencyInjection\SystemConfiguration\ProcessorDecorator; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\Yaml\Yaml; class SystemConfigurationPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/ConfigBundle/DependencyInjection/OroConfigExtension.php b/src/Oro/Bundle/ConfigBundle/DependencyInjection/OroConfigExtension.php index bf92679df52..a7e66619949 100644 --- a/src/Oro/Bundle/ConfigBundle/DependencyInjection/OroConfigExtension.php +++ b/src/Oro/Bundle/ConfigBundle/DependencyInjection/OroConfigExtension.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\ConfigBundle\DependencyInjection; +use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; -use Symfony\Component\Config\FileLocator; use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\Yaml\Yaml; diff --git a/src/Oro/Bundle/ConfigBundle/DependencyInjection/SettingsBuilder.php b/src/Oro/Bundle/ConfigBundle/DependencyInjection/SettingsBuilder.php index 2fc4c27bd6d..cc0d903e0cc 100644 --- a/src/Oro/Bundle/ConfigBundle/DependencyInjection/SettingsBuilder.php +++ b/src/Oro/Bundle/ConfigBundle/DependencyInjection/SettingsBuilder.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ConfigBundle\DependencyInjection; -use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; +use Symfony\Component\Config\Definition\Builder\TreeBuilder; class SettingsBuilder { diff --git a/src/Oro/Bundle/ConfigBundle/DependencyInjection/SystemConfiguration/ProcessorDecorator.php b/src/Oro/Bundle/ConfigBundle/DependencyInjection/SystemConfiguration/ProcessorDecorator.php index 0e663d8e070..288b6c44d89 100644 --- a/src/Oro/Bundle/ConfigBundle/DependencyInjection/SystemConfiguration/ProcessorDecorator.php +++ b/src/Oro/Bundle/ConfigBundle/DependencyInjection/SystemConfiguration/ProcessorDecorator.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\ConfigBundle\DependencyInjection\SystemConfiguration; -use Symfony\Component\Config\Definition\Processor; -use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\Builder\NodeDefinition; +use Symfony\Component\Config\Definition\Builder\TreeBuilder; +use Symfony\Component\Config\Definition\Processor; class ProcessorDecorator { diff --git a/src/Oro/Bundle/ConfigBundle/Form/EventListener/ConfigSubscriber.php b/src/Oro/Bundle/ConfigBundle/Form/EventListener/ConfigSubscriber.php index eb02dd36ace..f9c9002d611 100644 --- a/src/Oro/Bundle/ConfigBundle/Form/EventListener/ConfigSubscriber.php +++ b/src/Oro/Bundle/ConfigBundle/Form/EventListener/ConfigSubscriber.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\ConfigBundle\Form\EventListener; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Oro\Bundle\ConfigBundle\Config\ConfigManager; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormEvent; -use Symfony\Component\Form\FormEvents; -use Oro\Bundle\ConfigBundle\Config\ConfigManager; +use Symfony\Component\Form\FormEvents; class ConfigSubscriber implements EventSubscriberInterface { diff --git a/src/Oro/Bundle/ConfigBundle/Form/Handler/ConfigHandler.php b/src/Oro/Bundle/ConfigBundle/Form/Handler/ConfigHandler.php index 1947c9ac376..78feacf2e2b 100644 --- a/src/Oro/Bundle/ConfigBundle/Form/Handler/ConfigHandler.php +++ b/src/Oro/Bundle/ConfigBundle/Form/Handler/ConfigHandler.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\ConfigBundle\Form\Handler; +use Oro\Bundle\ConfigBundle\Config\ConfigManager; use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Request; -use Oro\Bundle\ConfigBundle\Config\ConfigManager; +use Symfony\Component\HttpFoundation\Request; class ConfigHandler { diff --git a/src/Oro/Bundle/ConfigBundle/Form/Type/ConfigCheckbox.php b/src/Oro/Bundle/ConfigBundle/Form/Type/ConfigCheckbox.php index 7e7736e1622..cabe20b9098 100644 --- a/src/Oro/Bundle/ConfigBundle/Form/Type/ConfigCheckbox.php +++ b/src/Oro/Bundle/ConfigBundle/Form/Type/ConfigCheckbox.php @@ -3,9 +3,10 @@ namespace Oro\Bundle\ConfigBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvent; +use Symfony\Component\Form\FormEvents; class ConfigCheckbox extends AbstractType { @@ -14,7 +15,7 @@ class ConfigCheckbox extends AbstractType /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -24,7 +25,7 @@ public function getName() */ public function getParent() { - return 'checkbox'; + return CheckboxType::class; } /** diff --git a/src/Oro/Bundle/ConfigBundle/Form/Type/FormFieldType.php b/src/Oro/Bundle/ConfigBundle/Form/Type/FormFieldType.php index 262a496bc8f..97269d541f1 100644 --- a/src/Oro/Bundle/ConfigBundle/Form/Type/FormFieldType.php +++ b/src/Oro/Bundle/ConfigBundle/Form/Type/FormFieldType.php @@ -2,11 +2,12 @@ namespace Oro\Bundle\ConfigBundle\Form\Type; +use Oro\Bundle\ConfigBundle\Config\Tree\FieldNodeDefinition; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\ConfigBundle\Config\Tree\FieldNodeDefinition; +use Symfony\Component\OptionsResolver\OptionsResolver; class FormFieldType extends AbstractType { @@ -15,7 +16,7 @@ class FormFieldType extends AbstractType * * @param OptionsResolverInterface $resolver */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -34,7 +35,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) public function buildForm(FormBuilderInterface $builder, array $options) { $useParentOptions = array('required' => false, 'label' => 'Default'); - $builder->add('use_parent_scope_value', 'checkbox', $useParentOptions); + $builder->add('use_parent_scope_value', CheckboxType::class, $useParentOptions); if ($options['target_field'] instanceof FieldNodeDefinition) { $filedOptions = $options['target_field']->getOptions(); @@ -51,7 +52,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_config_form_field_type'; } diff --git a/src/Oro/Bundle/ConfigBundle/Form/Type/FormType.php b/src/Oro/Bundle/ConfigBundle/Form/Type/FormType.php index 93cb7eab569..7a61497b229 100644 --- a/src/Oro/Bundle/ConfigBundle/Form/Type/FormType.php +++ b/src/Oro/Bundle/ConfigBundle/Form/Type/FormType.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\ConfigBundle\Form\Type; +use Oro\Bundle\ConfigBundle\Form\EventListener\ConfigSubscriber; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; -use Oro\Bundle\ConfigBundle\Form\EventListener\ConfigSubscriber; +use Symfony\Component\Form\FormBuilderInterface; class FormType extends AbstractType { @@ -29,7 +29,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_config_form_type'; } diff --git a/src/Oro/Bundle/ConfigBundle/OroConfigBundle.php b/src/Oro/Bundle/ConfigBundle/OroConfigBundle.php index f2bd5c2f349..7e41d8dfca3 100644 --- a/src/Oro/Bundle/ConfigBundle/OroConfigBundle.php +++ b/src/Oro/Bundle/ConfigBundle/OroConfigBundle.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\ConfigBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; - use Oro\Bundle\ConfigBundle\DependencyInjection\Compiler\ConfigPass; use Oro\Bundle\ConfigBundle\DependencyInjection\Compiler\SystemConfigurationPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; + class OroConfigBundle extends Bundle { public function build(ContainerBuilder $container) diff --git a/src/Oro/Bundle/ConfigBundle/Provider/FormProvider.php b/src/Oro/Bundle/ConfigBundle/Provider/FormProvider.php index 02e7ec7c8f6..fd26a5b7932 100644 --- a/src/Oro/Bundle/ConfigBundle/Provider/FormProvider.php +++ b/src/Oro/Bundle/ConfigBundle/Provider/FormProvider.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\ConfigBundle\Provider; -use Symfony\Component\Form\FormBuilderInterface; - -use Oro\Bundle\ConfigBundle\Utils\TreeUtils; use Oro\Bundle\ConfigBundle\Config\ConfigManager; + use Oro\Bundle\ConfigBundle\Config\Tree\FieldNodeDefinition; use Oro\Bundle\ConfigBundle\Config\Tree\GroupNodeDefinition; use Oro\Bundle\ConfigBundle\DependencyInjection\SystemConfiguration\ProcessorDecorator; +use Oro\Bundle\ConfigBundle\Utils\TreeUtils; +use Symfony\Component\Form\FormBuilderInterface; abstract class FormProvider implements ProviderInterface { diff --git a/src/Oro/Bundle/ConfigBundle/Provider/ProviderInterface.php b/src/Oro/Bundle/ConfigBundle/Provider/ProviderInterface.php index aae651b3cea..7b81cab47a3 100644 --- a/src/Oro/Bundle/ConfigBundle/Provider/ProviderInterface.php +++ b/src/Oro/Bundle/ConfigBundle/Provider/ProviderInterface.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\ConfigBundle\Provider; -use Symfony\Component\Form\FormInterface; - use Oro\Bundle\ConfigBundle\Config\Tree\GroupNodeDefinition; +use Symfony\Component\Form\FormInterface; + interface ProviderInterface { /** diff --git a/src/Oro/Bundle/ConfigBundle/Provider/SystemConfigurationFormProvider.php b/src/Oro/Bundle/ConfigBundle/Provider/SystemConfigurationFormProvider.php index 20209999453..64b817de726 100644 --- a/src/Oro/Bundle/ConfigBundle/Provider/SystemConfigurationFormProvider.php +++ b/src/Oro/Bundle/ConfigBundle/Provider/SystemConfigurationFormProvider.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\ConfigBundle\Provider; -use Symfony\Component\Form\FormFactoryInterface; - -use Oro\Bundle\ConfigBundle\Utils\TreeUtils; use Oro\Bundle\ConfigBundle\Config\Tree\FieldNodeDefinition; + use Oro\Bundle\ConfigBundle\Config\Tree\GroupNodeDefinition; +use Oro\Bundle\ConfigBundle\Utils\TreeUtils; use Oro\Bundle\SecurityBundle\SecurityFacade; +use Symfony\Component\Form\FormFactoryInterface; class SystemConfigurationFormProvider extends FormProvider { diff --git a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/ConfigManagerTest.php b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/ConfigManagerTest.php index fe94fa1198e..138af9ac9f1 100644 --- a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/ConfigManagerTest.php +++ b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/ConfigManagerTest.php @@ -2,20 +2,20 @@ namespace Oro\Bundle\ConfigBundle\Tests\Unit\Config; -use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\Collections\ArrayCollection; - -use Symfony\Component\Yaml\Yaml; -use Symfony\Component\Form\Forms; -use Symfony\Component\Form\PreloadedExtension; +use Doctrine\Common\Persistence\ObjectManager; use Oro\Bundle\ConfigBundle\Config\ConfigManager; use Oro\Bundle\ConfigBundle\DependencyInjection\SystemConfiguration\ProcessorDecorator; use Oro\Bundle\ConfigBundle\Entity\ConfigValue; + use Oro\Bundle\ConfigBundle\Form\Type\FormFieldType; use Oro\Bundle\ConfigBundle\Form\Type\FormType; use Oro\Bundle\ConfigBundle\Provider\SystemConfigurationFormProvider; use Oro\Bundle\FormBundle\Form\Extension\DataBlockExtension; +use Symfony\Component\Form\Forms; +use Symfony\Component\Form\PreloadedExtension; +use Symfony\Component\Yaml\Yaml; class ConfigManagerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/Tree/FieldNodeDefinitionTest.php b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/Tree/FieldNodeDefinitionTest.php index d5ae94690a9..a7ef772f240 100644 --- a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/Tree/FieldNodeDefinitionTest.php +++ b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/Tree/FieldNodeDefinitionTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\ConfigBundle\Tests\Unit\Config\Tree; +use Oro\Bundle\ConfigBundle\Config\Tree\FieldNodeDefinition; use Symfony\Component\Validator\Constraints\Length; -use Symfony\Component\Validator\Constraints\NotBlank; -use Oro\Bundle\ConfigBundle\Config\Tree\FieldNodeDefinition; +use Symfony\Component\Validator\Constraints\NotBlank; class FieldNodeDefinitionTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/UserConfigManagerTest.php b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/UserConfigManagerTest.php index 0104080b0d1..1714af2c8b5 100644 --- a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/UserConfigManagerTest.php +++ b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Config/UserConfigManagerTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\ConfigBundle\Tests\Unit\Config; -use Symfony\Component\Security\Core\SecurityContextInterface; use Doctrine\Common\Persistence\ObjectRepository; - use Oro\Bundle\ConfigBundle\Config\UserConfigManager; + use Oro\Bundle\UserBundle\Entity\User; +use Symfony\Component\Security\Core\SecurityContextInterface; class UserConfigManagerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/ConfigBundle/Tests/Unit/DependencyInjection/Compiler/SystemConfigurationPassTest.php b/src/Oro/Bundle/ConfigBundle/Tests/Unit/DependencyInjection/Compiler/SystemConfigurationPassTest.php index eb7aeeeca4b..41970b92f20 100644 --- a/src/Oro/Bundle/ConfigBundle/Tests/Unit/DependencyInjection/Compiler/SystemConfigurationPassTest.php +++ b/src/Oro/Bundle/ConfigBundle/Tests/Unit/DependencyInjection/Compiler/SystemConfigurationPassTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ConfigBundle\Tests\Unit\DependencyInjection\Compiler; -use Oro\Bundle\ConfigBundle\Provider\FormProvider; use Oro\Bundle\ConfigBundle\DependencyInjection\Compiler\SystemConfigurationPass; +use Oro\Bundle\ConfigBundle\Provider\FormProvider; class SystemConfigurationPassTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Form/Type/ConfigCheckboxTest.php b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Form/Type/ConfigCheckboxTest.php index 3781f8481cb..47a5c32cac2 100644 --- a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Form/Type/ConfigCheckboxTest.php +++ b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Form/Type/ConfigCheckboxTest.php @@ -2,10 +2,10 @@ namespace ConfigBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\Test\FormIntegrationTestCase; - use Oro\Bundle\ConfigBundle\Form\Type\ConfigCheckbox; +use Symfony\Component\Form\Test\FormIntegrationTestCase; + class ConfigCheckboxTest extends FormIntegrationTestCase { /** diff --git a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Form/Type/FormFieldTypeTest.php b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Form/Type/FormFieldTypeTest.php index 431a04f511d..18f54a4a335 100644 --- a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Form/Type/FormFieldTypeTest.php +++ b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Form/Type/FormFieldTypeTest.php @@ -2,10 +2,10 @@ namespace ConfigBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\Test\TypeTestCase; +use Oro\Bundle\ConfigBundle\Config\Tree\FieldNodeDefinition; use Oro\Bundle\ConfigBundle\Form\Type\FormFieldType; -use Oro\Bundle\ConfigBundle\Config\Tree\FieldNodeDefinition; +use Symfony\Component\Form\Test\TypeTestCase; class FormFieldTypeTest extends TypeTestCase { diff --git a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Provider/SystemConfigurationFormProviderTest.php b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Provider/SystemConfigurationFormProviderTest.php index 6e7aa7b92a8..d21760d1287 100644 --- a/src/Oro/Bundle/ConfigBundle/Tests/Unit/Provider/SystemConfigurationFormProviderTest.php +++ b/src/Oro/Bundle/ConfigBundle/Tests/Unit/Provider/SystemConfigurationFormProviderTest.php @@ -1,17 +1,17 @@ get('oro_cron.job_daemon'); $translator = $this->get('translator'); @@ -86,7 +87,7 @@ public function runDaemonAction() $ret['message'] = $e->getMessage(); } - if ($this->getRequest()->isXmlHttpRequest()) { + if ($request->isXmlHttpRequest()) { return new Response(json_encode($ret)); } else { if ($ret['error']) { @@ -106,7 +107,7 @@ public function runDaemonAction() * @Route("/stop-daemon", name="oro_cron_job_stop_daemon") * @AclAncestor("oro_jobs") */ - public function stopDaemonAction() + public function stopDaemonAction(Request $request) { $daemon = $this->get('oro_cron.job_daemon'); $translator = $this->get('translator'); @@ -123,7 +124,7 @@ public function stopDaemonAction() $ret['message'] = $e->getMessage(); } - if ($this->getRequest()->isXmlHttpRequest()) { + if ($request->isXmlHttpRequest()) { return new Response(json_encode($ret)); } else { $this->get('session')->getFlashBag()->add($ret['error'] ? 'error' : 'success', $ret['message']); diff --git a/src/Oro/Bundle/CronBundle/DependencyInjection/Compiler/JobSerializerMetadataPass.php b/src/Oro/Bundle/CronBundle/DependencyInjection/Compiler/JobSerializerMetadataPass.php index f5a77a80204..5e1787767c2 100644 --- a/src/Oro/Bundle/CronBundle/DependencyInjection/Compiler/JobSerializerMetadataPass.php +++ b/src/Oro/Bundle/CronBundle/DependencyInjection/Compiler/JobSerializerMetadataPass.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\CronBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; class JobSerializerMetadataPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/CronBundle/DependencyInjection/Compiler/JobStatisticParameterPass.php b/src/Oro/Bundle/CronBundle/DependencyInjection/Compiler/JobStatisticParameterPass.php index 45380344957..590aef72006 100644 --- a/src/Oro/Bundle/CronBundle/DependencyInjection/Compiler/JobStatisticParameterPass.php +++ b/src/Oro/Bundle/CronBundle/DependencyInjection/Compiler/JobStatisticParameterPass.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\CronBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; class JobStatisticParameterPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/CronBundle/DependencyInjection/OroCronExtension.php b/src/Oro/Bundle/CronBundle/DependencyInjection/OroCronExtension.php index c50c4bc4a2b..8378f7497f4 100644 --- a/src/Oro/Bundle/CronBundle/DependencyInjection/OroCronExtension.php +++ b/src/Oro/Bundle/CronBundle/DependencyInjection/OroCronExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\CronBundle\DependencyInjection; +use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\Config\FileLocator; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php b/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php index dd3b99d7170..b8a7a843d84 100644 --- a/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php +++ b/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\CronBundle\Entity\Manager; +use Doctrine\Common\Util\ClassUtils; use Doctrine\ORM\EntityManager; use Doctrine\ORM\QueryBuilder; -use Doctrine\Common\Util\ClassUtils; use JMS\JobQueueBundle\Entity\Job; diff --git a/src/Oro/Bundle/CronBundle/Job/Daemon.php b/src/Oro/Bundle/CronBundle/Job/Daemon.php index 478ab5aabb4..40984179fc6 100644 --- a/src/Oro/Bundle/CronBundle/Job/Daemon.php +++ b/src/Oro/Bundle/CronBundle/Job/Daemon.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\CronBundle\Job; -use Symfony\Component\Process\Process; use Symfony\Component\Process\PhpExecutableFinder; +use Symfony\Component\Process\Process; class Daemon { diff --git a/src/Oro/Bundle/CronBundle/OroCronBundle.php b/src/Oro/Bundle/CronBundle/OroCronBundle.php index de8ed102baf..cdb67552426 100644 --- a/src/Oro/Bundle/CronBundle/OroCronBundle.php +++ b/src/Oro/Bundle/CronBundle/OroCronBundle.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\CronBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; +use Oro\Bundle\CronBundle\DependencyInjection\Compiler\JobSerializerMetadataPass; +use Oro\Bundle\CronBundle\DependencyInjection\Compiler\JobStatisticParameterPass; use Symfony\Component\DependencyInjection\Compiler\PassConfig; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Oro\Bundle\CronBundle\DependencyInjection\Compiler\JobStatisticParameterPass; -use Oro\Bundle\CronBundle\DependencyInjection\Compiler\JobSerializerMetadataPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroCronBundle extends Bundle { diff --git a/src/Oro/Bundle/CronBundle/Tests/Functional/ControllersTest.php b/src/Oro/Bundle/CronBundle/Tests/Functional/ControllersTest.php index 304b2040db9..ff897b51117 100644 --- a/src/Oro/Bundle/CronBundle/Tests/Functional/ControllersTest.php +++ b/src/Oro/Bundle/CronBundle/Tests/Functional/ControllersTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\CronBundle\Tests\Functional; -use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; -use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; use Oro\Bundle\TestFrameworkBundle\Test\Client; +use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; +use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; /** * @outputBuffering enabled diff --git a/src/Oro/Bundle/CronBundle/Tests/Unit/Logger/OutputLoggerTest.php b/src/Oro/Bundle/CronBundle/Tests/Unit/Logger/OutputLoggerTest.php index a97e22852d3..04fc049e09d 100644 --- a/src/Oro/Bundle/CronBundle/Tests/Unit/Logger/OutputLoggerTest.php +++ b/src/Oro/Bundle/CronBundle/Tests/Unit/Logger/OutputLoggerTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\CronBundle\Tests\Unit\Command\Logger; +use Oro\Bundle\CronBundle\Command\Logger\OutputLogger; use Psr\Log\LogLevel; use Symfony\Component\Console\Output\OutputInterface; -use Oro\Bundle\CronBundle\Command\Logger\OutputLogger; class OutputLoggerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/CronBundle/Tests/Unit/Logger/RaiseExceptionLoggerTest.php b/src/Oro/Bundle/CronBundle/Tests/Unit/Logger/RaiseExceptionLoggerTest.php index e6833d0ea40..21c6d6c604a 100644 --- a/src/Oro/Bundle/CronBundle/Tests/Unit/Logger/RaiseExceptionLoggerTest.php +++ b/src/Oro/Bundle/CronBundle/Tests/Unit/Logger/RaiseExceptionLoggerTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\CronBundle\Tests\Unit\Command\Logger; -use Psr\Log\LogLevel; -use Oro\Bundle\CronBundle\Command\Logger\RaiseExceptionLogger; use Oro\Bundle\CronBundle\Command\Logger\Exception\RaiseExceptionLoggerException; +use Oro\Bundle\CronBundle\Command\Logger\RaiseExceptionLogger; +use Psr\Log\LogLevel; class RaiseExceptionLoggerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/DataAuditBundle/Controller/Api/Rest/AuditController.php b/src/Oro/Bundle/DataAuditBundle/Controller/Api/Rest/AuditController.php index 8353a4618a1..3e1840ec60b 100644 --- a/src/Oro/Bundle/DataAuditBundle/Controller/Api/Rest/AuditController.php +++ b/src/Oro/Bundle/DataAuditBundle/Controller/Api/Rest/AuditController.php @@ -2,18 +2,18 @@ namespace Oro\Bundle\DataAuditBundle\Controller\Api\Rest; -use Symfony\Component\Validator\Constraints\True; +use FOS\Rest\Util\Codes; -use FOS\RestBundle\Controller\FOSRestController; use FOS\RestBundle\Controller\Annotations\NamePrefix; +use FOS\RestBundle\Controller\FOSRestController; use FOS\RestBundle\Routing\ClassResourceInterface; -use FOS\Rest\Util\Codes; - use Nelmio\ApiDocBundle\Annotation\ApiDoc; use Oro\Bundle\DataAuditBundle\Entity\Audit; + use Oro\Bundle\SecurityBundle\Annotation\Acl; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Symfony\Component\Validator\Constraints\True; /** * @NamePrefix("oro_api_") diff --git a/src/Oro/Bundle/DataAuditBundle/Controller/Api/Soap/AuditController.php b/src/Oro/Bundle/DataAuditBundle/Controller/Api/Soap/AuditController.php index b3168c0134e..36f70ac13bc 100644 --- a/src/Oro/Bundle/DataAuditBundle/Controller/Api/Soap/AuditController.php +++ b/src/Oro/Bundle/DataAuditBundle/Controller/Api/Soap/AuditController.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\DataAuditBundle\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\DataAuditBundle\Entity\Audit; +use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Symfony\Component\DependencyInjection\ContainerAware; class AuditController extends ContainerAware { diff --git a/src/Oro/Bundle/DataAuditBundle/Controller/AuditController.php b/src/Oro/Bundle/DataAuditBundle/Controller/AuditController.php index ac755785b36..8ad2fde7da3 100644 --- a/src/Oro/Bundle/DataAuditBundle/Controller/AuditController.php +++ b/src/Oro/Bundle/DataAuditBundle/Controller/AuditController.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\DataAuditBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpFoundation\Request; +use Oro\Bundle\SecurityBundle\Annotation\Acl; +use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; -use Oro\Bundle\SecurityBundle\Annotation\Acl; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; class AuditController extends Controller { diff --git a/src/Oro/Bundle/DataAuditBundle/DependencyInjection/OroDataAuditExtension.php b/src/Oro/Bundle/DataAuditBundle/DependencyInjection/OroDataAuditExtension.php index f96e215a031..e9606a44b45 100644 --- a/src/Oro/Bundle/DataAuditBundle/DependencyInjection/OroDataAuditExtension.php +++ b/src/Oro/Bundle/DataAuditBundle/DependencyInjection/OroDataAuditExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataAuditBundle\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; class OroDataAuditExtension extends Extension { diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php b/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php index 58d31e5e963..01baa999bc3 100644 --- a/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php +++ b/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\DataAuditBundle\Entity; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; + use Doctrine\ORM\Mapping as ORM; use Gedmo\Loggable\Entity\MappedSuperclass\AbstractLogEntry; - -use JMS\Serializer\Annotation\Type; use JMS\Serializer\Annotation\SerializedName; -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use JMS\Serializer\Annotation\Type; use Oro\Bundle\UserBundle\Entity\User; diff --git a/src/Oro/Bundle/DataAuditBundle/EventListener/KernelListener.php b/src/Oro/Bundle/DataAuditBundle/EventListener/KernelListener.php index 4d834ab280c..f1dccd45103 100644 --- a/src/Oro/Bundle/DataAuditBundle/EventListener/KernelListener.php +++ b/src/Oro/Bundle/DataAuditBundle/EventListener/KernelListener.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\DataAuditBundle\EventListener; +use Oro\Bundle\DataAuditBundle\Loggable\LoggableManager; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\KernelEvents; -use Symfony\Component\Security\Core\SecurityContextInterface; -use Oro\Bundle\DataAuditBundle\Loggable\LoggableManager; +use Symfony\Component\Security\Core\SecurityContextInterface; class KernelListener implements EventSubscriberInterface { diff --git a/src/Oro/Bundle/DataAuditBundle/Loggable/LoggableManager.php b/src/Oro/Bundle/DataAuditBundle/Loggable/LoggableManager.php index 1e210985f70..b57a8e40ff7 100644 --- a/src/Oro/Bundle/DataAuditBundle/Loggable/LoggableManager.php +++ b/src/Oro/Bundle/DataAuditBundle/Loggable/LoggableManager.php @@ -1,25 +1,25 @@ getRequest(); - /** @var MassActionParametersParser $massActionParametersParser */ $parametersParser = $this->get('oro_datagrid.mass_action.parameters_parser'); $parameters = $parametersParser->parse($request); diff --git a/src/Oro/Bundle/DataGridBundle/Datagrid/Builder.php b/src/Oro/Bundle/DataGridBundle/Datagrid/Builder.php index afabbaa080d..d1cbf4bd768 100644 --- a/src/Oro/Bundle/DataGridBundle/Datagrid/Builder.php +++ b/src/Oro/Bundle/DataGridBundle/Datagrid/Builder.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\DataGridBundle\Datagrid; -use Symfony\Component\EventDispatcher\EventDispatcher; -use Symfony\Component\Security\Core\Exception\AccessDeniedException; +use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; -use Oro\Bundle\SecurityBundle\SecurityFacade; use Oro\Bundle\DataGridBundle\Event\BuildAfter; use Oro\Bundle\DataGridBundle\Event\BuildBefore; use Oro\Bundle\DataGridBundle\Extension\Acceptor; -use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; use Oro\Bundle\DataGridBundle\Extension\ExtensionVisitorInterface; -use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\SecurityBundle\SecurityFacade; +use Symfony\Component\EventDispatcher\EventDispatcher; +use Symfony\Component\Security\Core\Exception\AccessDeniedException; class Builder { diff --git a/src/Oro/Bundle/DataGridBundle/Datagrid/Datagrid.php b/src/Oro/Bundle/DataGridBundle/Datagrid/Datagrid.php index 4ce3bb432e1..caaaf51b691 100644 --- a/src/Oro/Bundle/DataGridBundle/Datagrid/Datagrid.php +++ b/src/Oro/Bundle/DataGridBundle/Datagrid/Datagrid.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Datagrid; -use Oro\Bundle\DataGridBundle\Extension\Acceptor; use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject; use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; +use Oro\Bundle\DataGridBundle\Extension\Acceptor; class Datagrid implements DatagridInterface { diff --git a/src/Oro/Bundle/DataGridBundle/Datagrid/DatagridInterface.php b/src/Oro/Bundle/DataGridBundle/Datagrid/DatagridInterface.php index 1f8f7a8062a..349bea1cc49 100644 --- a/src/Oro/Bundle/DataGridBundle/Datagrid/DatagridInterface.php +++ b/src/Oro/Bundle/DataGridBundle/Datagrid/DatagridInterface.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Datagrid; -use Oro\Bundle\DataGridBundle\Extension\Acceptor; use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject; use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; +use Oro\Bundle\DataGridBundle\Extension\Acceptor; interface DatagridInterface { diff --git a/src/Oro/Bundle/DataGridBundle/Datagrid/Manager.php b/src/Oro/Bundle/DataGridBundle/Datagrid/Manager.php index 17ae20fa361..d164f06febe 100644 --- a/src/Oro/Bundle/DataGridBundle/Datagrid/Manager.php +++ b/src/Oro/Bundle/DataGridBundle/Datagrid/Manager.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\DataGridBundle\Datagrid; -use Oro\Bundle\DataGridBundle\Provider\SystemAwareResolver; use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Provider\SystemAwareResolver; /** * Class Manager diff --git a/src/Oro/Bundle/DataGridBundle/Datasource/Orm/IterableResult.php b/src/Oro/Bundle/DataGridBundle/Datasource/Orm/IterableResult.php index 384e6c03a72..255bf925c47 100644 --- a/src/Oro/Bundle/DataGridBundle/Datasource/Orm/IterableResult.php +++ b/src/Oro/Bundle/DataGridBundle/Datasource/Orm/IterableResult.php @@ -4,8 +4,8 @@ use Doctrine\ORM\Query; -use Oro\Bundle\DataGridBundle\Datasource\ResultRecord; use Oro\Bundle\BatchBundle\ORM\Query\BufferedQueryResultIterator; +use Oro\Bundle\DataGridBundle\Datasource\ResultRecord; /** * Iterates query result with elements of ResultRecord type diff --git a/src/Oro/Bundle/DataGridBundle/Datasource/Orm/QueryConverter/YamlConverter.php b/src/Oro/Bundle/DataGridBundle/Datasource/Orm/QueryConverter/YamlConverter.php index 0038cdce846..e9d74ba3be8 100644 --- a/src/Oro/Bundle/DataGridBundle/Datasource/Orm/QueryConverter/YamlConverter.php +++ b/src/Oro/Bundle/DataGridBundle/Datasource/Orm/QueryConverter/YamlConverter.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\DataGridBundle\Datasource\Orm\QueryConverter; -use Symfony\Component\Yaml\Yaml; -use Symfony\Component\Config\Definition\Processor; - -use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\Query\Expr; +use Doctrine\ORM\QueryBuilder; + +use Symfony\Component\Config\Definition\Processor; +use Symfony\Component\Yaml\Yaml; class YamlConverter implements QueryConverterInterface { diff --git a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ActionsPass.php b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ActionsPass.php index a65082ec3e3..bcc4f59bfd6 100644 --- a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ActionsPass.php +++ b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ActionsPass.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; class ActionsPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php index 5483ed40343..9e59daf0a09 100644 --- a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php +++ b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass; +use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\Yaml\Yaml; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; class ConfigurationPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/FormattersPass.php b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/FormattersPass.php index ad0deac1153..850e35592de 100644 --- a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/FormattersPass.php +++ b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/FormattersPass.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass; -use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Reference; class FormattersPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/MassActionsPass.php b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/MassActionsPass.php index 44954e3c913..384a46288d9 100644 --- a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/MassActionsPass.php +++ b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/MassActionsPass.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; class MassActionsPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/DataGridBundle/DependencyInjection/OroDataGridExtension.php b/src/Oro/Bundle/DataGridBundle/DependencyInjection/OroDataGridExtension.php index f39113b714f..f1826ed0ceb 100644 --- a/src/Oro/Bundle/DataGridBundle/DependencyInjection/OroDataGridExtension.php +++ b/src/Oro/Bundle/DataGridBundle/DependencyInjection/OroDataGridExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\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; class OroDataGridExtension extends Extension { diff --git a/src/Oro/Bundle/DataGridBundle/Event/BuildAfter.php b/src/Oro/Bundle/DataGridBundle/Event/BuildAfter.php index 6f7bfee070a..cb5610fa0f4 100644 --- a/src/Oro/Bundle/DataGridBundle/Event/BuildAfter.php +++ b/src/Oro/Bundle/DataGridBundle/Event/BuildAfter.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Event; -use Symfony\Component\EventDispatcher\Event; - use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface; +use Symfony\Component\EventDispatcher\Event; + /** * Class BuildBefore * @package Oro\Bundle\DataGridBundle\Event diff --git a/src/Oro/Bundle/DataGridBundle/Event/BuildBefore.php b/src/Oro/Bundle/DataGridBundle/Event/BuildBefore.php index a1f0849cb15..ccfb0736077 100644 --- a/src/Oro/Bundle/DataGridBundle/Event/BuildBefore.php +++ b/src/Oro/Bundle/DataGridBundle/Event/BuildBefore.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Event; -use Symfony\Component\EventDispatcher\Event; +use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface; -use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Symfony\Component\EventDispatcher\Event; /** * Class BuildBefore diff --git a/src/Oro/Bundle/DataGridBundle/Extension/AbstractExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/AbstractExtension.php index 7b647254df5..27efc88ad06 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/AbstractExtension.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/AbstractExtension.php @@ -3,14 +3,14 @@ namespace Oro\Bundle\DataGridBundle\Extension; -use Symfony\Component\Config\Definition\Processor; -use Symfony\Component\Config\Definition\ConfigurationInterface; - -use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; -use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; +use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; + use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject; -use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; +use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; +use Symfony\Component\Config\Definition\ConfigurationInterface; +use Symfony\Component\Config\Definition\Processor; abstract class AbstractExtension implements ExtensionVisitorInterface { diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Acceptor.php b/src/Oro/Bundle/DataGridBundle/Extension/Acceptor.php index 16a3ab4d15f..33aba494624 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/Acceptor.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/Acceptor.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Extension; -use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; -use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject; -use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; +use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject; +use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; class Acceptor { diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php index 74bfe46c6c2..5b31124df8f 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\DataGridBundle\Extension\Action; -use Symfony\Component\Translation\TranslatorInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; -use Oro\Bundle\SecurityBundle\SecurityFacade; +use Oro\Bundle\DataGridBundle\Datasource\ResultRecordInterface; use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; -use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; -use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; use Oro\Bundle\DataGridBundle\Extension\Action\Actions\ActionInterface; use Oro\Bundle\DataGridBundle\Extension\Formatter\Configuration; use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface; -use Oro\Bundle\DataGridBundle\Datasource\ResultRecordInterface; +use Oro\Bundle\SecurityBundle\SecurityFacade; +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\Translation\TranslatorInterface; class ActionExtension extends AbstractExtension { diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Configuration.php b/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Configuration.php index 7a812f85e12..6e21e55baba 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Configuration.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Configuration.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Extension\Formatter; +use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface; use Symfony\Component\Config\Definition\Builder\TreeBuilder; -use Symfony\Component\Config\Definition\ConfigurationInterface; -use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface; +use Symfony\Component\Config\Definition\ConfigurationInterface; class Configuration implements ConfigurationInterface { diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Formatter/FormatterExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Formatter/FormatterExtension.php index 9d784a57574..37ef6e39816 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/Formatter/FormatterExtension.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/Formatter/FormatterExtension.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\DataGridBundle\Extension\Formatter; -use Symfony\Component\Translation\TranslatorInterface; +use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; +use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject; use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyConfiguration; use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface; -use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; -use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject; -use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Symfony\Component\Translation\TranslatorInterface; class FormatterExtension extends AbstractExtension { diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Property/FieldProperty.php b/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Property/FieldProperty.php index 0ab0a9c87ba..5f510d20eb3 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Property/FieldProperty.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Property/FieldProperty.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Extension\Formatter\Property; -use Symfony\Component\Translation\TranslatorInterface; - use Oro\Bundle\DataGridBundle\Datasource\ResultRecordInterface; +use Symfony\Component\Translation\TranslatorInterface; + class FieldProperty extends AbstractProperty { /** @var TranslatorInterface */ diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Property/UrlProperty.php b/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Property/UrlProperty.php index 3c3a0df2d37..8a7b8e22c6d 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Property/UrlProperty.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/Formatter/Property/UrlProperty.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Extension\Formatter\Property; -use Symfony\Component\Routing\Router; - use Oro\Bundle\DataGridBundle\Datasource\ResultRecordInterface; +use Symfony\Component\Routing\Router; + class UrlProperty extends AbstractProperty { const ROUTE_KEY = 'route'; diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php index 2c3d3cbb616..2fa4052afda 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\DataGridBundle\Extension\GridViews; -use Symfony\Component\Config\Definition\Exception\InvalidTypeException; +use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; -use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; -use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; -use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; +use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; +use Symfony\Component\Config\Definition\Exception\InvalidTypeException; class GridViewsExtension extends AbstractExtension { diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php index db5704ddd03..2d1228156b1 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php @@ -5,11 +5,11 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\Query\Parameter; -use Symfony\Component\Translation\TranslatorInterface; - -use Oro\Bundle\DataGridBundle\Datasource\ResultRecordInterface; use Oro\Bundle\DataGridBundle\Datasource\Orm\ConstantPagerIterableResult; + use Oro\Bundle\DataGridBundle\Datasource\Orm\IterableResultInterface; +use Oro\Bundle\DataGridBundle\Datasource\ResultRecordInterface; +use Symfony\Component\Translation\TranslatorInterface; class DeleteMassActionHandler implements MassActionHandlerInterface { diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionDispatcher.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionDispatcher.php index 61aca3065b0..c0c386f08b9 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionDispatcher.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionDispatcher.php @@ -4,17 +4,17 @@ use Doctrine\ORM\QueryBuilder; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpFoundation\File\Exception\UnexpectedTypeException; - -use Oro\Bundle\DataGridBundle\Datagrid\Manager; use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface; +use Oro\Bundle\DataGridBundle\Datagrid\Manager; + use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; use Oro\Bundle\DataGridBundle\Datasource\Orm\IterableResult; use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; use Oro\Bundle\DataGridBundle\Extension\ExtensionVisitorInterface; use Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\MassActionInterface; use Oro\Bundle\FilterBundle\Extension\OrmFilterExtension; +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\HttpFoundation\File\Exception\UnexpectedTypeException; class MassActionDispatcher { diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Pager/Orm/Pager.php b/src/Oro/Bundle/DataGridBundle/Extension/Pager/Orm/Pager.php index 6e2661ec444..fe7b95e0349 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/Pager/Orm/Pager.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/Pager/Orm/Pager.php @@ -6,8 +6,8 @@ use Doctrine\ORM\QueryBuilder; use Oro\Bundle\BatchBundle\ORM\Query\QueryCountCalculator; -use Oro\Bundle\DataGridBundle\Extension\Pager\PagerInterface; use Oro\Bundle\DataGridBundle\Extension\Pager\AbstractPager; +use Oro\Bundle\DataGridBundle\Extension\Pager\PagerInterface; class Pager extends AbstractPager implements PagerInterface { diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Pager/OrmPagerExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Pager/OrmPagerExtension.php index 2e5eb2b760f..e1c4e320317 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/Pager/OrmPagerExtension.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/Pager/OrmPagerExtension.php @@ -3,12 +3,12 @@ namespace Oro\Bundle\DataGridBundle\Extension\Pager; use Oro\Bundle\DataGridBundle\Datagrid\Builder; +use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject; use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; -use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; -use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; +use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; use Oro\Bundle\DataGridBundle\Extension\Pager\Orm\Pager; use Oro\Bundle\DataGridBundle\Extension\Toolbar\ToolbarExtension; diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Sorter/Configuration.php b/src/Oro/Bundle/DataGridBundle/Extension/Sorter/Configuration.php index 2afb7753f2d..3fc3f0f7148 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/Sorter/Configuration.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/Sorter/Configuration.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Extension\Sorter; +use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface; use Symfony\Component\Config\Definition\Builder\TreeBuilder; -use Symfony\Component\Config\Definition\ConfigurationInterface; -use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface; +use Symfony\Component\Config\Definition\ConfigurationInterface; class Configuration implements ConfigurationInterface { diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Toolbar/ToolbarExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Toolbar/ToolbarExtension.php index f3c3e428904..4bdb774d3fa 100644 --- a/src/Oro/Bundle/DataGridBundle/Extension/Toolbar/ToolbarExtension.php +++ b/src/Oro/Bundle/DataGridBundle/Extension/Toolbar/ToolbarExtension.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\DataGridBundle\Extension\Toolbar; -use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; -use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; +use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; class ToolbarExtension extends AbstractExtension { diff --git a/src/Oro/Bundle/DataGridBundle/OroDataGridBundle.php b/src/Oro/Bundle/DataGridBundle/OroDataGridBundle.php index 3760d87b35b..d2e8d627553 100644 --- a/src/Oro/Bundle/DataGridBundle/OroDataGridBundle.php +++ b/src/Oro/Bundle/DataGridBundle/OroDataGridBundle.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\DataGridBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; - use Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass\ActionsPass; -use Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass\MassActionsPass; -use Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass\FormattersPass; use Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass\ConfigurationPass; +use Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass\FormattersPass; +use Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass\MassActionsPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; + class OroDataGridBundle extends Bundle { /** diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/DataFixtures/Stub/Extension/SomeExtension.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/DataFixtures/Stub/Extension/SomeExtension.php index 7631695abd3..3b512e3bbc6 100644 --- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/DataFixtures/Stub/Extension/SomeExtension.php +++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/DataFixtures/Stub/Extension/SomeExtension.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\DataGridBundle\Tests\Unit\DataFixtures\Stub\Extension; -use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; class SomeExtension extends AbstractExtension { diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/BuilderTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/BuilderTest.php index 6243abfa1b6..0beb544e6b7 100644 --- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/BuilderTest.php +++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/BuilderTest.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\DataGridBundle\Tests\Unit\Datagrid; use Oro\Bundle\DataGridBundle\Datagrid\Builder; -use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface; use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface; class BuilderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/AcceptorTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/AcceptorTest.php index 8a0f369919a..2fb9415719d 100644 --- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/AcceptorTest.php +++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/AcceptorTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Tests\Unit\Extension; -use Oro\Bundle\DataGridBundle\Extension\Acceptor; +use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject; -use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Extension\Acceptor; class AcceptorTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/DataGridBundle/Twig/MetadataExtension.php b/src/Oro/Bundle/DataGridBundle/Twig/MetadataExtension.php index 2276ef50092..40cf5941262 100644 --- a/src/Oro/Bundle/DataGridBundle/Twig/MetadataExtension.php +++ b/src/Oro/Bundle/DataGridBundle/Twig/MetadataExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DataGridBundle\Twig; -use Symfony\Component\Routing\RouterInterface; - use Oro\Bundle\DataGridBundle\Datagrid\Manager; + use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; +use Symfony\Component\Routing\RouterInterface; class MetadataExtension extends \Twig_Extension { diff --git a/src/Oro/Bundle/DistributionBundle/DependencyInjection/OroDistributionExtension.php b/src/Oro/Bundle/DistributionBundle/DependencyInjection/OroDistributionExtension.php index c3552db6422..f6383bb0bc6 100644 --- a/src/Oro/Bundle/DistributionBundle/DependencyInjection/OroDistributionExtension.php +++ b/src/Oro/Bundle/DistributionBundle/DependencyInjection/OroDistributionExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DistributionBundle\DependencyInjection; +use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\Config\FileLocator; use Symfony\Component\Yaml\Yaml; /** diff --git a/src/Oro/Bundle/DistributionBundle/OroKernel.php b/src/Oro/Bundle/DistributionBundle/OroKernel.php index 7abb22b7936..e93ddb07f8c 100644 --- a/src/Oro/Bundle/DistributionBundle/OroKernel.php +++ b/src/Oro/Bundle/DistributionBundle/OroKernel.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\DistributionBundle; -use Symfony\Component\HttpKernel\Kernel; +use Oro\Bundle\DistributionBundle\Dumper\PhpBundlesDumper; use Symfony\Component\Config\ConfigCache; use Symfony\Component\Finder\Finder; -use Symfony\Component\Yaml\Yaml; +use Symfony\Component\HttpKernel\Kernel; -use Oro\Bundle\DistributionBundle\Dumper\PhpBundlesDumper; +use Symfony\Component\Yaml\Yaml; abstract class OroKernel extends Kernel { diff --git a/src/Oro/Bundle/DistributionBundle/Routing/OroAutoLoader.php b/src/Oro/Bundle/DistributionBundle/Routing/OroAutoLoader.php index 721e8695325..a140935ba7e 100644 --- a/src/Oro/Bundle/DistributionBundle/Routing/OroAutoLoader.php +++ b/src/Oro/Bundle/DistributionBundle/Routing/OroAutoLoader.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\DistributionBundle\Routing; -use Symfony\Component\Routing\Loader\YamlFileLoader; -use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Config\FileLocatorInterface; use Symfony\Component\HttpKernel\HttpKernelInterface; +use Symfony\Component\Routing\Loader\YamlFileLoader; +use Symfony\Component\Routing\RouteCollection; class OroAutoLoader extends YamlFileLoader { diff --git a/src/Oro/Bundle/EmailBundle/Builder/EmailBodyBuilder.php b/src/Oro/Bundle/EmailBundle/Builder/EmailBodyBuilder.php index 72f3dd864f3..36d0692a086 100644 --- a/src/Oro/Bundle/EmailBundle/Builder/EmailBodyBuilder.php +++ b/src/Oro/Bundle/EmailBundle/Builder/EmailBodyBuilder.php @@ -4,9 +4,9 @@ namespace Oro\Bundle\EmailBundle\Builder; use Oro\Bundle\EmailBundle\Entity\Email; -use Oro\Bundle\EmailBundle\Entity\EmailBody; use Oro\Bundle\EmailBundle\Entity\EmailAttachment; use Oro\Bundle\EmailBundle\Entity\EmailAttachmentContent; +use Oro\Bundle\EmailBundle\Entity\EmailBody; /** * A helper class allows you to easy build EmailBody entity diff --git a/src/Oro/Bundle/EmailBundle/Builder/EmailEntityBuilder.php b/src/Oro/Bundle/EmailBundle/Builder/EmailEntityBuilder.php index 10b511e9ee0..f52d48b322b 100644 --- a/src/Oro/Bundle/EmailBundle/Builder/EmailEntityBuilder.php +++ b/src/Oro/Bundle/EmailBundle/Builder/EmailEntityBuilder.php @@ -2,7 +2,6 @@ namespace Oro\Bundle\EmailBundle\Builder; -use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; use Oro\Bundle\EmailBundle\Entity\Email; use Oro\Bundle\EmailBundle\Entity\EmailAddress; use Oro\Bundle\EmailBundle\Entity\EmailAttachment; @@ -12,6 +11,7 @@ use Oro\Bundle\EmailBundle\Entity\EmailOrigin; use Oro\Bundle\EmailBundle\Entity\EmailRecipient; use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; +use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; class EmailEntityBuilder { diff --git a/src/Oro/Bundle/EmailBundle/Cache/EntityCacheClearer.php b/src/Oro/Bundle/EmailBundle/Cache/EntityCacheClearer.php index 590e156f65b..c11e0ea8a46 100644 --- a/src/Oro/Bundle/EmailBundle/Cache/EntityCacheClearer.php +++ b/src/Oro/Bundle/EmailBundle/Cache/EntityCacheClearer.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Cache; -use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface; - use Symfony\Component\Filesystem\Filesystem; +use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface; + class EntityCacheClearer implements CacheClearerInterface { /** diff --git a/src/Oro/Bundle/EmailBundle/Cache/EntityCacheWarmer.php b/src/Oro/Bundle/EmailBundle/Cache/EntityCacheWarmer.php index e4f0eb7e9c7..32edcbe5616 100644 --- a/src/Oro/Bundle/EmailBundle/Cache/EntityCacheWarmer.php +++ b/src/Oro/Bundle/EmailBundle/Cache/EntityCacheWarmer.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\EmailBundle\Cache; -use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer; -use Symfony\Component\Filesystem\Filesystem; use Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProviderStorage; +use Symfony\Component\Filesystem\Filesystem; +use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer; class EntityCacheWarmer extends CacheWarmer { diff --git a/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailController.php b/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailController.php index 1bca294dac0..b9512689ab9 100644 --- a/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailController.php +++ b/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailController.php @@ -3,18 +3,18 @@ namespace Oro\Bundle\EmailBundle\Controller\Api\Rest; use FOS\Rest\Util\Codes; -use Nelmio\ApiDocBundle\Annotation\ApiDoc; use FOS\RestBundle\Controller\Annotations\NamePrefix; -use FOS\RestBundle\Controller\Annotations\RouteResource; use FOS\RestBundle\Controller\Annotations\QueryParam; +use FOS\RestBundle\Controller\Annotations\RouteResource; +use Nelmio\ApiDocBundle\Annotation\ApiDoc; -use Symfony\Component\HttpFoundation\Response; +use Oro\Bundle\EmailBundle\Entity\Email; +use Oro\Bundle\EmailBundle\Entity\Manager\EmailApiEntityManager; use Oro\Bundle\SecurityBundle\Annotation\Acl; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestGetController; -use Oro\Bundle\EmailBundle\Entity\Manager\EmailApiEntityManager; -use Oro\Bundle\EmailBundle\Entity\Email; +use Symfony\Component\HttpFoundation\Response; /** * @RouteResource("email") diff --git a/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailTemplateController.php b/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailTemplateController.php index 4c2a992e092..072625d9bc0 100644 --- a/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailTemplateController.php +++ b/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailTemplateController.php @@ -3,21 +3,21 @@ namespace Oro\Bundle\EmailBundle\Controller\Api\Rest; use FOS\Rest\Util\Codes; -use Nelmio\ApiDocBundle\Annotation\ApiDoc; use FOS\RestBundle\Controller\Annotations\Get as GetRoute; use FOS\RestBundle\Controller\Annotations\NamePrefix; use FOS\RestBundle\Controller\Annotations\RouteResource; +use Nelmio\ApiDocBundle\Annotation\ApiDoc; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Response; +use Oro\Bundle\EmailBundle\Entity\Repository\EmailTemplateRepository; +use Oro\Bundle\EmailBundle\Provider\VariablesProvider; use Oro\Bundle\SecurityBundle\Annotation\Acl; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; -use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler; -use Oro\Bundle\EmailBundle\Provider\VariablesProvider; -use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; -use Oro\Bundle\EmailBundle\Entity\Repository\EmailTemplateRepository; +use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; +use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\Response; /** * @RouteResource("emailtemplate") diff --git a/src/Oro/Bundle/EmailBundle/Controller/Api/Soap/EmailController.php b/src/Oro/Bundle/EmailBundle/Controller/Api/Soap/EmailController.php index 72d502d14a4..6a351c55ec0 100644 --- a/src/Oro/Bundle/EmailBundle/Controller/Api/Soap/EmailController.php +++ b/src/Oro/Bundle/EmailBundle/Controller/Api/Soap/EmailController.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\EmailBundle\Controller\Api\Soap; -use Oro\Bundle\SoapBundle\Controller\Api\Soap\SoapGetController; use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; -use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; -use Oro\Bundle\EmailBundle\Entity\Manager\EmailApiEntityManager; use Oro\Bundle\EmailBundle\Cache\EmailCacheManager; use Oro\Bundle\EmailBundle\Entity\Email; use Oro\Bundle\EmailBundle\Entity\EmailAttachmentContent; +use Oro\Bundle\EmailBundle\Entity\Manager\EmailApiEntityManager; +use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Oro\Bundle\SoapBundle\Controller\Api\Soap\SoapGetController; class EmailController extends SoapGetController { diff --git a/src/Oro/Bundle/EmailBundle/Controller/EmailController.php b/src/Oro/Bundle/EmailBundle/Controller/EmailController.php index 4486648bdd5..43c36e57920 100644 --- a/src/Oro/Bundle/EmailBundle/Controller/EmailController.php +++ b/src/Oro/Bundle/EmailBundle/Controller/EmailController.php @@ -4,23 +4,23 @@ use Doctrine\ORM\Query; use Doctrine\ORM\QueryBuilder; -use Oro\Bundle\EmailBundle\Decoder\ContentDecoder; -use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; - -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; - use Oro\Bundle\EmailBundle\Cache\EmailCacheManager; -use Oro\Bundle\EmailBundle\Entity\Repository\EmailRepository; +use Oro\Bundle\EmailBundle\Decoder\ContentDecoder; use Oro\Bundle\EmailBundle\Entity\Email; -use Oro\Bundle\EmailBundle\Entity\EmailBody; use Oro\Bundle\EmailBundle\Entity\EmailAttachment; +use Oro\Bundle\EmailBundle\Entity\EmailBody; + +use Oro\Bundle\EmailBundle\Entity\Repository\EmailRepository; +use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; + use Oro\Bundle\EmailBundle\Form\Model\Email as EmailModel; use Oro\Bundle\SecurityBundle\Annotation\Acl; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; class EmailController extends Controller { diff --git a/src/Oro/Bundle/EmailBundle/Controller/EmailTemplateController.php b/src/Oro/Bundle/EmailBundle/Controller/EmailTemplateController.php index 5c8b58c1eb6..562068e5217 100644 --- a/src/Oro/Bundle/EmailBundle/Controller/EmailTemplateController.php +++ b/src/Oro/Bundle/EmailBundle/Controller/EmailTemplateController.php @@ -3,16 +3,16 @@ namespace Oro\Bundle\EmailBundle\Controller; use Doctrine\ORM\EntityManager; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\Form\FormInterface; - -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Oro\Bundle\EmailBundle\Datagrid\EmailTemplateDatagridManager; +use Oro\Bundle\EmailBundle\Entity\EmailTemplate; use Oro\Bundle\SecurityBundle\Annotation\Acl; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; -use Oro\Bundle\EmailBundle\Entity\EmailTemplate; -use Oro\Bundle\EmailBundle\Datagrid\EmailTemplateDatagridManager; + +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\Form\FormInterface; /** * @Route("/emailtemplate") diff --git a/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/AbstractEmailFixture.php b/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/AbstractEmailFixture.php index 0631bcb6821..24b0b445503 100644 --- a/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/AbstractEmailFixture.php +++ b/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/AbstractEmailFixture.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\EmailBundle\DataFixtures\ORM; -use Symfony\Component\Finder\Finder; - -use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\DataFixtures\AbstractFixture; -use Doctrine\Common\DataFixtures\OrderedFixtureInterface; +use Doctrine\Common\DataFixtures\OrderedFixtureInterface; +use Doctrine\Common\Persistence\ObjectManager; use Oro\Bundle\EmailBundle\Entity\EmailTemplate; +use Symfony\Component\Finder\Finder; + abstract class AbstractEmailFixture extends AbstractFixture implements OrderedFixtureInterface { /** diff --git a/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/Email/LoadEmails.php b/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/Email/LoadEmails.php index 98c7da69030..539dca3b1b1 100644 --- a/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/Email/LoadEmails.php +++ b/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/Email/LoadEmails.php @@ -6,8 +6,8 @@ use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Common\Persistence\ObjectManager; -use OroEmail\Cache\OroEmailBundle\Entity\EmailAddressProxy; use Oro\Bundle\EmailBundle\Entity\Email; +use OroEmail\Cache\OroEmailBundle\Entity\EmailAddressProxy; class LoadEmails extends AbstractFixture implements OrderedFixtureInterface { diff --git a/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/LoadInternalEmailOrigins.php b/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/LoadInternalEmailOrigins.php index 98e3fbc5047..13365cee767 100644 --- a/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/LoadInternalEmailOrigins.php +++ b/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/LoadInternalEmailOrigins.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\DataFixtures\ORM; -use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\DataFixtures\AbstractFixture; -use Oro\Bundle\EmailBundle\Entity\InternalEmailOrigin; +use Doctrine\Common\Persistence\ObjectManager; use Oro\Bundle\EmailBundle\Entity\EmailFolder; +use Oro\Bundle\EmailBundle\Entity\InternalEmailOrigin; class LoadInternalEmailOrigins extends AbstractFixture { diff --git a/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php b/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php index ba642e5e141..781af5d8312 100644 --- a/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php +++ b/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\EmailBundle\Datagrid; use Doctrine\ORM\QueryBuilder; -use Symfony\Bridge\Doctrine\RegistryInterface; - use Oro\Bundle\ConfigBundle\Config\UserConfigManager; + use Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProviderStorage; +use Symfony\Bridge\Doctrine\RegistryInterface; class EmailQueryFactory { diff --git a/src/Oro/Bundle/EmailBundle/Datagrid/EmailTemplatesViewList.php b/src/Oro/Bundle/EmailBundle/Datagrid/EmailTemplatesViewList.php index e868a8fa005..2aea46267e9 100644 --- a/src/Oro/Bundle/EmailBundle/Datagrid/EmailTemplatesViewList.php +++ b/src/Oro/Bundle/EmailBundle/Datagrid/EmailTemplatesViewList.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\EmailBundle\Datagrid; -use Oro\Bundle\DataGridBundle\Extension\GridViews\View; use Oro\Bundle\DataGridBundle\Extension\GridViews\AbstractViewsList; +use Oro\Bundle\DataGridBundle\Extension\GridViews\View; class EmailTemplatesViewList extends AbstractViewsList { diff --git a/src/Oro/Bundle/EmailBundle/DependencyInjection/OroEmailExtension.php b/src/Oro/Bundle/EmailBundle/DependencyInjection/OroEmailExtension.php index bebeba09603..81e772b0217 100644 --- a/src/Oro/Bundle/EmailBundle/DependencyInjection/OroEmailExtension.php +++ b/src/Oro/Bundle/EmailBundle/DependencyInjection/OroEmailExtension.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\EmailBundle\DependencyInjection; use Symfony\Component\Config\FileLocator; -use Symfony\Component\DependencyInjection\Loader; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** diff --git a/src/Oro/Bundle/EmailBundle/Entity/Email.php b/src/Oro/Bundle/EmailBundle/Entity/Email.php index 86a8a75a91e..eac99d03645 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/Email.php +++ b/src/Oro/Bundle/EmailBundle/Entity/Email.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EmailBundle\Entity; -use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; -use Doctrine\ORM\Mapping as ORM; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; use Doctrine\Common\Collections\ArrayCollection; -use JMS\Serializer\Annotation\Type; +use Doctrine\ORM\Mapping as ORM; use JMS\Serializer\Annotation\Exclude; -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use JMS\Serializer\Annotation\Type; +use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailAddress.php b/src/Oro/Bundle/EmailBundle/Entity/EmailAddress.php index 8c7ba6ad2ff..aaa16c3c20a 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/EmailAddress.php +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailAddress.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\EmailBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use JMS\Serializer\Annotation\Type; use JMS\Serializer\Annotation\Exclude; +use JMS\Serializer\Annotation\Type; /** * Email Address diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailAttachment.php b/src/Oro/Bundle/EmailBundle/Entity/EmailAttachment.php index 11db7b89793..5d6377ae55f 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/EmailAttachment.php +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailAttachment.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Entity; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; use Doctrine\ORM\Mapping as ORM; -use JMS\Serializer\Annotation\Type; use JMS\Serializer\Annotation\Exclude; -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use JMS\Serializer\Annotation\Type; /** * Email Attachment diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailAttachmentContent.php b/src/Oro/Bundle/EmailBundle/Entity/EmailAttachmentContent.php index a3ab42eb4cd..d5479cc7362 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/EmailAttachmentContent.php +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailAttachmentContent.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Entity; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; use Doctrine\ORM\Mapping as ORM; -use JMS\Serializer\Annotation\Type; use JMS\Serializer\Annotation\Exclude; -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use JMS\Serializer\Annotation\Type; /** * Email Attachment diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailBody.php b/src/Oro/Bundle/EmailBundle/Entity/EmailBody.php index 75f9139323b..59b45ed8db1 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/EmailBody.php +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailBody.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EmailBundle\Entity; -use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; -use Doctrine\ORM\Mapping as ORM; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; use Doctrine\Common\Collections\ArrayCollection; -use JMS\Serializer\Annotation\Type; +use Doctrine\ORM\Mapping as ORM; use JMS\Serializer\Annotation\Exclude; -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use JMS\Serializer\Annotation\Type; +use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; /** * Email Body diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailFolder.php b/src/Oro/Bundle/EmailBundle/Entity/EmailFolder.php index f5e014a9611..59cdeab4e60 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/EmailFolder.php +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailFolder.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EmailBundle\Entity; -use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; -use Doctrine\ORM\Mapping as ORM; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; use Doctrine\Common\Collections\ArrayCollection; -use JMS\Serializer\Annotation\Type; +use Doctrine\ORM\Mapping as ORM; use JMS\Serializer\Annotation\Exclude; -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use JMS\Serializer\Annotation\Type; +use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; /** * Email Folder diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailOrigin.php b/src/Oro/Bundle/EmailBundle/Entity/EmailOrigin.php index 00eea549c89..e59514724c6 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/EmailOrigin.php +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailOrigin.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Entity; -use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; -use JMS\Serializer\Annotation\Type; +use Doctrine\ORM\Mapping as ORM; use JMS\Serializer\Annotation\Exclude; +use JMS\Serializer\Annotation\Type; /** * Email Origin diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailRecipient.php b/src/Oro/Bundle/EmailBundle/Entity/EmailRecipient.php index e559c655afd..99f59931d5d 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/EmailRecipient.php +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailRecipient.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Entity; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; use Doctrine\ORM\Mapping as ORM; -use JMS\Serializer\Annotation\Type; use JMS\Serializer\Annotation\Exclude; -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use JMS\Serializer\Annotation\Type; /** * Email Recipient diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailTemplate.php b/src/Oro/Bundle/EmailBundle/Entity/EmailTemplate.php index f241e17fd9d..ae221cdc2d2 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/EmailTemplate.php +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailTemplate.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\EmailBundle\Entity; -use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Mapping as ORM; use Gedmo\Mapping\Annotation as Gedmo; use Gedmo\Translatable\Translatable; -use Symfony\Component\Validator\Constraints as Assert; +use Oro\Bundle\EmailBundle\Model\EmailTemplateInterface; use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; -use Oro\Bundle\EmailBundle\Model\EmailTemplateInterface; +use Symfony\Component\Validator\Constraints as Assert; /** * EmailTemplate diff --git a/src/Oro/Bundle/EmailBundle/Entity/InternalEmailOrigin.php b/src/Oro/Bundle/EmailBundle/Entity/InternalEmailOrigin.php index 4ac106c3dbd..495c9660d06 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/InternalEmailOrigin.php +++ b/src/Oro/Bundle/EmailBundle/Entity/InternalEmailOrigin.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\EmailBundle\Entity; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; use Doctrine\ORM\Mapping as ORM; use JMS\Serializer\Annotation\Type; -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; /** * An Email Origin which cam be used for emails sent by BAP diff --git a/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailAddressManager.php b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailAddressManager.php index 82162bb047a..56af8183f8e 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailAddressManager.php +++ b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailAddressManager.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\EmailBundle\Entity\Manager; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\UnitOfWork; use Doctrine\ORM\EntityRepository; +use Doctrine\ORM\UnitOfWork; use Oro\Bundle\EmailBundle\Entity\EmailAddress; class EmailAddressManager diff --git a/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailApiEntityManager.php b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailApiEntityManager.php index d40320fb753..9231e61d98a 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailApiEntityManager.php +++ b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailApiEntityManager.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Entity\Manager; -use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\Persistence\ObjectRepository; use Oro\Bundle\EmailBundle\Entity\EmailAttachment; +use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; class EmailApiEntityManager extends ApiEntityManager { diff --git a/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailOwnerManager.php b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailOwnerManager.php index 1ba6dd5cc77..d3454a12b62 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailOwnerManager.php +++ b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailOwnerManager.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\EmailBundle\Entity\Manager; +use Doctrine\Common\Util\ClassUtils; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\UnitOfWork; use Doctrine\ORM\Event\OnFlushEventArgs; -use Doctrine\Common\Util\ClassUtils; +use Doctrine\ORM\UnitOfWork; use Oro\Bundle\EmailBundle\Entity\EmailAddress; -use Oro\Bundle\EmailBundle\Entity\EmailOwnerInterface; use Oro\Bundle\EmailBundle\Entity\EmailInterface; +use Oro\Bundle\EmailBundle\Entity\EmailOwnerInterface; use Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProviderStorage; /** diff --git a/src/Oro/Bundle/EmailBundle/EventListener/ConfigSubscriber.php b/src/Oro/Bundle/EmailBundle/EventListener/ConfigSubscriber.php index 51cd33ddf23..bfd6ec11b99 100644 --- a/src/Oro/Bundle/EmailBundle/EventListener/ConfigSubscriber.php +++ b/src/Oro/Bundle/EmailBundle/EventListener/ConfigSubscriber.php @@ -4,12 +4,12 @@ use Doctrine\Common\Cache\Cache; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; - use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; -use Oro\Bundle\EntityConfigBundle\Event\NewEntityConfigModelEvent; + use Oro\Bundle\EntityConfigBundle\Event\Events; +use Oro\Bundle\EntityConfigBundle\Event\NewEntityConfigModelEvent; use Oro\Bundle\EntityConfigBundle\Event\PersistConfigEvent; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; class ConfigSubscriber implements EventSubscriberInterface { diff --git a/src/Oro/Bundle/EmailBundle/EventListener/EntitySubscriber.php b/src/Oro/Bundle/EmailBundle/EventListener/EntitySubscriber.php index 1f23a337fbf..2c827bf0c70 100644 --- a/src/Oro/Bundle/EmailBundle/EventListener/EntitySubscriber.php +++ b/src/Oro/Bundle/EmailBundle/EventListener/EntitySubscriber.php @@ -3,9 +3,9 @@ namespace Oro\Bundle\EmailBundle\EventListener; use Doctrine\Common\EventSubscriber; -use Doctrine\ORM\Events; use Doctrine\ORM\Event\LoadClassMetadataEventArgs; use Doctrine\ORM\Event\OnFlushEventArgs; +use Doctrine\ORM\Events; use Oro\Bundle\EmailBundle\Entity\Manager\EmailOwnerManager; class EntitySubscriber implements EventSubscriber diff --git a/src/Oro/Bundle/EmailBundle/Form/DataTransformer/EmailAddressTransformer.php b/src/Oro/Bundle/EmailBundle/Form/DataTransformer/EmailAddressTransformer.php index 6242af90733..40b3134032f 100644 --- a/src/Oro/Bundle/EmailBundle/Form/DataTransformer/EmailAddressTransformer.php +++ b/src/Oro/Bundle/EmailBundle/Form/DataTransformer/EmailAddressTransformer.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\EmailBundle\Form\DataTransformer; -use Symfony\Component\Form\DataTransformerInterface; use Doctrine\Common\Collections\Collection; +use Symfony\Component\Form\DataTransformerInterface; class EmailAddressTransformer implements DataTransformerInterface { diff --git a/src/Oro/Bundle/EmailBundle/Form/EventListener/BuildTemplateFormSubscriber.php b/src/Oro/Bundle/EmailBundle/Form/EventListener/BuildTemplateFormSubscriber.php index e6879ae3180..87ad49b47c1 100644 --- a/src/Oro/Bundle/EmailBundle/Form/EventListener/BuildTemplateFormSubscriber.php +++ b/src/Oro/Bundle/EmailBundle/Form/EventListener/BuildTemplateFormSubscriber.php @@ -3,13 +3,13 @@ use Doctrine\ORM\EntityManager; +use Oro\Bundle\EmailBundle\Entity\Repository\EmailTemplateRepository; +use Oro\Bundle\NotificationBundle\Event\Handler\EmailNotificationHandler; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormEvent; + use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormFactoryInterface; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; - -use Oro\Bundle\EmailBundle\Entity\Repository\EmailTemplateRepository; -use Oro\Bundle\NotificationBundle\Event\Handler\EmailNotificationHandler; class BuildTemplateFormSubscriber implements EventSubscriberInterface { diff --git a/src/Oro/Bundle/EmailBundle/Form/Handler/EmailHandler.php b/src/Oro/Bundle/EmailBundle/Form/Handler/EmailHandler.php index 0ac4772ce14..995727dff0a 100644 --- a/src/Oro/Bundle/EmailBundle/Form/Handler/EmailHandler.php +++ b/src/Oro/Bundle/EmailBundle/Form/Handler/EmailHandler.php @@ -2,26 +2,26 @@ namespace Oro\Bundle\EmailBundle\Form\Handler; -use Psr\Log\LoggerInterface; - -use Symfony\Component\Form\FormError; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Translation\Translator; -use Symfony\Component\Security\Core\SecurityContextInterface; -use Symfony\Component\Security\Core\User\UserInterface; - use Doctrine\ORM\EntityManager; -use Oro\Bundle\EmailBundle\Form\Model\Email; use Oro\Bundle\EmailBundle\Builder\EmailEntityBuilder; -use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; use Oro\Bundle\EmailBundle\Entity\EmailFolder; use Oro\Bundle\EmailBundle\Entity\InternalEmailOrigin; use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; +use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; +use Oro\Bundle\EmailBundle\Form\Model\Email; use Oro\Bundle\LocaleBundle\Formatter\NameFormatter; +use Psr\Log\LoggerInterface; +use Symfony\Component\Form\FormError; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Security\Core\SecurityContextInterface; +use Symfony\Component\Security\Core\User\UserInterface; + +use Symfony\Component\Translation\Translator; + class EmailHandler { /** diff --git a/src/Oro/Bundle/EmailBundle/Form/Handler/EmailTemplateHandler.php b/src/Oro/Bundle/EmailBundle/Form/Handler/EmailTemplateHandler.php index 40ffc49385e..fe86d1a4707 100644 --- a/src/Oro/Bundle/EmailBundle/Form/Handler/EmailTemplateHandler.php +++ b/src/Oro/Bundle/EmailBundle/Form/Handler/EmailTemplateHandler.php @@ -4,12 +4,12 @@ use Doctrine\Common\Persistence\ObjectManager; +use Oro\Bundle\EmailBundle\Entity\EmailTemplate; use Symfony\Component\Form\FormError; use Symfony\Component\Form\FormInterface; -use Symfony\Component\Translation\Translator; use Symfony\Component\HttpFoundation\Request; -use Oro\Bundle\EmailBundle\Entity\EmailTemplate; +use Symfony\Component\Translation\Translator; class EmailTemplateHandler { diff --git a/src/Oro/Bundle/EmailBundle/Form/Type/EmailAddressType.php b/src/Oro/Bundle/EmailBundle/Form/Type/EmailAddressType.php index ac7bbf7f96e..267563e2837 100644 --- a/src/Oro/Bundle/EmailBundle/Form/Type/EmailAddressType.php +++ b/src/Oro/Bundle/EmailBundle/Form/Type/EmailAddressType.php @@ -2,10 +2,11 @@ namespace Oro\Bundle\EmailBundle\Form\Type; +use Oro\Bundle\EmailBundle\Form\DataTransformer\EmailAddressTransformer; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\EmailBundle\Form\DataTransformer\EmailAddressTransformer; +use Symfony\Component\OptionsResolver\OptionsResolver; class EmailAddressType extends AbstractType { @@ -22,7 +23,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -34,7 +35,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_email_email_address'; } @@ -44,6 +45,6 @@ public function getName() */ public function getParent() { - return 'text'; + return TextType::class; } } diff --git a/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateApiType.php b/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateApiType.php index 2e7c00349a8..1992672a418 100644 --- a/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateApiType.php +++ b/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateApiType.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Form\Type; +use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; class EmailTemplateApiType extends EmailTemplateType { diff --git a/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateSelectType.php b/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateSelectType.php index e66e79d1e20..da8b804642c 100644 --- a/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateSelectType.php +++ b/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateSelectType.php @@ -6,14 +6,14 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\Options; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class EmailTemplateSelectType extends AbstractType { /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $choices = function (Options $options) { if (empty($options['selectedEntity'])) { @@ -52,7 +52,7 @@ public function finishView(FormView $view, FormInterface $form, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_email_template_list'; } diff --git a/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateTranslationType.php b/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateTranslationType.php index 5b7330aca4c..85d2148ffc7 100644 --- a/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateTranslationType.php +++ b/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateTranslationType.php @@ -3,14 +3,14 @@ namespace Oro\Bundle\EmailBundle\Form\Type; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class EmailTemplateTranslationType extends AbstractType { /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -30,7 +30,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_email_emailtemplate_translatation'; } diff --git a/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateType.php b/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateType.php index 1817d899f36..55c7692dace 100644 --- a/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateType.php +++ b/src/Oro/Bundle/EmailBundle/Form/Type/EmailTemplateType.php @@ -2,12 +2,15 @@ namespace Oro\Bundle\EmailBundle\Form\Type; +use Oro\Bundle\EmailBundle\Entity\EmailTemplate; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\EmailBundle\Entity\EmailTemplate; +use Symfony\Component\OptionsResolver\OptionsResolver; class EmailTemplateType extends AbstractType { @@ -36,7 +39,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( 'entityName', - 'choice', + ChoiceType::class, array( 'choices' => $this->entityNameChoices, 'multiple' => false, @@ -49,7 +52,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->add( 'name', - 'text', + TextType::class, array( 'required' => true ) @@ -57,7 +60,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->add( 'type', - 'choice', + ChoiceType::class, array( 'multiple' => false, 'expanded' => true, @@ -79,7 +82,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->add( 'parentTemplate', - 'hidden', + HiddenType::class, array( 'property_path' => 'parent' ) @@ -121,7 +124,7 @@ function (FormEvent $event) use ($factory, $setDisabled) { /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -136,7 +139,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_email_emailtemplate'; } diff --git a/src/Oro/Bundle/EmailBundle/Form/Type/EmailType.php b/src/Oro/Bundle/EmailBundle/Form/Type/EmailType.php index 67b206236ce..4fc99ff71ee 100644 --- a/src/Oro/Bundle/EmailBundle/Form/Type/EmailType.php +++ b/src/Oro/Bundle/EmailBundle/Form/Type/EmailType.php @@ -3,8 +3,11 @@ namespace Oro\Bundle\EmailBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class EmailType extends AbstractType { @@ -14,17 +17,17 @@ class EmailType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('gridName', 'hidden', array('required' => false)) + ->add('gridName', HiddenType::class, array('required' => false)) ->add('from', 'oro_email_email_address', array('required' => true)) ->add('to', 'oro_email_email_address', array('required' => true, 'multiple' => true)) - ->add('subject', 'text', array('required' => true)) - ->add('body', 'textarea', array('required' => false)); + ->add('subject', TextType::class, array('required' => true)) + ->add('body', TextareaType::class, array('required' => false)); } /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -39,7 +42,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_email_email'; } diff --git a/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php b/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php index 78d595c61cd..3217548af2e 100644 --- a/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php +++ b/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\EmailBundle\Mailer; +use Oro\Bundle\EmailBundle\Exception\NotSupportedException; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\IntrospectableContainerInterface; -use Oro\Bundle\EmailBundle\Exception\NotSupportedException; /** * The goal of this class is to send an email directly, not using a mail spool diff --git a/src/Oro/Bundle/EmailBundle/OroEmailBundle.php b/src/Oro/Bundle/EmailBundle/OroEmailBundle.php index 964597cdac2..94dcbc37fa2 100644 --- a/src/Oro/Bundle/EmailBundle/OroEmailBundle.php +++ b/src/Oro/Bundle/EmailBundle/OroEmailBundle.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\EmailBundle; -use Symfony\Component\DependencyInjection\Definition; -use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\HttpKernel\Bundle\Bundle; +use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass; +use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\EmailBodyLoaderPass; +use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\EmailOwnerConfigurationPass; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\Filesystem\Filesystem; +use Symfony\Component\DependencyInjection\Definition; -use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass; +use Symfony\Component\DependencyInjection\Reference; -use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\EmailOwnerConfigurationPass; -use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\EmailBodyLoaderPass; +use Symfony\Component\Filesystem\Filesystem; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroEmailBundle extends Bundle { diff --git a/src/Oro/Bundle/EmailBundle/Provider/EmailBodyLoaderInterface.php b/src/Oro/Bundle/EmailBundle/Provider/EmailBodyLoaderInterface.php index 3e0f39ec620..401f6fd4928 100644 --- a/src/Oro/Bundle/EmailBundle/Provider/EmailBodyLoaderInterface.php +++ b/src/Oro/Bundle/EmailBundle/Provider/EmailBodyLoaderInterface.php @@ -3,9 +3,9 @@ namespace Oro\Bundle\EmailBundle\Provider; use Doctrine\ORM\EntityManager; -use Oro\Bundle\EmailBundle\Entity\EmailOrigin; use Oro\Bundle\EmailBundle\Entity\Email; use Oro\Bundle\EmailBundle\Entity\EmailBody; +use Oro\Bundle\EmailBundle\Entity\EmailOrigin; interface EmailBodyLoaderInterface { diff --git a/src/Oro/Bundle/EmailBundle/Provider/EmailRenderer.php b/src/Oro/Bundle/EmailBundle/Provider/EmailRenderer.php index bc23cb0071a..cbd70410498 100644 --- a/src/Oro/Bundle/EmailBundle/Provider/EmailRenderer.php +++ b/src/Oro/Bundle/EmailBundle/Provider/EmailRenderer.php @@ -4,14 +4,14 @@ use Doctrine\Common\Cache\Cache; -use Symfony\Component\Security\Core\SecurityContextInterface; - use Oro\Bundle\EmailBundle\Entity\EmailTemplate; -use Oro\Bundle\UserBundle\Entity\User; +use Oro\Bundle\EmailBundle\Model\EmailTemplateInterface; use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; + use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; -use Oro\Bundle\EmailBundle\Model\EmailTemplateInterface; +use Oro\Bundle\UserBundle\Entity\User; +use Symfony\Component\Security\Core\SecurityContextInterface; class EmailRenderer extends \Twig_Environment { diff --git a/src/Oro/Bundle/EmailBundle/Provider/VariablesProvider.php b/src/Oro/Bundle/EmailBundle/Provider/VariablesProvider.php index 9a687bda7b6..08c9a0a3276 100644 --- a/src/Oro/Bundle/EmailBundle/Provider/VariablesProvider.php +++ b/src/Oro/Bundle/EmailBundle/Provider/VariablesProvider.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EmailBundle\Provider; -use Symfony\Component\Security\Core\SecurityContextInterface; -use Symfony\Component\Security\Core\User\UserInterface; - use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; +use Symfony\Component\Security\Core\SecurityContextInterface; +use Symfony\Component\Security\Core\User\UserInterface; + class VariablesProvider { /** @var ConfigProvider */ diff --git a/src/Oro/Bundle/EmailBundle/Resources/cache/Entity/EmailAddress.php.twig b/src/Oro/Bundle/EmailBundle/Resources/cache/Entity/EmailAddress.php.twig index a8812cd1b40..b9f8def57e0 100644 --- a/src/Oro/Bundle/EmailBundle/Resources/cache/Entity/EmailAddress.php.twig +++ b/src/Oro/Bundle/EmailBundle/Resources/cache/Entity/EmailAddress.php.twig @@ -2,12 +2,12 @@ namespace {{ namespace }}; -use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; use Doctrine\ORM\Mapping as ORM; -use JMS\Serializer\Annotation\Type; use JMS\Serializer\Annotation\Exclude; +use JMS\Serializer\Annotation\Type; use Oro\Bundle\EmailBundle\Entity\EmailAddress; use Oro\Bundle\EmailBundle\Entity\EmailOwnerInterface; +use Oro\Bundle\EmailBundle\Entity\Util\EmailUtil; /** * @ORM\Entity diff --git a/src/Oro/Bundle/EmailBundle/Sync/AbstractEmailSynchronizationProcessor.php b/src/Oro/Bundle/EmailBundle/Sync/AbstractEmailSynchronizationProcessor.php index 75b3150e2e8..07b7a653034 100644 --- a/src/Oro/Bundle/EmailBundle/Sync/AbstractEmailSynchronizationProcessor.php +++ b/src/Oro/Bundle/EmailBundle/Sync/AbstractEmailSynchronizationProcessor.php @@ -3,11 +3,11 @@ namespace Oro\Bundle\EmailBundle\Sync; use Doctrine\ORM\EntityManager; -use Psr\Log\LoggerInterface; use Oro\Bundle\EmailBundle\Builder\EmailEntityBuilder; +use Oro\Bundle\EmailBundle\Entity\EmailAddress; use Oro\Bundle\EmailBundle\Entity\EmailOrigin; use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; -use Oro\Bundle\EmailBundle\Entity\EmailAddress; +use Psr\Log\LoggerInterface; abstract class AbstractEmailSynchronizationProcessor { diff --git a/src/Oro/Bundle/EmailBundle/Tests/Functional/ControllersTest.php b/src/Oro/Bundle/EmailBundle/Tests/Functional/ControllersTest.php index 5371e4747c3..27360c52cd0 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Functional/ControllersTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Functional/ControllersTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\EmailBundle\Tests\Functional; -use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; -use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; use Oro\Bundle\TestFrameworkBundle\Test\Client; +use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; +use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; /** * @outputBuffering enabled diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBatchProcessorTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBatchProcessorTest.php index ee5059754c2..7b88165e24c 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBatchProcessorTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBatchProcessorTest.php @@ -3,11 +3,11 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\Builder; use Oro\Bundle\EmailBundle\Builder\EmailEntityBatchProcessor; -use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; use Oro\Bundle\EmailBundle\Entity\Email; use Oro\Bundle\EmailBundle\Entity\EmailFolder; use Oro\Bundle\EmailBundle\Entity\EmailOrigin; use Oro\Bundle\EmailBundle\Entity\EmailRecipient; +use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; use Oro\Bundle\EmailBundle\Tests\Unit\ReflectionUtil; class EmailEntityBatchProcessorTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBuilderTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBuilderTest.php index d087269c115..f8f8b4a4fe0 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBuilderTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBuilderTest.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\Builder; use Oro\Bundle\EmailBundle\Builder\EmailEntityBuilder; -use Oro\Bundle\EmailBundle\Entity\EmailOrigin; -use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; use Oro\Bundle\EmailBundle\Entity\Email; +use Oro\Bundle\EmailBundle\Entity\EmailOrigin; use Oro\Bundle\EmailBundle\Entity\EmailRecipient; +use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; class EmailEntityBuilderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Entity/Manager/EmailOwnerManagerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Entity/Manager/EmailOwnerManagerTest.php index a1edee3a3e2..31029a03c87 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Entity/Manager/EmailOwnerManagerTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Entity/Manager/EmailOwnerManagerTest.php @@ -4,8 +4,8 @@ use Oro\Bundle\EmailBundle\Entity\EmailInterface; use Oro\Bundle\EmailBundle\Entity\EmailOwnerInterface; -use Oro\Bundle\EmailBundle\Entity\Manager\EmailOwnerManager; use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; +use Oro\Bundle\EmailBundle\Entity\Manager\EmailOwnerManager; use Oro\Bundle\EmailBundle\Tests\Unit\ReflectionUtil; class EmailOwnerManagerTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ConfigureSubscriberTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ConfigureSubscriberTest.php index 70ac3d5f2bc..6d6d72c6996 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ConfigureSubscriberTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ConfigureSubscriberTest.php @@ -4,9 +4,9 @@ use Doctrine\Common\Collections\ArrayCollection; +use Oro\Bundle\EmailBundle\EventListener\ConfigSubscriber; use Oro\Bundle\EntityConfigBundle\Event\NewEntityConfigModelEvent; use Oro\Bundle\EntityConfigBundle\Event\NewEntityEvent; -use Oro\Bundle\EmailBundle\EventListener\ConfigSubscriber; use Oro\Bundle\EntityConfigBundle\Event\PersistConfigEvent; class ConfigureSubscriberTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/EntitySubscriberTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/EntitySubscriberTest.php index df44628cdc8..0cc6d8eede8 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/EntitySubscriberTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/EntitySubscriberTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener; -use Oro\Bundle\EmailBundle\EventListener\EntitySubscriber; use Doctrine\ORM\Events; +use Oro\Bundle\EmailBundle\EventListener\EntitySubscriber; class EntitySubscriberTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/EventListener/BuildTemplateFormSubscriberTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/EventListener/BuildTemplateFormSubscriberTest.php index 03fd134f48d..5dffcfd4919 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/EventListener/BuildTemplateFormSubscriberTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/EventListener/BuildTemplateFormSubscriberTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\Form\EventListener; -use Symfony\Component\Form\FormEvents; - use Oro\Bundle\EmailBundle\Form\EventListener\BuildTemplateFormSubscriber; +use Symfony\Component\Form\FormEvents; + class BuildTemplateFormSubscriberTest extends \PHPUnit_Framework_TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject */ diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Handler/EmailHandlerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Handler/EmailHandlerTest.php index 9373a12fb3c..6dfa26ee88b 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Handler/EmailHandlerTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Handler/EmailHandlerTest.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\Form\Handler; +use Oro\Bundle\EmailBundle\Entity\Email as EmailEntity; use Oro\Bundle\EmailBundle\Entity\EmailBody; use Oro\Bundle\EmailBundle\Entity\EmailFolder; use Oro\Bundle\EmailBundle\Entity\InternalEmailOrigin; -use Oro\Bundle\EmailBundle\Entity\Email as EmailEntity; +use Oro\Bundle\EmailBundle\Form\Handler\EmailHandler; +use Oro\Bundle\EmailBundle\Form\Model\Email; use Oro\Bundle\EmailBundle\Tests\Unit\Entity\TestFixtures\EmailAddress; use Oro\Bundle\EmailBundle\Tests\Unit\Fixtures\Entity\TestUser; use Symfony\Component\HttpFoundation\Request; -use Oro\Bundle\EmailBundle\Form\Handler\EmailHandler; -use Oro\Bundle\EmailBundle\Form\Model\Email; class EmailHandlerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Handler/EmailTemplateHandlerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Handler/EmailTemplateHandlerTest.php index 14a106537ef..38890c2346e 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Handler/EmailTemplateHandlerTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Handler/EmailTemplateHandlerTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\Form\Handler; -use Symfony\Component\HttpFoundation\Request; - use Oro\Bundle\EmailBundle\Entity\EmailTemplate; + use Oro\Bundle\EmailBundle\Form\Handler\EmailTemplateHandler; +use Symfony\Component\HttpFoundation\Request; class EmailTemplateHandlerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailAddressTypeTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailAddressTypeTest.php index fe2402f3628..27f216cf802 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailAddressTypeTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailAddressTypeTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\Test\TypeTestCase; use Oro\Bundle\EmailBundle\Form\Type\EmailAddressType; +use Symfony\Component\Form\Test\TypeTestCase; class EmailAddressTypeTest extends TypeTestCase { diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTemplateSelectTypeTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTemplateSelectTypeTest.php index e82366511c4..f112a7af302 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTemplateSelectTypeTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTemplateSelectTypeTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\FormView; - use Oro\Bundle\EmailBundle\Form\Type\EmailTemplateSelectType; +use Symfony\Component\Form\FormView; + class EmailTemplateSelectTypeTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php index ad854f0c211..19cdf78aca5 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\Test\TypeTestCase; -use Symfony\Component\Form\PreloadedExtension; -use Oro\Bundle\EmailBundle\Form\Type\EmailType; use Oro\Bundle\EmailBundle\Form\Model\Email; use Oro\Bundle\EmailBundle\Form\Type\EmailAddressType; +use Oro\Bundle\EmailBundle\Form\Type\EmailType; +use Symfony\Component\Form\PreloadedExtension; +use Symfony\Component\Form\Test\TypeTestCase; class EmailTypeTest extends TypeTestCase { diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/VariableProviderTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/VariableProviderTest.php index 91af18766d7..cf4234f789a 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/VariableProviderTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/VariableProviderTest.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\Provider; use Doctrine\Common\Collections\ArrayCollection; -use Symfony\Component\Security\Core\SecurityContextInterface; - use Oro\Bundle\EmailBundle\Provider\VariablesProvider; +use Symfony\Component\Security\Core\SecurityContextInterface; + class VariableProviderTest extends \PHPUnit_Framework_TestCase { const TEST_ENTITY_NAME = 'someEntity'; diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Sync/Fixtures/TestEmailSynchronizer.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Sync/Fixtures/TestEmailSynchronizer.php index 9e032f9cf2c..2fb3db8aae4 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Sync/Fixtures/TestEmailSynchronizer.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Sync/Fixtures/TestEmailSynchronizer.php @@ -6,8 +6,8 @@ use Oro\Bundle\EmailBundle\Builder\EmailEntityBuilder; use Oro\Bundle\EmailBundle\Entity\EmailOrigin; use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; -use Oro\Bundle\EmailBundle\Sync\AbstractEmailSynchronizer; use Oro\Bundle\EmailBundle\Sync\AbstractEmailSynchronizationProcessor; +use Oro\Bundle\EmailBundle\Sync\AbstractEmailSynchronizer; class TestEmailSynchronizer extends AbstractEmailSynchronizer { diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Validators/Constraints/VariableConstraintTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Validators/Constraints/VariableConstraintTest.php index 74db14bff90..d3b5d3720e8 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Validators/Constraints/VariableConstraintTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Validators/Constraints/VariableConstraintTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EmailBundle\Tests\Unit\Validator\Constraints; -use Symfony\Component\Validator\Constraint; - use Oro\Bundle\EmailBundle\Validator\Constraints\VariablesConstraint; +use Symfony\Component\Validator\Constraint; + class VariableConstraintTest extends \PHPUnit_Framework_TestCase { /** @var VariablesConstraint */ diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Validators/VariablesValidatorTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Validators/VariablesValidatorTest.php index b00bc2082ed..0346b6166df 100644 --- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Validators/VariablesValidatorTest.php +++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Validators/VariablesValidatorTest.php @@ -4,8 +4,8 @@ use Oro\Bundle\EmailBundle\Entity\EmailTemplate; use Oro\Bundle\EmailBundle\Entity\EmailTemplateTranslation; -use Oro\Bundle\EmailBundle\Validator\VariablesValidator; use Oro\Bundle\EmailBundle\Validator\Constraints\VariablesConstraint; +use Oro\Bundle\EmailBundle\Validator\VariablesValidator; class VariablesValidatorTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/EmailBundle/Validator/VariablesValidator.php b/src/Oro/Bundle/EmailBundle/Validator/VariablesValidator.php index 18369c6907b..733e324e656 100644 --- a/src/Oro/Bundle/EmailBundle/Validator/VariablesValidator.php +++ b/src/Oro/Bundle/EmailBundle/Validator/VariablesValidator.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\EmailBundle\Validator; -use Symfony\Component\Validator\Constraint; -use Symfony\Component\Validator\ConstraintValidator; -use Symfony\Component\Security\Core\User\UserInterface; -use Symfony\Component\Security\Core\SecurityContextInterface; - use Oro\Bundle\EmailBundle\Entity\EmailTemplate; use Oro\Bundle\EmailBundle\Validator\Constraints\VariablesConstraint; +use Symfony\Component\Security\Core\SecurityContextInterface; +use Symfony\Component\Security\Core\User\UserInterface; + +use Symfony\Component\Validator\Constraint; +use Symfony\Component\Validator\ConstraintValidator; class VariablesValidator extends ConstraintValidator { diff --git a/src/Oro/Bundle/EntityBundle/Controller/EntitiesController.php b/src/Oro/Bundle/EntityBundle/Controller/EntitiesController.php index 904a8242a17..b9c49dcd99c 100644 --- a/src/Oro/Bundle/EntityBundle/Controller/EntitiesController.php +++ b/src/Oro/Bundle/EntityBundle/Controller/EntitiesController.php @@ -5,26 +5,26 @@ use Doctrine\Common\Inflector\Inflector; use Doctrine\ORM\PersistentCollection; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Security\Core\Exception\AccessDeniedException; - use FOS\Rest\Util\Codes; - -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; - -use Oro\Bundle\EntityBundle\ORM\OroEntityManager; use Oro\Bundle\EntityBundle\Datagrid\CustomEntityDatagrid; - +use Oro\Bundle\EntityBundle\ORM\OroEntityManager; use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; + use Oro\Bundle\EntityConfigBundle\Metadata\EntityMetadata; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; use Oro\Bundle\SecurityBundle\SecurityFacade; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; + +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\JsonResponse; + +use Symfony\Component\HttpFoundation\Request; + +use Symfony\Component\Security\Core\Exception\AccessDeniedException; /** * Entities controller. diff --git a/src/Oro/Bundle/EntityBundle/DependencyInjection/OroEntityExtension.php b/src/Oro/Bundle/EntityBundle/DependencyInjection/OroEntityExtension.php index 93ec6664e95..bba1cc5511b 100644 --- a/src/Oro/Bundle/EntityBundle/DependencyInjection/OroEntityExtension.php +++ b/src/Oro/Bundle/EntityBundle/DependencyInjection/OroEntityExtension.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\EntityBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; +use Oro\Bundle\EntityBundle\Exception\RuntimeException; use Symfony\Component\Config\FileLocator; -use Symfony\Component\Filesystem\Filesystem; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\Filesystem\Filesystem; -use Oro\Bundle\EntityBundle\Exception\RuntimeException; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Oro/Bundle/EntityBundle/EventListener/CustomEntityGridListener.php b/src/Oro/Bundle/EntityBundle/EventListener/CustomEntityGridListener.php index 49c9c4fba19..2c2e97a1d8b 100644 --- a/src/Oro/Bundle/EntityBundle/EventListener/CustomEntityGridListener.php +++ b/src/Oro/Bundle/EntityBundle/EventListener/CustomEntityGridListener.php @@ -2,23 +2,23 @@ namespace Oro\Bundle\EntityBundle\EventListener; -use Symfony\Bundle\FrameworkBundle\Routing\Router; -use Symfony\Component\HttpFoundation\Request; - use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; use Oro\Bundle\DataGridBundle\Datasource\ResultRecord; + use Oro\Bundle\DataGridBundle\Event\BuildAfter; use Oro\Bundle\DataGridBundle\Event\BuildBefore; - use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; + use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; use Oro\Bundle\EntityConfigBundle\EventListener\AbstractConfigGridListener; use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; - use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; +use Symfony\Bundle\FrameworkBundle\Routing\Router; +use Symfony\Component\HttpFoundation\Request; + class CustomEntityGridListener extends AbstractConfigGridListener { const GRID_NAME = 'custom-entity-grid'; diff --git a/src/Oro/Bundle/EntityBundle/EventListener/EntityConfigSubscriber.php b/src/Oro/Bundle/EntityBundle/EventListener/EntityConfigSubscriber.php index e51d574f757..022e358bfea 100644 --- a/src/Oro/Bundle/EntityBundle/EventListener/EntityConfigSubscriber.php +++ b/src/Oro/Bundle/EntityBundle/EventListener/EntityConfigSubscriber.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EntityBundle\EventListener; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; - use Oro\Bundle\EntityConfigBundle\Event\Events; + use Oro\Bundle\EntityConfigBundle\Event\NewFieldConfigModelEvent; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; class EntityConfigSubscriber implements EventSubscriberInterface { diff --git a/src/Oro/Bundle/EntityBundle/Form/Handler/EntitySelectHandler.php b/src/Oro/Bundle/EntityBundle/Form/Handler/EntitySelectHandler.php index 6408da622b4..d2ef78ce88e 100644 --- a/src/Oro/Bundle/EntityBundle/Form/Handler/EntitySelectHandler.php +++ b/src/Oro/Bundle/EntityBundle/Form/Handler/EntitySelectHandler.php @@ -4,9 +4,6 @@ use Doctrine\ORM\QueryBuilder; -use Symfony\Component\DependencyInjection\Container; -use Symfony\Component\HttpFoundation\Request; - use Oro\Bundle\EntityBundle\Form\Type\EntitySelectType; use Oro\Bundle\EntityBundle\ORM\OroEntityManager; @@ -14,9 +11,12 @@ use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; use Oro\Bundle\FormBundle\Autocomplete\SearchHandlerInterface; - use Oro\Bundle\SearchBundle\Engine\Indexer; +use Symfony\Component\DependencyInjection\Container; + +use Symfony\Component\HttpFoundation\Request; + class EntitySelectHandler implements SearchHandlerInterface { /** diff --git a/src/Oro/Bundle/EntityBundle/Form/Type/CustomEntityType.php b/src/Oro/Bundle/EntityBundle/Form/Type/CustomEntityType.php index 9231cac8d5e..0aebc67f578 100644 --- a/src/Oro/Bundle/EntityBundle/Form/Type/CustomEntityType.php +++ b/src/Oro/Bundle/EntityBundle/Form/Type/CustomEntityType.php @@ -4,23 +4,23 @@ use Doctrine\Common\Inflector\Inflector; +use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; +use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; +use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; + use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; + use Symfony\Component\PropertyAccess\PropertyAccess; + use Symfony\Component\PropertyAccess\PropertyAccessor; use Symfony\Component\Routing\Router; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; - -use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; -use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; - -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; - -use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; -use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; class CustomEntityType extends AbstractType { @@ -290,7 +290,7 @@ protected function getInitialElements($entities, $default, ConfigInterface $exte /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setRequired(['class_name']); } @@ -298,7 +298,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } diff --git a/src/Oro/Bundle/EntityBundle/Form/Type/EntitySelectType.php b/src/Oro/Bundle/EntityBundle/Form/Type/EntitySelectType.php index 8f7f14d78bc..883652fd747 100644 --- a/src/Oro/Bundle/EntityBundle/Form/Type/EntitySelectType.php +++ b/src/Oro/Bundle/EntityBundle/Form/Type/EntitySelectType.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EntityBundle\Form\Type; +use Oro\Bundle\EntityBundle\ORM\OroEntityManager; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; -use Oro\Bundle\EntityBundle\ORM\OroEntityManager; +use Symfony\Component\OptionsResolver\OptionsResolver; class EntitySelectType extends AbstractType { @@ -52,7 +52,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -74,7 +74,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } diff --git a/src/Oro/Bundle/EntityBundle/Grid/ExtendExtension.php b/src/Oro/Bundle/EntityBundle/Grid/ExtendExtension.php index 20043a020ed..d6f320fd01a 100644 --- a/src/Oro/Bundle/EntityBundle/Grid/ExtendExtension.php +++ b/src/Oro/Bundle/EntityBundle/Grid/ExtendExtension.php @@ -7,17 +7,17 @@ use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; -use Oro\Bundle\DataGridBundle\Extension\Formatter\Configuration as FormatterConfiguration; -use Oro\Bundle\DataGridBundle\Extension\Sorter\Configuration as OrmSorterConfiguration; use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; +use Oro\Bundle\DataGridBundle\Extension\Formatter\Configuration as FormatterConfiguration; use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface; +use Oro\Bundle\DataGridBundle\Extension\Sorter\Configuration as OrmSorterConfiguration; use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; +use Oro\Bundle\FilterBundle\Extension\Configuration as FilterConfiguration; use Oro\Bundle\FilterBundle\Extension\Orm\FilterInterface; use Oro\Bundle\FilterBundle\Form\Type\Filter\NumberFilterType; -use Oro\Bundle\FilterBundle\Extension\Configuration as FilterConfiguration; class ExtendExtension extends AbstractExtension { diff --git a/src/Oro/Bundle/EntityBundle/ORM/Query/FilterCollection.php b/src/Oro/Bundle/EntityBundle/ORM/Query/FilterCollection.php index 85663085c95..a1c1ee5ae76 100644 --- a/src/Oro/Bundle/EntityBundle/ORM/Query/FilterCollection.php +++ b/src/Oro/Bundle/EntityBundle/ORM/Query/FilterCollection.php @@ -4,8 +4,8 @@ use Doctrine\ORM\Configuration; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\Query\FilterCollection as BaseFilterCollection; use Doctrine\ORM\Query\Filter\SQLFilter; +use Doctrine\ORM\Query\FilterCollection as BaseFilterCollection; /** * Collection class for all the query filters. diff --git a/src/Oro/Bundle/EntityBundle/OroEntityBundle.php b/src/Oro/Bundle/EntityBundle/OroEntityBundle.php index 0b3372cecf9..bc5517d88cb 100644 --- a/src/Oro/Bundle/EntityBundle/OroEntityBundle.php +++ b/src/Oro/Bundle/EntityBundle/OroEntityBundle.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EntityBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; +use Oro\Bundle\EntityBundle\DependencyInjection\Compiler\DoctrineSqlFiltersConfigurationPass; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Oro\Bundle\EntityBundle\DependencyInjection\Compiler\DoctrineSqlFiltersConfigurationPass; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroEntityBundle extends Bundle { diff --git a/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/EntityClassResolverTest.php b/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/EntityClassResolverTest.php index 109e6e00f6c..2ce9234c6c4 100644 --- a/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/EntityClassResolverTest.php +++ b/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/EntityClassResolverTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\EntityBundle\Tests\Unit\ORM; -use Oro\Bundle\EntityBundle\ORM\EntityClassResolver; use Doctrine\ORM\ORMException; +use Oro\Bundle\EntityBundle\ORM\EntityClassResolver; class EntityClassResolverTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/EntityConfigBundle/Audit/AuditManager.php b/src/Oro/Bundle/EntityConfigBundle/Audit/AuditManager.php index eac0634549c..4caef678e27 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Audit/AuditManager.php +++ b/src/Oro/Bundle/EntityConfigBundle/Audit/AuditManager.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\EntityConfigBundle\Audit; -use Symfony\Component\Security\Core\SecurityContext; -use Symfony\Component\Security\Core\User\UserInterface; +use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; -use Oro\Bundle\EntityConfigBundle\Entity\ConfigLogDiff; use Oro\Bundle\EntityConfigBundle\Entity\ConfigLog; +use Oro\Bundle\EntityConfigBundle\Entity\ConfigLogDiff; -use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; -use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; +use Symfony\Component\Security\Core\SecurityContext; +use Symfony\Component\Security\Core\User\UserInterface; /** * Audit config data diff --git a/src/Oro/Bundle/EntityConfigBundle/Command/BaseCommand.php b/src/Oro/Bundle/EntityConfigBundle/Command/BaseCommand.php index 94be8a8a6f3..e8b1cd70a8c 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Command/BaseCommand.php +++ b/src/Oro/Bundle/EntityConfigBundle/Command/BaseCommand.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EntityConfigBundle\Command; -use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; - use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; + abstract class BaseCommand extends ContainerAwareCommand { /** diff --git a/src/Oro/Bundle/EntityConfigBundle/Config/ConfigManager.php b/src/Oro/Bundle/EntityConfigBundle/Config/ConfigManager.php index cd4571139ba..ac4603f6429 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Config/ConfigManager.php +++ b/src/Oro/Bundle/EntityConfigBundle/Config/ConfigManager.php @@ -8,32 +8,32 @@ use Metadata\MetadataFactory; -use Symfony\Component\EventDispatcher\EventDispatcher; - -use Oro\Bundle\EntityConfigBundle\Exception\LogicException; -use Oro\Bundle\EntityConfigBundle\Exception\RuntimeException; - use Oro\Bundle\EntityConfigBundle\Audit\AuditManager; -use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; -use Oro\Bundle\EntityConfigBundle\Metadata\EntityMetadata; -use Oro\Bundle\EntityConfigBundle\Metadata\FieldMetadata; +use Oro\Bundle\EntityConfigBundle\Config\Id\ConfigIdInterface; +use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProviderBag; +use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; +use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; -use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; -use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; use Oro\Bundle\EntityConfigBundle\Entity\AbstractConfigModel; +use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; -use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; -use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; -use Oro\Bundle\EntityConfigBundle\Config\Id\ConfigIdInterface; +use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; +use Oro\Bundle\EntityConfigBundle\Event\Events; use Oro\Bundle\EntityConfigBundle\Event\NewEntityConfigModelEvent; use Oro\Bundle\EntityConfigBundle\Event\NewFieldConfigModelEvent; use Oro\Bundle\EntityConfigBundle\Event\PersistConfigEvent; -use Oro\Bundle\EntityConfigBundle\Event\Events; + +use Oro\Bundle\EntityConfigBundle\Exception\LogicException; +use Oro\Bundle\EntityConfigBundle\Exception\RuntimeException; +use Oro\Bundle\EntityConfigBundle\Metadata\EntityMetadata; + +use Oro\Bundle\EntityConfigBundle\Metadata\FieldMetadata; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProviderBag; +use Symfony\Component\EventDispatcher\EventDispatcher; /** * @SuppressWarnings(PHPMD) diff --git a/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php b/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php index 6d78debb9d2..79b1035df5c 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php +++ b/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php @@ -8,11 +8,11 @@ use Oro\Bundle\EntityConfigBundle\Config\Id\ConfigIdInterface; use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; +use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; use Oro\Bundle\EntityConfigBundle\Entity\AbstractConfigModel; use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; -use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; -use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; +use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; use Oro\Bundle\EntityConfigBundle\Exception\RuntimeException; class ConfigModelManager diff --git a/src/Oro/Bundle/EntityConfigBundle/Controller/AuditController.php b/src/Oro/Bundle/EntityConfigBundle/Controller/AuditController.php index d3094b62891..25b6fba51aa 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Controller/AuditController.php +++ b/src/Oro/Bundle/EntityConfigBundle/Controller/AuditController.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\EntityConfigBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; - -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; use Oro\Bundle\SecurityBundle\Annotation\Acl; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; -use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; + +use Symfony\Bundle\FrameworkBundle\Controller\Controller; /** * EntityBundle controller. diff --git a/src/Oro/Bundle/EntityConfigBundle/Controller/ConfigController.php b/src/Oro/Bundle/EntityConfigBundle/Controller/ConfigController.php index a216a40261b..c86010d24f7 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Controller/ConfigController.php +++ b/src/Oro/Bundle/EntityConfigBundle/Controller/ConfigController.php @@ -4,21 +4,21 @@ use Doctrine\ORM\QueryBuilder; +use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; +use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; +use Oro\Bundle\EntityConfigBundle\Metadata\EntityMetadata; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; + +use Oro\Bundle\EntityConfigBundle\Provider\PropertyConfigContainer; use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; +use Oro\Bundle\SecurityBundle\Annotation\Acl; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; -use Oro\Bundle\EntityConfigBundle\Provider\PropertyConfigContainer; -use Oro\Bundle\EntityConfigBundle\Metadata\EntityMetadata; -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; -use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; -use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; - -use Oro\Bundle\SecurityBundle\Annotation\Acl; +use Symfony\Component\HttpFoundation\Response; /** * EntityConfig controller. @@ -78,11 +78,9 @@ public function indexAction(Request $request) * ) * @Template() */ - public function updateAction($id) + public function updateAction(Request $request, $id) { $entity = $this->getDoctrine()->getRepository(EntityConfigModel::ENTITY_NAME)->find($id); - $request = $this->getRequest(); - $form = $this->createForm( 'oro_entity_config_type', null, @@ -244,12 +242,10 @@ public function fieldsAction($id, Request $request) * ) * @Template() */ - public function fieldUpdateAction($id) + public function fieldUpdateAction(Request $request, $id) { /** @var FieldConfigModel $field */ $field = $this->getDoctrine()->getRepository(FieldConfigModel::ENTITY_NAME)->find($id); - $request = $this->getRequest(); - $form = $this->createForm( 'oro_entity_config_type', null, diff --git a/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/Compiler/ServiceLinkPass.php b/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/Compiler/ServiceLinkPass.php index df121971cf5..bc8843b5757 100644 --- a/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/Compiler/ServiceLinkPass.php +++ b/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/Compiler/ServiceLinkPass.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EntityConfigBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\Definition; +use Oro\Bundle\EntityConfigBundle\Exception\RuntimeException; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Reference; +use Symfony\Component\DependencyInjection\Definition; -use Oro\Bundle\EntityConfigBundle\Exception\RuntimeException; +use Symfony\Component\DependencyInjection\Reference; class ServiceLinkPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/Compiler/ServiceMethodPass.php b/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/Compiler/ServiceMethodPass.php index 8f0ecfbe9bd..57c45dd9f90 100644 --- a/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/Compiler/ServiceMethodPass.php +++ b/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/Compiler/ServiceMethodPass.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EntityConfigBundle\DependencyInjection\Compiler; +use Oro\Bundle\EntityConfigBundle\Exception\RuntimeException; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; -use Symfony\Component\DependencyInjection\Reference; -use Oro\Bundle\EntityConfigBundle\Exception\RuntimeException; +use Symfony\Component\DependencyInjection\Reference; class ServiceMethodPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/OroEntityConfigExtension.php b/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/OroEntityConfigExtension.php index 9a6c8e80427..53633c85b7b 100644 --- a/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/OroEntityConfigExtension.php +++ b/src/Oro/Bundle/EntityConfigBundle/DependencyInjection/OroEntityConfigExtension.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\EntityConfigBundle\DependencyInjection; +use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\DependencyInjection\Loader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\Config\FileLocator; class OroEntityConfigExtension extends Extension { diff --git a/src/Oro/Bundle/EntityConfigBundle/Event/NewEntityConfigModelEvent.php b/src/Oro/Bundle/EntityConfigBundle/Event/NewEntityConfigModelEvent.php index 1b8d33d2131..926ffdb879b 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Event/NewEntityConfigModelEvent.php +++ b/src/Oro/Bundle/EntityConfigBundle/Event/NewEntityConfigModelEvent.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EntityConfigBundle\Event; -use Symfony\Component\EventDispatcher\Event; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Symfony\Component\EventDispatcher\Event; class NewEntityConfigModelEvent extends Event { diff --git a/src/Oro/Bundle/EntityConfigBundle/Event/NewFieldConfigModelEvent.php b/src/Oro/Bundle/EntityConfigBundle/Event/NewFieldConfigModelEvent.php index 9e27fd510bf..d43f7bfa883 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Event/NewFieldConfigModelEvent.php +++ b/src/Oro/Bundle/EntityConfigBundle/Event/NewFieldConfigModelEvent.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EntityConfigBundle\Event; -use Symfony\Component\EventDispatcher\Event; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Symfony\Component\EventDispatcher\Event; class NewFieldConfigModelEvent extends Event { diff --git a/src/Oro/Bundle/EntityConfigBundle/Event/PersistConfigEvent.php b/src/Oro/Bundle/EntityConfigBundle/Event/PersistConfigEvent.php index 3de4a50a567..6cc6132a551 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Event/PersistConfigEvent.php +++ b/src/Oro/Bundle/EntityConfigBundle/Event/PersistConfigEvent.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EntityConfigBundle\Event; -use Symfony\Component\EventDispatcher\Event; - -use Oro\Bundle\EntityConfigBundle\Config\Id\ConfigIdInterface; use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\EntityConfigBundle\Config\Id\ConfigIdInterface; + +use Symfony\Component\EventDispatcher\Event; class PersistConfigEvent extends Event { diff --git a/src/Oro/Bundle/EntityConfigBundle/EventListener/AbstractConfigGridListener.php b/src/Oro/Bundle/EntityConfigBundle/EventListener/AbstractConfigGridListener.php index 580c8c38e49..b85814df61e 100644 --- a/src/Oro/Bundle/EntityConfigBundle/EventListener/AbstractConfigGridListener.php +++ b/src/Oro/Bundle/EntityConfigBundle/EventListener/AbstractConfigGridListener.php @@ -4,17 +4,17 @@ use Doctrine\ORM\QueryBuilder; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; - -use Oro\Bundle\DataGridBundle\Extension\Action\ActionExtension; use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; + +use Oro\Bundle\DataGridBundle\Datasource\ResultRecord; use Oro\Bundle\DataGridBundle\Event\BuildAfter; use Oro\Bundle\DataGridBundle\Event\BuildBefore; +use Oro\Bundle\DataGridBundle\Extension\Action\ActionExtension; use Oro\Bundle\DataGridBundle\Extension\Formatter\Configuration; -use Oro\Bundle\DataGridBundle\Datasource\ResultRecord; -use Oro\Bundle\EntityConfigBundle\Config\ConfigModelManager; use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\EntityConfigBundle\Config\ConfigModelManager; use Oro\Bundle\FilterBundle\Extension\Configuration as FilterConfiguration; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** * Class AbstractConfigGridListener diff --git a/src/Oro/Bundle/EntityConfigBundle/EventListener/EntityConfigGridListener.php b/src/Oro/Bundle/EntityConfigBundle/EventListener/EntityConfigGridListener.php index 669eaae38da..520842fe29c 100644 --- a/src/Oro/Bundle/EntityConfigBundle/EventListener/EntityConfigGridListener.php +++ b/src/Oro/Bundle/EntityConfigBundle/EventListener/EntityConfigGridListener.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EntityConfigBundle\EventListener; +use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; use Oro\Bundle\DataGridBundle\Event\BuildAfter; use Oro\Bundle\DataGridBundle\Event\BuildBefore; -use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; -use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; use Oro\Bundle\EntityConfigBundle\Provider\PropertyConfigContainer; class EntityConfigGridListener extends AbstractConfigGridListener diff --git a/src/Oro/Bundle/EntityConfigBundle/EventListener/FieldConfigGridListener.php b/src/Oro/Bundle/EntityConfigBundle/EventListener/FieldConfigGridListener.php index dffe05ec613..1dec3868e06 100644 --- a/src/Oro/Bundle/EntityConfigBundle/EventListener/FieldConfigGridListener.php +++ b/src/Oro/Bundle/EntityConfigBundle/EventListener/FieldConfigGridListener.php @@ -8,9 +8,9 @@ use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; use Oro\Bundle\DataGridBundle\Event\BuildAfter; use Oro\Bundle\DataGridBundle\Event\BuildBefore; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Config\ConfigModelManager; use Oro\Bundle\EntityConfigBundle\Provider\PropertyConfigContainer; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; class FieldConfigGridListener extends AbstractConfigGridListener { diff --git a/src/Oro/Bundle/EntityConfigBundle/Form/EventListener/ConfigSubscriber.php b/src/Oro/Bundle/EntityConfigBundle/Form/EventListener/ConfigSubscriber.php index 38e21dac291..ad71fff81f3 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Form/EventListener/ConfigSubscriber.php +++ b/src/Oro/Bundle/EntityConfigBundle/Form/EventListener/ConfigSubscriber.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\EntityConfigBundle\Form\EventListener; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; + +use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; -use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; - class ConfigSubscriber implements EventSubscriberInterface { /** diff --git a/src/Oro/Bundle/EntityConfigBundle/Form/Type/ConfigScopeType.php b/src/Oro/Bundle/EntityConfigBundle/Form/Type/ConfigScopeType.php index 5c64413969c..cc0f9a65d81 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Form/Type/ConfigScopeType.php +++ b/src/Oro/Bundle/EntityConfigBundle/Form/Type/ConfigScopeType.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\EntityConfigBundle\Form\Type; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; -use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; - use Oro\Bundle\EntityConfigBundle\Entity\AbstractConfigModel; +use Symfony\Component\Form\AbstractType; + +use Symfony\Component\Form\FormBuilderInterface; /** * @SuppressWarnings(PHPMD.NPathComplexity) @@ -150,7 +150,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_entity_config_scope_type'; } diff --git a/src/Oro/Bundle/EntityConfigBundle/Form/Type/ConfigType.php b/src/Oro/Bundle/EntityConfigBundle/Form/Type/ConfigType.php index e75c2dd0421..b1aa024e58e 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Form/Type/ConfigType.php +++ b/src/Oro/Bundle/EntityConfigBundle/Form/Type/ConfigType.php @@ -2,19 +2,19 @@ namespace Oro\Bundle\EntityConfigBundle\Form\Type; -use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; - -use Symfony\Component\OptionsResolver\OptionsResolverInterface; - -use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; +use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; -use Oro\Bundle\EntityConfigBundle\Provider\PropertyConfigContainer; use Oro\Bundle\EntityConfigBundle\Form\EventListener\ConfigSubscriber; +use Oro\Bundle\EntityConfigBundle\Provider\PropertyConfigContainer; +use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; + class ConfigType extends AbstractType { /** @@ -77,7 +77,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setRequired(array('config_model')); @@ -91,7 +91,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_entity_config_type'; } diff --git a/src/Oro/Bundle/EntityConfigBundle/OroEntityConfigBundle.php b/src/Oro/Bundle/EntityConfigBundle/OroEntityConfigBundle.php index 9e67021f080..c91d378dbac 100644 --- a/src/Oro/Bundle/EntityConfigBundle/OroEntityConfigBundle.php +++ b/src/Oro/Bundle/EntityConfigBundle/OroEntityConfigBundle.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\EntityConfigBundle; +use Oro\Bundle\EntityConfigBundle\DependencyInjection\Compiler\EntityConfigPass; +use Oro\Bundle\EntityConfigBundle\DependencyInjection\Compiler\ServiceLinkPass; +use Oro\Bundle\EntityConfigBundle\DependencyInjection\Compiler\ServiceMethodPass; + use Symfony\Component\DependencyInjection\Compiler\PassConfig; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; -use Oro\Bundle\EntityConfigBundle\DependencyInjection\Compiler\ServiceMethodPass; -use Oro\Bundle\EntityConfigBundle\DependencyInjection\Compiler\ServiceLinkPass; -use Oro\Bundle\EntityConfigBundle\DependencyInjection\Compiler\EntityConfigPass; - class OroEntityConfigBundle extends Bundle { public function build(ContainerBuilder $container) diff --git a/src/Oro/Bundle/EntityConfigBundle/Provider/ConfigProvider.php b/src/Oro/Bundle/EntityConfigBundle/Provider/ConfigProvider.php index 6635900b2c7..743832ffe5b 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Provider/ConfigProvider.php +++ b/src/Oro/Bundle/EntityConfigBundle/Provider/ConfigProvider.php @@ -5,16 +5,16 @@ use Doctrine\Common\Util\ClassUtils; use Doctrine\ORM\PersistentCollection; -use Symfony\Component\DependencyInjection\ContainerInterface; - use Oro\Bundle\EntityConfigBundle\Config\Config; + use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; -use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Config\Id\ConfigIdInterface; +use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Exception\RuntimeException; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * The configuration provider can be used to manage configuration data inside particular configuration scope. diff --git a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Audit/AuditManagerTest.php b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Audit/AuditManagerTest.php index 07fa9906fd0..8954cf3586b 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Audit/AuditManagerTest.php +++ b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Audit/AuditManagerTest.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\EntityConfigBundle\Tests\Unit\Audit; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; -use Symfony\Component\DependencyInjection\Container; - +use Oro\Bundle\EntityConfigBundle\Audit\AuditManager; use Oro\Bundle\EntityConfigBundle\Config\Config; + +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; -use Oro\Bundle\EntityConfigBundle\Audit\AuditManager; use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; +use Symfony\Component\DependencyInjection\Container; class AuditManagerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Config/ConfigModelManagerTest.php b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Config/ConfigModelManagerTest.php index b1b0690dd6d..395a55bf3b9 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Config/ConfigModelManagerTest.php +++ b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Config/ConfigModelManagerTest.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\EntityConfigBundle\Tests\Unit\Config; use Doctrine\Common\Annotations\AnnotationReader; -use Doctrine\Tests\OrmTestCase; - use Doctrine\ORM\EntityManager; + use Doctrine\ORM\Mapping\Driver\AnnotationDriver; +use Doctrine\Tests\OrmTestCase; use Oro\Bundle\EntityConfigBundle\Config\ConfigModelManager; use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; diff --git a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Entity/ConfigTest.php b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Entity/ConfigTest.php index 025a988464d..80ec7f83c80 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Entity/ConfigTest.php +++ b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Entity/ConfigTest.php @@ -3,9 +3,9 @@ namespace Oro\Bundle\EntityConfigBundle\Tests\Unit\Entity; use Oro\Bundle\EntityConfigBundle\Config\ConfigModelManager; +use Oro\Bundle\EntityConfigBundle\Entity\ConfigModelValue; use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; -use Oro\Bundle\EntityConfigBundle\Entity\ConfigModelValue; class ConfigTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/EntityConfigEventTest.php b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/EntityConfigEventTest.php index b20fe884f13..f547e088614 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/EntityConfigEventTest.php +++ b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/EntityConfigEventTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EntityConfigBundle\Tests\Unit\Event; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; -use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; use Oro\Bundle\EntityConfigBundle\Event\NewEntityConfigModelEvent; class EntityConfigEventTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/FieldConfigEventTest.php b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/FieldConfigEventTest.php index 7a5f8064500..763bfedcc7c 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/FieldConfigEventTest.php +++ b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/FieldConfigEventTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EntityConfigBundle\Tests\Unit\Event; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; -use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; use Oro\Bundle\EntityConfigBundle\Event\NewFieldConfigModelEvent; class FieldConfigEventTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/PersistConfigEventTest.php b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/PersistConfigEventTest.php index 9d0862c6c6f..0470870e4d5 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/PersistConfigEventTest.php +++ b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Event/PersistConfigEventTest.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\EntityConfigBundle\Tests\Unit\Event; use Oro\Bundle\EntityConfigBundle\Config\Config; -use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; use Oro\Bundle\EntityConfigBundle\Event\PersistConfigEvent; class PersistConfigEventTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Fixture/Repository/FoundEntityConfigRepository.php b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Fixture/Repository/FoundEntityConfigRepository.php index aa0e61bea15..5d0fc38a9c6 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Fixture/Repository/FoundEntityConfigRepository.php +++ b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Fixture/Repository/FoundEntityConfigRepository.php @@ -4,9 +4,9 @@ use Doctrine\ORM\EntityRepository; +use Oro\Bundle\EntityConfigBundle\Entity\ConfigModelValue; use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; -use Oro\Bundle\EntityConfigBundle\Entity\ConfigModelValue; use Oro\Bundle\EntityConfigBundle\Tests\Unit\ConfigManagerTest; use Oro\Bundle\EntityConfigBundle\Tests\Unit\Fixture\DemoEntity; diff --git a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Provider/ConfigProviderTest.php b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Provider/ConfigProviderTest.php index e3da45bb3c2..09a7edfd773 100644 --- a/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Provider/ConfigProviderTest.php +++ b/src/Oro/Bundle/EntityConfigBundle/Tests/Unit/Provider/ConfigProviderTest.php @@ -6,20 +6,20 @@ use Doctrine\ORM\PersistentCollection; use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\EntityManagerMock; +use Oro\Bundle\EntityConfigBundle\Config\Config; use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; -use Symfony\Component\DependencyInjection\Container; -use Oro\Bundle\EntityConfigBundle\Config\Config; use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; - use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; -use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; -use Oro\Bundle\EntityConfigBundle\Provider\PropertyConfigContainer; +use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; +use Oro\Bundle\EntityConfigBundle\Provider\PropertyConfigContainer; use Oro\Bundle\EntityConfigBundle\Tests\Unit\Fixture\DemoEntity; +use Symfony\Component\DependencyInjection\Container; + class ConfigProviderTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/EntityExtendBundle/Cache/EntityCacheWarmer.php b/src/Oro/Bundle/EntityExtendBundle/Cache/EntityCacheWarmer.php index 5045559c908..afa6c9b469f 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Cache/EntityCacheWarmer.php +++ b/src/Oro/Bundle/EntityExtendBundle/Cache/EntityCacheWarmer.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\EntityExtendBundle\Cache; -use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer; use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; +use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer; class EntityCacheWarmer extends CacheWarmer { diff --git a/src/Oro/Bundle/EntityExtendBundle/Command/BackupCommand.php b/src/Oro/Bundle/EntityExtendBundle/Command/BackupCommand.php index ba0757cbcc7..82a59598ea6 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Command/BackupCommand.php +++ b/src/Oro/Bundle/EntityExtendBundle/Command/BackupCommand.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\EntityExtendBundle\Command; -use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; +use Oro\Bundle\EntityBundle\ORM\OroEntityManager; -use Symfony\Component\Console\Input\InputInterface; +use Oro\Bundle\EntityExtendBundle\Databases\MySQLDatabase; +use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; + use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; - -use Oro\Bundle\EntityBundle\ORM\OroEntityManager; -use Oro\Bundle\EntityExtendBundle\Databases\MySQLDatabase; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; class BackupCommand extends ContainerAwareCommand diff --git a/src/Oro/Bundle/EntityExtendBundle/Command/ClearCommand.php b/src/Oro/Bundle/EntityExtendBundle/Command/ClearCommand.php index dc3740877af..09347e59c1d 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Command/ClearCommand.php +++ b/src/Oro/Bundle/EntityExtendBundle/Command/ClearCommand.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EntityExtendBundle\Command; -use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; +use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; +use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; -use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; +use Symfony\Component\Console\Output\OutputInterface; class ClearCommand extends ContainerAwareCommand { diff --git a/src/Oro/Bundle/EntityExtendBundle/Command/DumpCommand.php b/src/Oro/Bundle/EntityExtendBundle/Command/DumpCommand.php index a51ba08c7ca..7ba7c662b13 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Command/DumpCommand.php +++ b/src/Oro/Bundle/EntityExtendBundle/Command/DumpCommand.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\EntityExtendBundle\Command; +use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; -use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; +use Symfony\Component\Console\Output\OutputInterface; class DumpCommand extends ContainerAwareCommand { diff --git a/src/Oro/Bundle/EntityExtendBundle/Command/InitCommand.php b/src/Oro/Bundle/EntityExtendBundle/Command/InitCommand.php index 84085366613..4e4b76df647 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Command/InitCommand.php +++ b/src/Oro/Bundle/EntityExtendBundle/Command/InitCommand.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\EntityExtendBundle\Command; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\EntityConfigBundle\Config\ConfigModelManager; +use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; -use Symfony\Component\Yaml\Yaml; -use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; -use Oro\Bundle\EntityConfigBundle\Config\ConfigModelManager; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\HttpKernel\Kernel; -use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; +use Symfony\Component\Yaml\Yaml; class InitCommand extends ContainerAwareCommand { diff --git a/src/Oro/Bundle/EntityExtendBundle/Controller/ApplyController.php b/src/Oro/Bundle/EntityExtendBundle/Controller/ApplyController.php index a92921c833f..aaf67650675 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Controller/ApplyController.php +++ b/src/Oro/Bundle/EntityExtendBundle/Controller/ApplyController.php @@ -2,19 +2,19 @@ namespace Oro\Bundle\EntityExtendBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; - -use Symfony\Component\HttpKernel\KernelInterface; -use Symfony\Component\Process\PhpExecutableFinder; -use Symfony\Component\Process\Process; +use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\SecurityBundle\Annotation\Acl; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; + use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Oro\Bundle\SecurityBundle\Annotation\Acl; +use Symfony\Component\HttpKernel\KernelInterface; -use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Symfony\Component\Process\PhpExecutableFinder; +use Symfony\Component\Process\Process; /** * EntityExtendBundle controller. diff --git a/src/Oro/Bundle/EntityExtendBundle/Controller/ConfigEntityGridController.php b/src/Oro/Bundle/EntityExtendBundle/Controller/ConfigEntityGridController.php index f4d410eb1f5..0e0ebfa4b5b 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Controller/ConfigEntityGridController.php +++ b/src/Oro/Bundle/EntityExtendBundle/Controller/ConfigEntityGridController.php @@ -2,26 +2,27 @@ namespace Oro\Bundle\EntityExtendBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; - -use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\HttpFoundation\Response; - use FOS\Rest\Util\Codes; - -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; + use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; use Oro\Bundle\EntityExtendBundle\Form\Type\EntityType; -use Oro\Bundle\EntityExtendBundle\Form\Type\UniqueKeyCollectionType; +use Oro\Bundle\EntityExtendBundle\Form\Type\UniqueKeyCollectionType; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; + +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\Request; + +use Symfony\Component\HttpFoundation\Response; /** * Class ConfigGridController @@ -47,7 +48,7 @@ class ConfigEntityGridController extends Controller * ) * @Template */ - public function uniqueAction(EntityConfigModel $entity) + public function uniqueAction(Request $request, EntityConfigModel $entity) { /** @var ConfigProvider $configProvider */ $configProvider = $this->get('oro_entity_config.provider.extend'); @@ -56,8 +57,6 @@ public function uniqueAction(EntityConfigModel $entity) $data = $entityConfig->has('unique_key') ? $entityConfig->get('unique_key') : array(); - $request = $this->getRequest(); - $form = $this->createForm( new UniqueKeyCollectionType( array_filter( @@ -131,10 +130,8 @@ function (FieldConfigId $fieldConfigId) { * ) * @Template */ - public function createAction() + public function createAction(Request $request) { - $request = $this->getRequest(); - /** @var ConfigManager $configManager */ $configManager = $this->get('oro_entity_config.config_manager'); diff --git a/src/Oro/Bundle/EntityExtendBundle/Controller/ConfigFieldGridController.php b/src/Oro/Bundle/EntityExtendBundle/Controller/ConfigFieldGridController.php index 40e45344ec7..63ae60ebcdf 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Controller/ConfigFieldGridController.php +++ b/src/Oro/Bundle/EntityExtendBundle/Controller/ConfigFieldGridController.php @@ -2,30 +2,30 @@ namespace Oro\Bundle\EntityExtendBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; - -use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; - -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; - use FOS\Rest\Util\Codes; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; - -use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; +use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel; use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; -use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper; +use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper; use Oro\Bundle\SecurityBundle\Annotation\Acl; + use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; + +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; + +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\JsonResponse; + +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; /** * Class ConfigGridController @@ -51,7 +51,7 @@ class ConfigFieldGridController extends Controller * * @Template */ - public function createAction(EntityConfigModel $entity) + public function createAction(Request $request, EntityConfigModel $entity) { /** @var ExtendManager $extendManager */ $extendManager = $this->get('oro_entity_extend.extend.extend_manager'); @@ -77,8 +77,6 @@ public function createAction(EntityConfigModel $entity) $newFieldModel, array('class_name' => $entity->getClassName()) ); - $request = $this->getRequest(); - if ($request->getMethod() == 'POST') { $form->submit($request); @@ -123,9 +121,8 @@ public function createAction(EntityConfigModel $entity) * group_name="" * ) */ - public function updateAction(EntityConfigModel $entity) + public function updateAction(Request $request, EntityConfigModel $entity) { - $request = $this->getRequest(); $fieldName = $request->getSession()->get(sprintf(self::SESSION_ID_FIELD_NAME, $entity->getId())); $fieldType = $request->getSession()->get(sprintf(self::SESSION_ID_FIELD_TYPE, $entity->getId())); if (!$fieldName || !$fieldType) { diff --git a/src/Oro/Bundle/EntityExtendBundle/DependencyInjection/OroEntityExtendExtension.php b/src/Oro/Bundle/EntityExtendBundle/DependencyInjection/OroEntityExtendExtension.php index 75eafe957de..6a0cf784863 100644 --- a/src/Oro/Bundle/EntityExtendBundle/DependencyInjection/OroEntityExtendExtension.php +++ b/src/Oro/Bundle/EntityExtendBundle/DependencyInjection/OroEntityExtendExtension.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EntityExtendBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; +use Oro\Bundle\EntityExtendBundle\Exception\RuntimeException; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; -use Oro\Bundle\EntityExtendBundle\Exception\RuntimeException; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Oro/Bundle/EntityExtendBundle/EventListener/ConfigSubscriber.php b/src/Oro/Bundle/EntityExtendBundle/EventListener/ConfigSubscriber.php index 26810ea344c..244b01109dd 100644 --- a/src/Oro/Bundle/EntityExtendBundle/EventListener/ConfigSubscriber.php +++ b/src/Oro/Bundle/EntityExtendBundle/EventListener/ConfigSubscriber.php @@ -2,25 +2,25 @@ namespace Oro\Bundle\EntityExtendBundle\EventListener; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; - use Oro\Bundle\EntityConfigBundle\Config\Config; -use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; +use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; use Oro\Bundle\EntityConfigBundle\Config\Id\ConfigIdInterface; + use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; +use Oro\Bundle\EntityConfigBundle\Event\Events; -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; +use Oro\Bundle\EntityConfigBundle\Event\NewEntityConfigModelEvent; use Oro\Bundle\EntityConfigBundle\Event\NewFieldConfigModelEvent; -use Oro\Bundle\EntityConfigBundle\Event\NewEntityConfigModelEvent; use Oro\Bundle\EntityConfigBundle\Event\PersistConfigEvent; -use Oro\Bundle\EntityConfigBundle\Event\Events; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; +use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; use Oro\Bundle\EntityExtendBundle\Tools\ExtendConfigDumper; use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper; -use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; class ConfigSubscriber implements EventSubscriberInterface { diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Extension/ExtendEntityExtension.php b/src/Oro/Bundle/EntityExtendBundle/Form/Extension/ExtendEntityExtension.php index e61af7502a8..8545d30ae6b 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Form/Extension/ExtendEntityExtension.php +++ b/src/Oro/Bundle/EntityExtendBundle/Form/Extension/ExtendEntityExtension.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\EntityExtendBundle\Form\Extension; -use Symfony\Component\Form\AbstractTypeExtension; -use Symfony\Component\Form\FormBuilderInterface; - -use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; +use Oro\Bundle\EntityBundle\Form\Type\CustomEntityType; use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; + use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; -use Oro\Bundle\EntityBundle\Form\Type\CustomEntityType; +use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; +use Symfony\Component\Form\AbstractTypeExtension; +use Symfony\Component\Form\FormBuilderInterface; class ExtendEntityExtension extends AbstractTypeExtension { diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/EntityType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/EntityType.php index 08941f13812..67d92671109 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/EntityType.php +++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/EntityType.php @@ -3,8 +3,9 @@ namespace Oro\Bundle\EntityExtendBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class EntityType extends AbstractType { @@ -12,7 +13,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( 'className', - 'text', + TextType::class, array( 'label' => 'Name', 'block' => 'entity', @@ -21,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ); } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -43,7 +44,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_entity_extend_entity_type'; } diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/FieldType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/FieldType.php index 82abd151095..7368aa2bd7c 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/FieldType.php +++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/FieldType.php @@ -2,14 +2,16 @@ namespace Oro\Bundle\EntityExtendBundle\Form\Type; +use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\Extension\Core\Type\TextType; -use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; +use Symfony\Component\Form\FormBuilderInterface; -use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; +use Symfony\Component\OptionsResolver\OptionsResolver; class FieldType extends AbstractType { @@ -45,7 +47,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( 'fieldName', - 'text', + TextType::class, array( 'label' => 'Field Name', 'block' => 'type', @@ -85,7 +87,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->add( 'type', - 'choice', + ChoiceType::class, array( 'choices' => $this->types, 'empty_value' => 'Please choice type...', @@ -97,7 +99,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver ->setRequired(array('class_name')) @@ -117,7 +119,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_entity_extend_field_type'; } diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/RelationType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/RelationType.php index 0fdd207eb93..7e9ba1be7b2 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/RelationType.php +++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/RelationType.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\EntityExtendBundle\Form\Type; +use Oro\Bundle\ConfigBundle\Entity\Config; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\FormFactory; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\ConfigBundle\Entity\Config; +use Symfony\Component\Form\FormFactory; -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; +use Symfony\Component\OptionsResolver\OptionsResolver; class RelationType extends AbstractType { @@ -131,7 +131,7 @@ public function preSubmitData(FormEvent $event) } } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -141,7 +141,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) ); } - public function getName() + public function getBlockPrefix() { return 'oro_entity_relation_type'; } diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/TargetFieldType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/TargetFieldType.php index 040c4f438ae..53566adb1a8 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/TargetFieldType.php +++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/TargetFieldType.php @@ -2,14 +2,15 @@ namespace Oro\Bundle\EntityExtendBundle\Form\Type; +use Oro\Bundle\EntityConfigBundle\Config\Config; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; use Symfony\Component\DependencyInjection\Container; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\EntityConfigBundle\Config\Config; -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\OptionsResolver\OptionsResolver; class TargetFieldType extends AbstractType { @@ -29,7 +30,7 @@ public function __construct(ConfigProvider $configProvider, $entityClass) $this->entityClass = $entityClass; } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -77,13 +78,13 @@ function (Config $config) { */ public function getParent() { - return 'choice'; + return ChoiceType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_entity_target_field_type'; } diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/TargetType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/TargetType.php index b5f4e304d58..65c7ed55b2a 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/TargetType.php +++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/TargetType.php @@ -2,19 +2,20 @@ namespace Oro\Bundle\EntityExtendBundle\Form\Type; +use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; +use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; -use Symfony\Component\DependencyInjection\Container; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\DependencyInjection\Container; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; + use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; -use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; -use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; - -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; +use Symfony\Component\OptionsResolver\OptionsResolver; class TargetType extends AbstractType { @@ -45,7 +46,7 @@ public function preSetData(FormEvent $event) $event->setData($this->targetEntity); } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -120,13 +121,13 @@ function (EntityConfigId $configId) use ($configManager) { */ public function getParent() { - return 'choice'; + return ChoiceType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_entity_target_type'; } diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/UniqueKeyCollectionType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/UniqueKeyCollectionType.php index d9edd6f3f8b..7580f9b456c 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/UniqueKeyCollectionType.php +++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/UniqueKeyCollectionType.php @@ -2,10 +2,11 @@ namespace Oro\Bundle\EntityExtendBundle\Form\Type; +use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\Extension\Core\Type\CollectionType; -use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; +use Symfony\Component\Form\FormBuilderInterface; class UniqueKeyCollectionType extends AbstractType { @@ -26,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( 'keys', - 'collection', + CollectionType::class, array( 'required' => true, 'type' => new UniqueKeyType($this->fields), @@ -42,7 +43,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_entity_extend_unique_key_collection_type'; } diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/UniqueKeyType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/UniqueKeyType.php index dffba273594..6430e399498 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/UniqueKeyType.php +++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/UniqueKeyType.php @@ -2,10 +2,12 @@ namespace Oro\Bundle\EntityExtendBundle\Form\Type; +use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\TextType; -use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; +use Symfony\Component\Form\FormBuilderInterface; class UniqueKeyType extends AbstractType { @@ -32,7 +34,7 @@ function (FieldConfigId $field) { $builder->add( 'name', - 'text', + TextType::class, array( 'required' => true, ) @@ -40,7 +42,7 @@ function (FieldConfigId $field) { $builder->add( 'key', - 'choice', + ChoiceType::class, array( 'multiple' => true, 'choices' => $choices, @@ -52,7 +54,7 @@ function (FieldConfigId $field) { /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_entity_extend_unique_key_type'; } diff --git a/src/Oro/Bundle/EntityExtendBundle/OroEntityExtendBundle.php b/src/Oro/Bundle/EntityExtendBundle/OroEntityExtendBundle.php index 1e32681e30c..37a6a387df9 100644 --- a/src/Oro/Bundle/EntityExtendBundle/OroEntityExtendBundle.php +++ b/src/Oro/Bundle/EntityExtendBundle/OroEntityExtendBundle.php @@ -2,20 +2,20 @@ namespace Oro\Bundle\EntityExtendBundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; +use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass; -use Symfony\Component\Process\PhpExecutableFinder; +use Oro\Bundle\EntityExtendBundle\DependencyInjection\Compiler\EntityManagerPass; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\HttpKernel\KernelInterface; +use Oro\Bundle\EntityExtendBundle\Exception\RuntimeException; +use Oro\Bundle\EntityExtendBundle\Tools\ExtendClassLoadingUtils; -use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; -use Oro\Bundle\EntityExtendBundle\Exception\RuntimeException; +use Symfony\Component\HttpKernel\Bundle\Bundle; -use Oro\Bundle\EntityExtendBundle\DependencyInjection\Compiler\EntityManagerPass; +use Symfony\Component\HttpKernel\KernelInterface; +use Symfony\Component\Process\PhpExecutableFinder; use Symfony\Component\Process\Process; -use Oro\Bundle\EntityExtendBundle\Tools\ExtendClassLoadingUtils; class OroEntityExtendBundle extends Bundle { diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Type/EntityTypeTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Type/EntityTypeTest.php index a0ec226b445..6b45742421a 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Type/EntityTypeTest.php +++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Type/EntityTypeTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\EntityExtendBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\Forms; -use Symfony\Component\Form\Test\TypeTestCase; - use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; use Oro\Bundle\EntityExtendBundle\Form\Type\EntityType; + use Oro\Bundle\FormBundle\Form\Extension\DataBlockExtension; +use Symfony\Component\Form\Forms; +use Symfony\Component\Form\Test\TypeTestCase; class EntityTypeTest extends TypeTestCase { diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Type/UniqueKeyCollectionTypeTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Type/UniqueKeyCollectionTypeTest.php index dd37ce3f5b6..a3ab592c15c 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Type/UniqueKeyCollectionTypeTest.php +++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Type/UniqueKeyCollectionTypeTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EntityExtendBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\Test\TypeTestCase; - use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; + use Oro\Bundle\EntityExtendBundle\Form\Type\UniqueKeyCollectionType; +use Symfony\Component\Form\Test\TypeTestCase; class UniqueKeyCollectionTypeTest extends TypeTestCase { diff --git a/src/Oro/Bundle/EntityExtendBundle/Tools/ExtendConfigDumper.php b/src/Oro/Bundle/EntityExtendBundle/Tools/ExtendConfigDumper.php index 59ddd7a3e43..5fe47db7359 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Tools/ExtendConfigDumper.php +++ b/src/Oro/Bundle/EntityExtendBundle/Tools/ExtendConfigDumper.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\EntityExtendBundle\Tools; -use Oro\Bundle\EntityConfigBundle\Config\Config; -use Symfony\Component\Filesystem\Filesystem; - use Oro\Bundle\EntityBundle\ORM\OroEntityManager; +use Oro\Bundle\EntityConfigBundle\Config\Config; use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; + use Oro\Bundle\EntityExtendBundle\Mapping\ExtendClassMetadataFactory; +use Symfony\Component\Filesystem\Filesystem; class ExtendConfigDumper { diff --git a/src/Oro/Bundle/EntityExtendBundle/Tools/Generator.php b/src/Oro/Bundle/EntityExtendBundle/Tools/Generator.php index a489339bc4e..dc892d96486 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Tools/Generator.php +++ b/src/Oro/Bundle/EntityExtendBundle/Tools/Generator.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\EntityExtendBundle\Tools; -use Symfony\Component\Yaml\Yaml; - use CG\Core\DefaultGeneratorStrategy; + use CG\Generator\PhpClass; use CG\Generator\PhpMethod; use CG\Generator\PhpParameter; use CG\Generator\PhpProperty; use CG\Generator\Writer; - use Doctrine\Common\Inflector\Inflector; +use Symfony\Component\Yaml\Yaml; + class Generator { /** diff --git a/src/Oro/Bundle/FilterBundle/DependencyInjection/CompilerPass/FilterTypesPass.php b/src/Oro/Bundle/FilterBundle/DependencyInjection/CompilerPass/FilterTypesPass.php index 6c5e3a48eda..f51e04acceb 100644 --- a/src/Oro/Bundle/FilterBundle/DependencyInjection/CompilerPass/FilterTypesPass.php +++ b/src/Oro/Bundle/FilterBundle/DependencyInjection/CompilerPass/FilterTypesPass.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\FilterBundle\DependencyInjection\CompilerPass; -use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Reference; class FilterTypesPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/FilterBundle/DependencyInjection/OroFilterExtension.php b/src/Oro/Bundle/FilterBundle/DependencyInjection/OroFilterExtension.php index dc8d7f0bfd1..ba3300ec8c9 100644 --- a/src/Oro/Bundle/FilterBundle/DependencyInjection/OroFilterExtension.php +++ b/src/Oro/Bundle/FilterBundle/DependencyInjection/OroFilterExtension.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\FilterBundle\DependencyInjection; use Symfony\Component\Config\FileLocator; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; class OroFilterExtension extends Extension diff --git a/src/Oro/Bundle/FilterBundle/Extension/Configuration.php b/src/Oro/Bundle/FilterBundle/Extension/Configuration.php index 98dbd2d0293..299d222336e 100644 --- a/src/Oro/Bundle/FilterBundle/Extension/Configuration.php +++ b/src/Oro/Bundle/FilterBundle/Extension/Configuration.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FilterBundle\Extension; +use Oro\Bundle\FilterBundle\Extension\Orm\FilterInterface; use Symfony\Component\Config\Definition\Builder\TreeBuilder; -use Symfony\Component\Config\Definition\ConfigurationInterface; -use Oro\Bundle\FilterBundle\Extension\Orm\FilterInterface; +use Symfony\Component\Config\Definition\ConfigurationInterface; class Configuration implements ConfigurationInterface { diff --git a/src/Oro/Bundle/FilterBundle/Extension/Orm/AbstractDateFilter.php b/src/Oro/Bundle/FilterBundle/Extension/Orm/AbstractDateFilter.php index e190a43dd5e..c4a4842565f 100644 --- a/src/Oro/Bundle/FilterBundle/Extension/Orm/AbstractDateFilter.php +++ b/src/Oro/Bundle/FilterBundle/Extension/Orm/AbstractDateFilter.php @@ -4,10 +4,10 @@ use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Form\FormFactoryInterface; +use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; use Oro\Bundle\LocaleBundle\Twig\DateFormatExtension; -use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; +use Symfony\Component\Form\FormFactoryInterface; abstract class AbstractDateFilter extends AbstractFilter { diff --git a/src/Oro/Bundle/FilterBundle/Extension/Orm/AbstractFilter.php b/src/Oro/Bundle/FilterBundle/Extension/Orm/AbstractFilter.php index a0d15d101fd..f071f016cb6 100644 --- a/src/Oro/Bundle/FilterBundle/Extension/Orm/AbstractFilter.php +++ b/src/Oro/Bundle/FilterBundle/Extension/Orm/AbstractFilter.php @@ -5,10 +5,10 @@ use Doctrine\ORM\Query\Expr; use Doctrine\ORM\QueryBuilder; +use Oro\Bundle\FilterBundle\Extension\Configuration; use Symfony\Component\Form\Form; -use Symfony\Component\Form\FormFactoryInterface; -use Oro\Bundle\FilterBundle\Extension\Configuration; +use Symfony\Component\Form\FormFactoryInterface; abstract class AbstractFilter implements FilterInterface { diff --git a/src/Oro/Bundle/FilterBundle/Extension/Orm/ChoiceFilter.php b/src/Oro/Bundle/FilterBundle/Extension/Orm/ChoiceFilter.php index 02724bee40e..4cb5d9b3107 100644 --- a/src/Oro/Bundle/FilterBundle/Extension/Orm/ChoiceFilter.php +++ b/src/Oro/Bundle/FilterBundle/Extension/Orm/ChoiceFilter.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\FilterBundle\Extension\Orm; -use Doctrine\ORM\QueryBuilder; use Doctrine\Common\Collections\Collection; - -use Symfony\Component\Form\Extension\Core\View\ChoiceView; +use Doctrine\ORM\QueryBuilder; use Oro\Bundle\FilterBundle\Extension\Configuration; + use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; +use Symfony\Component\Form\Extension\Core\View\ChoiceView; class ChoiceFilter extends AbstractFilter { diff --git a/src/Oro/Bundle/FilterBundle/Extension/OrmFilterExtension.php b/src/Oro/Bundle/FilterBundle/Extension/OrmFilterExtension.php index 83e4d38873f..6733e761687 100644 --- a/src/Oro/Bundle/FilterBundle/Extension/OrmFilterExtension.php +++ b/src/Oro/Bundle/FilterBundle/Extension/OrmFilterExtension.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\FilterBundle\Extension; -use Symfony\Component\Translation\TranslatorInterface; - use Oro\Bundle\DataGridBundle\Datagrid\Builder; -use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; -use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; + use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; +use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; +use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; use Oro\Bundle\DataGridBundle\Extension\Formatter\Configuration as FormatterConfiguration; use Oro\Bundle\FilterBundle\Extension\Orm\FilterInterface; +use Symfony\Component\Translation\TranslatorInterface; class OrmFilterExtension extends AbstractExtension { diff --git a/src/Oro/Bundle/FilterBundle/Form/Type/DateRangeType.php b/src/Oro/Bundle/FilterBundle/Form/Type/DateRangeType.php index 34b30aec164..c7d1e5add1c 100644 --- a/src/Oro/Bundle/FilterBundle/Form/Type/DateRangeType.php +++ b/src/Oro/Bundle/FilterBundle/Form/Type/DateRangeType.php @@ -4,9 +4,9 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; class DateRangeType extends AbstractType { @@ -15,7 +15,7 @@ class DateRangeType extends AbstractType /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -71,7 +71,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) /** * {@inheritDoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( diff --git a/src/Oro/Bundle/FilterBundle/Form/Type/DateTimeRangeType.php b/src/Oro/Bundle/FilterBundle/Form/Type/DateTimeRangeType.php index 9affc4fce9b..9b71a09333d 100644 --- a/src/Oro/Bundle/FilterBundle/Form/Type/DateTimeRangeType.php +++ b/src/Oro/Bundle/FilterBundle/Form/Type/DateTimeRangeType.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FilterBundle\Form\Type; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; +use Symfony\Component\OptionsResolver\OptionsResolver; class DateTimeRangeType extends AbstractType { @@ -27,7 +27,7 @@ public function __construct(LocaleSettings $localeSettings) /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -43,7 +43,7 @@ public function getParent() /** * {@inheritDoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( diff --git a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/AbstractChoiceType.php b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/AbstractChoiceType.php index f0d73718d9c..b0a9cd5e436 100644 --- a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/AbstractChoiceType.php +++ b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/AbstractChoiceType.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\FilterBundle\Form\Type\Filter; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Translation\TranslatorInterface; -use Symfony\Component\Form\FormView; -use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\Extension\Core\View\ChoiceView; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; +use Symfony\Component\Translation\TranslatorInterface; abstract class AbstractChoiceType extends AbstractType { diff --git a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/ChoiceFilterType.php b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/ChoiceFilterType.php index 97fc801c548..f7c3fd6b509 100644 --- a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/ChoiceFilterType.php +++ b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/ChoiceFilterType.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\FilterBundle\Form\Type\Filter; -use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\OptionsResolverInterface; class ChoiceFilterType extends AbstractChoiceType diff --git a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/DateRangeFilterType.php b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/DateRangeFilterType.php index 1b1b7fa6f8d..190a202ec6a 100644 --- a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/DateRangeFilterType.php +++ b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/DateRangeFilterType.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\FilterBundle\Form\Type\Filter; +use Oro\Bundle\FilterBundle\Form\Type\DateRangeType; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Translation\TranslatorInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; -use Oro\Bundle\FilterBundle\Form\Type\DateRangeType; +use Symfony\Component\Translation\TranslatorInterface; class DateRangeFilterType extends AbstractType { @@ -34,7 +34,7 @@ public function __construct(TranslatorInterface $translator) /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -50,7 +50,7 @@ public function getParent() /** * {@inheritDoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $operatorChoices = array( self::TYPE_BETWEEN => $this->translator->trans('oro.filter.form.label_date_type_between'), diff --git a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/DateTimeRangeFilterType.php b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/DateTimeRangeFilterType.php index f3909d82d5a..d087fe856d0 100644 --- a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/DateTimeRangeFilterType.php +++ b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/DateTimeRangeFilterType.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\FilterBundle\Form\Type\Filter; +use Oro\Bundle\FilterBundle\Form\Type\DateTimeRangeType; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Translation\TranslatorInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; -use Oro\Bundle\FilterBundle\Form\Type\DateTimeRangeType; +use Symfony\Component\Translation\TranslatorInterface; class DateTimeRangeFilterType extends AbstractType { @@ -32,7 +32,7 @@ public function __construct(TranslatorInterface $translator) /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -48,7 +48,7 @@ public function getParent() /** * {@inheritDoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( diff --git a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/EntityFilterType.php b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/EntityFilterType.php index 1905dde87dd..5f08e755b33 100644 --- a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/EntityFilterType.php +++ b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/EntityFilterType.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FilterBundle\Form\Type\Filter; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; use Symfony\Component\OptionsResolver\Options; -use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; class EntityFilterType extends AbstractChoiceType { diff --git a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/FilterType.php b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/FilterType.php index 86f95c58f05..60e5dae783d 100644 --- a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/FilterType.php +++ b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/FilterType.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\FilterBundle\Form\Type\Filter; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\Form\FormView; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Translation\TranslatorInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; class FilterType extends AbstractType { @@ -29,7 +29,7 @@ public function __construct(TranslatorInterface $translator) /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -83,7 +83,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) /** * {@inheritDoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( diff --git a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/NumberFilterType.php b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/NumberFilterType.php index d07f72215c4..d0a01f8636f 100644 --- a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/NumberFilterType.php +++ b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/NumberFilterType.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\FilterBundle\Form\Type\Filter; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Translation\TranslatorInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\Translation\TranslatorInterface; class NumberFilterType extends AbstractType { @@ -36,7 +36,7 @@ public function __construct(TranslatorInterface $translator) /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -52,7 +52,7 @@ public function getParent() /** * {@inheritDoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $operatorChoices = array( self::TYPE_EQUAL => $this->translator->trans('oro.filter.form.label_type_equal'), diff --git a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/TextFilterType.php b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/TextFilterType.php index 702c3d28ed3..1d33afab50d 100644 --- a/src/Oro/Bundle/FilterBundle/Form/Type/Filter/TextFilterType.php +++ b/src/Oro/Bundle/FilterBundle/Form/Type/Filter/TextFilterType.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\FilterBundle\Form\Type\Filter; use Symfony\Component\Form\AbstractType; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Translation\TranslatorInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; class TextFilterType extends AbstractType { @@ -31,7 +31,7 @@ public function __construct(TranslatorInterface $translator) /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -47,7 +47,7 @@ public function getParent() /** * {@inheritDoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $choices = array( self::TYPE_CONTAINS => $this->translator->trans('oro.filter.form.label_type_contains'), diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/AbstractTypeTestCase.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/AbstractTypeTestCase.php index 53d41c1c5da..28ef1a7618a 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/AbstractTypeTestCase.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/AbstractTypeTestCase.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\Test\FormIntegrationTestCase; -use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Form\FormTypeInterface; +use Symfony\Component\Form\Test\FormIntegrationTestCase; use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Translation\TranslatorInterface; abstract class AbstractTypeTestCase extends FormIntegrationTestCase { diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/DateTimeRangeTypeTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/DateTimeRangeTypeTest.php index 2cccb8ed705..e76e107c325 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/DateTimeRangeTypeTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/DateTimeRangeTypeTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type; -use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; use Oro\Bundle\FilterBundle\Form\Type\DateRangeType; use Oro\Bundle\FilterBundle\Form\Type\DateTimeRangeType; +use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; class DateTimeRangeTypeTest extends AbstractTypeTestCase { diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/AbstractChoiceTypeTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/AbstractChoiceTypeTest.php index 5a9e159d18c..3094ce99763 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/AbstractChoiceTypeTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/AbstractChoiceTypeTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\Filter; +use Oro\Bundle\FilterBundle\Form\Type\Filter\AbstractChoiceType; use Symfony\Component\Form\Extension\Core\View\ChoiceView; -use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormInterface; -use Oro\Bundle\FilterBundle\Form\Type\Filter\AbstractChoiceType; +use Symfony\Component\Form\FormView; class AbstractChoiceTypeTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/BooleanFilterTypeTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/BooleanFilterTypeTest.php index 0687a0905be..b114d8f8746 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/BooleanFilterTypeTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/BooleanFilterTypeTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\Filter; -use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; -use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; -use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; use Oro\Bundle\FilterBundle\Form\Type\Filter\BooleanFilterType; +use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; +use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; +use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; class BooleanFilterTypeTest extends AbstractTypeTestCase { diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/ChoiceFilterTypeTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/ChoiceFilterTypeTest.php index 8a78750c87b..074e87ef222 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/ChoiceFilterTypeTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/ChoiceFilterTypeTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\Filter; -use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; -use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; +use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; +use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; class ChoiceFilterTypeTest extends AbstractTypeTestCase { diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/DateRangeFilterTypeTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/DateRangeFilterTypeTest.php index 9099f40198e..ccb0e0cbd42 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/DateRangeFilterTypeTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/DateRangeFilterTypeTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\Filter; -use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; -use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; -use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; use Oro\Bundle\FilterBundle\Form\Type\DateRangeType; +use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; +use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; +use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; class DateRangeFilterTypeTest extends AbstractTypeTestCase { diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/DateTimeRangeFilterTypeTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/DateTimeRangeFilterTypeTest.php index 325ed2b4650..72f5810d45d 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/DateTimeRangeFilterTypeTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/DateTimeRangeFilterTypeTest.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\Filter; -use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; -use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; -use Oro\Bundle\FilterBundle\Form\Type\Filter\DateTimeRangeFilterType; use Oro\Bundle\FilterBundle\Form\Type\DateRangeType; use Oro\Bundle\FilterBundle\Form\Type\DateTimeRangeType; use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; +use Oro\Bundle\FilterBundle\Form\Type\Filter\DateTimeRangeFilterType; use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; +use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; +use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; class DateTimeRangeFilterTypeTest extends AbstractTypeTestCase { diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/EntityFilterTypeTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/EntityFilterTypeTest.php index 952117bf172..14ad6b41054 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/EntityFilterTypeTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/EntityFilterTypeTest.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\Filter; -use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; -use Symfony\Bridge\Doctrine\Form\Type\EntityType; - -use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; -use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; use Oro\Bundle\FilterBundle\Form\Type\Filter\EntityFilterType; +use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; +use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; +use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; +use Symfony\Bridge\Doctrine\Form\Type\EntityType; + class EntityFilterTypeTest extends AbstractTypeTestCase { /** diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/FilterTypeTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/FilterTypeTest.php index f261c55bb3f..e4b41a1d5db 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/FilterTypeTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/FilterTypeTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\Filter; -use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; +use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; class FilterTypeTest extends AbstractTypeTestCase { diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/NumberFilterTypeTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/NumberFilterTypeTest.php index fc2dd0bcd3d..a8d4793351a 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/NumberFilterTypeTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/NumberFilterTypeTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\Filter; +use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; +use Oro\Bundle\FilterBundle\Form\Type\Filter\NumberFilterType; use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; -use Oro\Bundle\FilterBundle\Form\Type\Filter\NumberFilterType; -use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; class NumberFilterTypeTest extends AbstractTypeTestCase { diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/TextFilterTypeTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/TextFilterTypeTest.php index 2e4bb2edd6f..4cd8683cd60 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/TextFilterTypeTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Form/Type/Filter/TextFilterTypeTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\Filter; +use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; +use Oro\Bundle\FilterBundle\Form\Type\Filter\TextFilterType; use Oro\Bundle\FilterBundle\Tests\Unit\Fixtures\CustomFormExtension; use Oro\Bundle\FilterBundle\Tests\Unit\Form\Type\AbstractTypeTestCase; -use Oro\Bundle\FilterBundle\Form\Type\Filter\TextFilterType; -use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; class TextFilterTypeTest extends AbstractTypeTestCase { diff --git a/src/Oro/Bundle/FilterBundle/Tests/Unit/Twig/RenderLayoutExtensionTest.php b/src/Oro/Bundle/FilterBundle/Tests/Unit/Twig/RenderLayoutExtensionTest.php index 12cf30ffd0d..2e77eecc85f 100644 --- a/src/Oro/Bundle/FilterBundle/Tests/Unit/Twig/RenderLayoutExtensionTest.php +++ b/src/Oro/Bundle/FilterBundle/Tests/Unit/Twig/RenderLayoutExtensionTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\FilterBundle\Tests\Unit\Twig; -use Symfony\Component\Form\FormView; -use Symfony\Component\Form\Extension\Core\View\ChoiceView; use Oro\Bundle\FilterBundle\Twig\RenderLayoutExtension; +use Symfony\Component\Form\Extension\Core\View\ChoiceView; +use Symfony\Component\Form\FormView; class RenderLayoutExtensionTest extends AbstractExtensionTestCase { diff --git a/src/Oro/Bundle/FilterBundle/Twig/RenderLayoutExtension.php b/src/Oro/Bundle/FilterBundle/Twig/RenderLayoutExtension.php index f710d2e7694..4e60493608f 100644 --- a/src/Oro/Bundle/FilterBundle/Twig/RenderLayoutExtension.php +++ b/src/Oro/Bundle/FilterBundle/Twig/RenderLayoutExtension.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\FilterBundle\Twig; -use Symfony\Component\Form\FormView; use Symfony\Component\Form\Extension\Core\View\ChoiceView; +use Symfony\Component\Form\FormView; class RenderLayoutExtension extends AbstractExtension { diff --git a/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AbstractAttributeType.php b/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AbstractAttributeType.php index e282d574cb3..d4cc365994e 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AbstractAttributeType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AbstractAttributeType.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\FlexibleEntityBundle\AttributeType; -use Symfony\Component\Validator\Constraints; -use Symfony\Component\Form\FormFactoryInterface; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AttributeTypeInterface; -use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; -use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; use Oro\Bundle\FlexibleEntityBundle\Form\Validator\ConstraintGuesserInterface; +use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; +use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; +use Symfony\Component\Form\FormFactoryInterface; +use Symfony\Component\Validator\Constraints; /** * Abstract attribute type diff --git a/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AbstractOptionType.php b/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AbstractOptionType.php index 8fb08ec21fe..24a2df2888a 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AbstractOptionType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AbstractOptionType.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\FlexibleEntityBundle\AttributeType; use Doctrine\ORM\EntityRepository; -use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; +use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; /** * Abstract option attribute type diff --git a/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AttributeTypeInterface.php b/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AttributeTypeInterface.php index 7315665e85d..ed0f2e81e98 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AttributeTypeInterface.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/AttributeTypeInterface.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\FlexibleEntityBundle\AttributeType; -use Symfony\Component\Form\FormFactoryInterface; -use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; +use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; +use Symfony\Component\Form\FormFactoryInterface; /** * The attribute type interface diff --git a/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/MetricType.php b/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/MetricType.php index 7ad4be5feeb..9fbf3e5f8d4 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/MetricType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/AttributeType/MetricType.php @@ -3,9 +3,9 @@ namespace Oro\Bundle\FlexibleEntityBundle\AttributeType; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; +use Oro\Bundle\FlexibleEntityBundle\Form\Validator\ConstraintGuesserInterface; use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; use Oro\Bundle\MeasureBundle\Manager\MeasureManager; -use Oro\Bundle\FlexibleEntityBundle\Form\Validator\ConstraintGuesserInterface; /** * Metric attribute type diff --git a/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/Compiler/AddAttributeTypeCompilerPass.php b/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/Compiler/AddAttributeTypeCompilerPass.php index 635b54cd69d..be090116e24 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/Compiler/AddAttributeTypeCompilerPass.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/Compiler/AddAttributeTypeCompilerPass.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FlexibleEntityBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; +use Symfony\Component\DependencyInjection\Reference; /** * CompilerPass to add attribute type to factory diff --git a/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/Compiler/AddManagerCompilerPass.php b/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/Compiler/AddManagerCompilerPass.php index 63bff8d509d..696b031ab56 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/Compiler/AddManagerCompilerPass.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/Compiler/AddManagerCompilerPass.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FlexibleEntityBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; +use Symfony\Component\DependencyInjection\Reference; /** * CompilerPass to add flexible manager to connector diff --git a/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/OroFlexibleEntityExtension.php b/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/OroFlexibleEntityExtension.php index 3d1e92f864f..6955bdfea85 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/OroFlexibleEntityExtension.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/DependencyInjection/OroFlexibleEntityExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FlexibleEntityBundle\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; use Symfony\Component\Yaml\Yaml; /** diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Doctrine/ORM/FlexibleQueryBuilder.php b/src/Oro/Bundle/FlexibleEntityBundle/Doctrine/ORM/FlexibleQueryBuilder.php index a5377a7fa1f..2dfa4285bb2 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Doctrine/ORM/FlexibleQueryBuilder.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Doctrine/ORM/FlexibleQueryBuilder.php @@ -3,9 +3,9 @@ namespace Oro\Bundle\FlexibleEntityBundle\Doctrine\ORM; use Doctrine\ORM\QueryBuilder; -use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; use Oro\Bundle\FlexibleEntityBundle\Exception\FlexibleQueryException; +use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; /** * Aims to customize a query builder to add useful shortcuts which allow to easily select, filter or sort a flexible diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Attribute.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Attribute.php index 0c1d09d4630..9aa91b49a54 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Attribute.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Attribute.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity; -use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityAttribute; -use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; -use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; +use Doctrine\ORM\Mapping as ORM; use Gedmo\Mapping\Annotation as Gedmo; +use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityAttribute; +use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; /** * Base entity attribute diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/AttributeOption.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/AttributeOption.php index 030af2cda1a..84462cfc877 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/AttributeOption.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/AttributeOption.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity; -use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityAttributeOption; -use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Mapping as ORM; +use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityAttributeOption; /** * Attribute options diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/AttributeOptionValue.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/AttributeOptionValue.php index 1a2aaae76c5..7713559ba8a 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/AttributeOptionValue.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/AttributeOptionValue.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity; -use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityAttributeOptionValue; use Doctrine\ORM\Mapping as ORM; +use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityAttributeOptionValue; /** * Attribute option values diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttribute.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttribute.php index 7835ada34e2..31211894768 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttribute.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttribute.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity\Mapping; +use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Mapping as ORM; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttributeOption; -use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * Base Doctrine ORM entity attribute diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttributeOption.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttributeOption.php index 2e7de022729..441d1512c9b 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttributeOption.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttributeOption.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity\Mapping; -use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Mapping as ORM; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttributeOption; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttributeOptionValue; diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttributeOptionValue.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttributeOptionValue.php index 7f34249a0cb..890227b70d5 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttributeOptionValue.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityAttributeOptionValue.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity\Mapping; -use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttributeOptionValue; -use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttributeOption; use Doctrine\ORM\Mapping as ORM; +use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttributeOption; +use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttributeOptionValue; /** * Base Doctrine ORM entity attribute option value diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityFlexible.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityFlexible.php index 9ef33eded8c..cd938dca960 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityFlexible.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityFlexible.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity\Mapping; -use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Inflector\Inflector; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Inflector\Inflector; +use Doctrine\ORM\Mapping as ORM; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractFlexible; -use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractFlexibleValue; +use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; /** * Base Doctrine ORM entity diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityFlexibleValue.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityFlexibleValue.php index c0e21fe078b..a04b0361528 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityFlexibleValue.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Mapping/AbstractEntityFlexibleValue.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity\Mapping; -use Symfony\Component\HttpFoundation\File\File; -use Oro\Bundle\FlexibleEntityBundle\Model\AbstractFlexible; +use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Mapping as ORM; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; +use Oro\Bundle\FlexibleEntityBundle\Model\AbstractFlexible; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractFlexibleValue; -use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; +use Symfony\Component\HttpFoundation\File\File; /** * Base Doctrine ORM entity attribute value diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Media.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Media.php index 6023ddba48e..56da93694ec 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Media.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Media.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity; -use Symfony\Component\HttpFoundation\File\File; - use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\HttpFoundation\File\File; + /** * Media entity * File is not save here diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Repository/AttributeRepository.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Repository/AttributeRepository.php index e4ab026e5e4..be4fe7e8de4 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Repository/AttributeRepository.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Repository/AttributeRepository.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity\Repository; -use Doctrine\ORM\EntityRepository; use Doctrine\ORM\AbstractQuery; +use Doctrine\ORM\EntityRepository; /** * Attribute repository diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Repository/FlexibleEntityRepository.php b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Repository/FlexibleEntityRepository.php index 6f3809f1c7f..87973a52b93 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Entity/Repository/FlexibleEntityRepository.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Entity/Repository/FlexibleEntityRepository.php @@ -3,15 +3,15 @@ namespace Oro\Bundle\FlexibleEntityBundle\Entity\Repository; use Doctrine\ORM\EntityRepository; -use Doctrine\ORM\Tools\Pagination\Paginator; use Doctrine\ORM\QueryBuilder; +use Doctrine\ORM\Tools\Pagination\Paginator; +use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; use Oro\Bundle\FlexibleEntityBundle\Doctrine\ORM\FlexibleQueryBuilder; -use Oro\Bundle\FlexibleEntityBundle\Exception\UnknownAttributeException; -use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TranslatableInterface; -use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\ScopableInterface; use Oro\Bundle\FlexibleEntityBundle\Entity\Attribute; -use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; +use Oro\Bundle\FlexibleEntityBundle\Exception\UnknownAttributeException; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractFlexible; +use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\ScopableInterface; +use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TranslatableInterface; /** * Base repository for flexible entity diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Event/AbstractFilterEvent.php b/src/Oro/Bundle/FlexibleEntityBundle/Event/AbstractFilterEvent.php index 260382f4bd8..9989c672296 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Event/AbstractFilterEvent.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Event/AbstractFilterEvent.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\FlexibleEntityBundle\Event; -use Symfony\Component\EventDispatcher\Event; use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; +use Symfony\Component\EventDispatcher\Event; /** * Filter event allows to know the create flexible attribute diff --git a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/AddAttributesListener.php b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/AddAttributesListener.php index b28e1d3b89b..651a3da3166 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/AddAttributesListener.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/AddAttributesListener.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\FlexibleEntityBundle\EventListener; -use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\Common\EventSubscriber; use Doctrine\Common\Util\ClassUtils; +use Doctrine\ORM\Event\LifecycleEventArgs; use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityFlexible; /** diff --git a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/AttributeCacheListener.php b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/AttributeCacheListener.php index 22f26914634..c10fc2946b7 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/AttributeCacheListener.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/AttributeCacheListener.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\FlexibleEntityBundle\EventListener; -use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; - -use Doctrine\ORM\Event\OnFlushEventArgs; use Doctrine\Common\EventSubscriber; +use Doctrine\ORM\Event\OnFlushEventArgs; use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\AttributeRepository; +use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; + /** * This listener is used to listen to insert or delete * event from Doctrine to purge attribute list cache diff --git a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/DefaultValueListener.php b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/DefaultValueListener.php index 68c9570ef2c..86314f07adc 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/DefaultValueListener.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/DefaultValueListener.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\FlexibleEntityBundle\EventListener; -use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; use Doctrine\Common\EventSubscriber; use Doctrine\ORM\Event\LifecycleEventArgs; +use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; /** * Aims to add default value data from attribute if defined diff --git a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/InitializeValuesListener.php b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/InitializeValuesListener.php index 54ffc6f23d9..9194155d4e7 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/InitializeValuesListener.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/InitializeValuesListener.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\FlexibleEntityBundle\EventListener; -use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleInterface; - use Oro\Bundle\FlexibleEntityBundle\Event\FilterFlexibleEvent; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; + use Oro\Bundle\FlexibleEntityBundle\FlexibleEntityEvents; +use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleInterface; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** * Aims to add all values / required values when create or load a new flexible : diff --git a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/RequiredValueListener.php b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/RequiredValueListener.php index aa3a4454b1f..1aaa50540d6 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/RequiredValueListener.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/RequiredValueListener.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\FlexibleEntityBundle\EventListener; -use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleInterface; -use Oro\Bundle\FlexibleEntityBundle\Exception\HasRequiredValueException; use Doctrine\Common\EventSubscriber; +use Doctrine\Common\Util\ClassUtils; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Events; -use Doctrine\Common\Util\ClassUtils; +use Oro\Bundle\FlexibleEntityBundle\Exception\HasRequiredValueException; +use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/ScopableListener.php b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/ScopableListener.php index 5af304bf157..e7db5afab20 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/ScopableListener.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/ScopableListener.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\FlexibleEntityBundle\EventListener; -use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\Common\EventSubscriber; use Doctrine\Common\Util\ClassUtils; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Doctrine\ORM\Event\LifecycleEventArgs; use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\ScopableInterface; use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleInterface; +use Symfony\Component\DependencyInjection\ContainerAwareInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Aims to inject selected scope into loaded entity diff --git a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/TimestampableListener.php b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/TimestampableListener.php index a6c1f58cafc..5ee0c667a93 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/TimestampableListener.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/TimestampableListener.php @@ -5,8 +5,8 @@ use Doctrine\Common\EventSubscriber; use Doctrine\Common\Persistence\ObjectManager; use Doctrine\ORM\Event\LifecycleEventArgs; -use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TimestampableInterface; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractFlexible; +use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TimestampableInterface; /** * Aims to add timestambable behavior diff --git a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/TranslatableListener.php b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/TranslatableListener.php index 1f47f25bd4a..b75efea7bf4 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/EventListener/TranslatableListener.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/EventListener/TranslatableListener.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\FlexibleEntityBundle\EventListener; -use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\Common\EventSubscriber; use Doctrine\Common\Util\ClassUtils; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleInterface; +use Doctrine\ORM\Event\LifecycleEventArgs; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttributeOption; use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TranslatableInterface; +use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleInterface; +use Symfony\Component\DependencyInjection\ContainerAwareInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Aims to inject selected locale into loaded translatable container, ie, not store locale code but contains some diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/AttributeTypeSubscriber.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/AttributeTypeSubscriber.php index 3f7823c2e50..2f31d2a5f6b 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/AttributeTypeSubscriber.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/AttributeTypeSubscriber.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\EventListener; -use Symfony\Component\Form\Form; -use Oro\Bundle\FlexibleEntityBundle\Form\Type\AttributeOptionType; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; +use Oro\Bundle\FlexibleEntityBundle\Form\Type\AttributeOptionType; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Symfony\Component\Form\Form; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormFactoryInterface; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** * Aims to customized attribute form type diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/CollectionTypeSubscriber.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/CollectionTypeSubscriber.php index 896df9a49a0..e6b216c446a 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/CollectionTypeSubscriber.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/CollectionTypeSubscriber.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\EventListener; +use Doctrine\Common\Collections\ArrayCollection; +use Oro\Bundle\FlexibleEntityBundle\Entity\Collection; use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityFlexibleValue; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractFlexibleValue; -use Symfony\Component\Form\FormEvent; -use Symfony\Component\Form\FormEvents; -use Doctrine\Common\Collections\ArrayCollection; use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Symfony\Component\Form\FormEvent; -use Oro\Bundle\FlexibleEntityBundle\Entity\Collection; +use Symfony\Component\Form\FormEvents; /** * Collection type subscriber @@ -22,7 +22,7 @@ class CollectionTypeSubscriber implements EventSubscriberInterface public static function getSubscribedEvents() { return array( - FormEvents::POST_BIND => 'postBind', + FormEvents::POST_SUBMIT => 'postBind', FormEvents::PRE_SET_DATA => 'preSet', ); } diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/FlexibleValueSubscriber.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/FlexibleValueSubscriber.php index 0594c4921ae..8cb411680ee 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/FlexibleValueSubscriber.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/EventListener/FlexibleValueSubscriber.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\EventListener; +use Oro\Bundle\FlexibleEntityBundle\AttributeType\AttributeTypeFactory; +use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormFactoryInterface; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; -use Oro\Bundle\FlexibleEntityBundle\AttributeType\AttributeTypeFactory; use Symfony\Component\Form\FormInterface; /** diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeOptionType.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeOptionType.php index 9cf9999b5ae..01a39fa33c2 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeOptionType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeOptionType.php @@ -2,11 +2,14 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CollectionType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\AbstractType; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Type for option attribute form (independent of persistence) @@ -34,7 +37,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) */ protected function addFieldId(FormBuilderInterface $builder) { - $builder->add('id', 'hidden'); + $builder->add('id', HiddenType::class); } /** @@ -43,7 +46,7 @@ protected function addFieldId(FormBuilderInterface $builder) */ protected function addFieldSortOrder(FormBuilderInterface $builder) { - $builder->add('sort_order', 'integer', array('required' => false)); + $builder->add('sort_order', IntegerType::class, array('required' => false)); } /** @@ -63,7 +66,7 @@ protected function addFieldOptionValues(FormBuilderInterface $builder) { $builder->add( 'optionValues', - 'collection', + CollectionType::class, array( 'type' => new AttributeOptionValueType(), 'allow_add' => true, @@ -76,7 +79,7 @@ protected function addFieldOptionValues(FormBuilderInterface $builder) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -88,7 +91,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_flexibleentity_attribute_option'; } diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeOptionValueType.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeOptionValueType.php index 7cad5b9d9b5..2327e586cbd 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeOptionValueType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeOptionValueType.php @@ -2,11 +2,12 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\AbstractType; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Type for option value attribute form (independent of persistence) @@ -32,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) */ protected function addFieldId(FormBuilderInterface $builder) { - $builder->add('id', 'hidden'); + $builder->add('id', HiddenType::class); } /** @@ -41,7 +42,7 @@ protected function addFieldId(FormBuilderInterface $builder) */ protected function addFieldLocale(FormBuilderInterface $builder) { - $builder->add('locale', 'hidden'); + $builder->add('locale', HiddenType::class); } /** @@ -56,7 +57,7 @@ protected function addFieldValue(FormBuilderInterface $builder) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -68,7 +69,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_flexibleentity_attribute_option_value'; } diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeType.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeType.php index b6a2c7881d7..743d269f80c 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/AttributeType.php @@ -3,10 +3,14 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Oro\Bundle\FlexibleEntityBundle\Form\EventListener\AttributeTypeSubscriber; -use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\IntegerType; +use Symfony\Component\Form\Extension\Core\Type\TextType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Type for attribute form @@ -59,7 +63,7 @@ protected function addSubscriber(FormBuilderInterface $builder) */ protected function addFieldId(FormBuilderInterface $builder) { - $builder->add('id', 'hidden'); + $builder->add('id', HiddenType::class); } /** @@ -68,7 +72,7 @@ protected function addFieldId(FormBuilderInterface $builder) */ protected function addFieldCode(FormBuilderInterface $builder) { - $builder->add('code', 'text', array('required' => true)); + $builder->add('code', TextType::class, array('required' => true)); } /** @@ -77,7 +81,7 @@ protected function addFieldCode(FormBuilderInterface $builder) */ protected function addFieldAttributeType(FormBuilderInterface $builder) { - $builder->add('attributeType', 'choice', array('choices' => $this->getAttributeTypeChoices())); + $builder->add('attributeType', ChoiceType::class, array('choices' => $this->getAttributeTypeChoices())); } /** @@ -86,7 +90,7 @@ protected function addFieldAttributeType(FormBuilderInterface $builder) */ protected function addFieldRequired(FormBuilderInterface $builder) { - $builder->add('required', 'choice', array('choices' => array('No', 'Yes'))); + $builder->add('required', ChoiceType::class, array('choices' => array('No', 'Yes'))); } /** @@ -95,7 +99,7 @@ protected function addFieldRequired(FormBuilderInterface $builder) */ protected function addFieldUnique(FormBuilderInterface $builder) { - $builder->add('unique', 'choice', array('choices' => array('No', 'Yes'))); + $builder->add('unique', ChoiceType::class, array('choices' => array('No', 'Yes'))); } /** @@ -104,7 +108,7 @@ protected function addFieldUnique(FormBuilderInterface $builder) */ protected function addFieldDefaultValue(FormBuilderInterface $builder) { - $builder->add('default_value', 'text', array('required' => false)); + $builder->add('default_value', TextType::class, array('required' => false)); } /** @@ -113,7 +117,7 @@ protected function addFieldDefaultValue(FormBuilderInterface $builder) */ protected function addFieldSearchable(FormBuilderInterface $builder) { - $builder->add('searchable', 'choice', array('choices' => array('No', 'Yes'))); + $builder->add('searchable', ChoiceType::class, array('choices' => array('No', 'Yes'))); } /** @@ -122,7 +126,7 @@ protected function addFieldSearchable(FormBuilderInterface $builder) */ protected function addFieldTranslatable(FormBuilderInterface $builder) { - $builder->add('translatable', 'choice', array('choices' => array('No', 'Yes'))); + $builder->add('translatable', ChoiceType::class, array('choices' => array('No', 'Yes'))); } /** @@ -131,7 +135,7 @@ protected function addFieldTranslatable(FormBuilderInterface $builder) */ protected function addFieldScopable(FormBuilderInterface $builder) { - $builder->add('scopable', 'choice', array('choices' => array('No', 'Yes'))); + $builder->add('scopable', ChoiceType::class, array('choices' => array('No', 'Yes'))); } /** @@ -140,13 +144,13 @@ protected function addFieldScopable(FormBuilderInterface $builder) */ protected function addPositionField(FormBuilderInterface $builder) { - $builder->add('sortOrder', 'integer', array('label' => 'Position')); + $builder->add('sortOrder', IntegerType::class, array('label' => 'Position')); } /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -158,7 +162,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_flexibleentity_attribute'; } diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/CollectionAbstract.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/CollectionAbstract.php index 3a624913267..0369b7bb659 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/CollectionAbstract.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/CollectionAbstract.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; +use Oro\Bundle\FlexibleEntityBundle\Form\EventListener\CollectionTypeSubscriber; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; -use Oro\Bundle\FlexibleEntityBundle\Form\EventListener\CollectionTypeSubscriber; +use Symfony\Component\Form\FormBuilderInterface; /** * Collection diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/CollectionItemAbstract.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/CollectionItemAbstract.php index da3989633d1..50fd5fe5fb1 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/CollectionItemAbstract.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/CollectionItemAbstract.php @@ -3,7 +3,7 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Collection item @@ -20,7 +20,7 @@ abstract public function getTypesArray(); /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults( diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/EmailType.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/EmailType.php index c73bfd9838e..fe24dafc9bd 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/EmailType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/EmailType.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList; -use Symfony\Component\Validator\Constraints\Email; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Validator\Constraints\Email; /** * Email type diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/FlexibleType.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/FlexibleType.php index 9f966eaab54..1a586f1e48c 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/FlexibleType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/FlexibleType.php @@ -3,11 +3,13 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; - +use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\AbstractType; + +use Symfony\Component\Form\Extension\Core\Type\CollectionType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Base flexible form type @@ -58,7 +60,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) */ public function addEntityFields(FormBuilderInterface $builder) { - $builder->add('id', 'hidden'); + $builder->add('id', HiddenType::class); } /** @@ -71,7 +73,7 @@ public function addDynamicAttributesFields(FormBuilderInterface $builder, array { $builder->add( 'values', - 'collection', + CollectionType::class, array( 'type' => $this->valueFormAlias, 'allow_add' => true, @@ -85,7 +87,7 @@ public function addDynamicAttributesFields(FormBuilderInterface $builder, array /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -98,7 +100,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_flexibleentity_entity'; } diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/FlexibleValueType.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/FlexibleValueType.php index 3a06004ea34..86594ee33ff 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/FlexibleValueType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/FlexibleValueType.php @@ -2,11 +2,12 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; +use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Base flexible value form type @@ -42,14 +43,14 @@ public function __construct(FlexibleManager $flexibleManager, EventSubscriberInt */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('id', 'hidden'); + $builder->add('id', HiddenType::class); $builder->addEventSubscriber($this->subscriber); } /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -62,7 +63,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_flexibleentity_value'; } diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/MediaType.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/MediaType.php index d8d1e8a4a49..8aedece1ec3 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/MediaType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/MediaType.php @@ -2,11 +2,13 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; +use Symfony\Component\Form\Extension\Core\Type\FileType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\AbstractType; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Form type linked to Media entity @@ -19,10 +21,10 @@ class MediaType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('file', 'file', array('required' => false)) + ->add('file', FileType::class, array('required' => false)) ->add( 'removed', - 'checkbox', + CheckboxType::class, array( 'required' => false, 'label' => 'Remove media', @@ -36,7 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -48,7 +50,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_media'; } diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/MetricType.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/MetricType.php index 22ccca57b64..15158d80013 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/MetricType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/MetricType.php @@ -2,9 +2,12 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\NumberType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Form type related to metric entity @@ -22,15 +25,15 @@ public function buildForm(FormBuilderInterface $builder, array $options) } $builder - ->add('id', 'hidden') - ->add('data', 'number') - ->add('unit', 'choice', $unitOptions); + ->add('id', HiddenType::class) + ->add('data', NumberType::class) + ->add('unit', ChoiceType::class, $unitOptions); } /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -44,7 +47,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_flexibleentity_metric'; } diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/PriceType.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/PriceType.php index ff83ab29d29..33a16680667 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/PriceType.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Type/PriceType.php @@ -2,9 +2,12 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Type; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\NumberType; +use Symfony\Component\Form\Extension\Core\Type\TextType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * Form type related to price entity @@ -18,15 +21,15 @@ class PriceType extends AbstractType */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('id', 'hidden'); - $builder->add('data', 'number'); - $builder->add('currency', 'text'); + $builder->add('id', HiddenType::class); + $builder->add('data', NumberType::class); + $builder->add('currency', TextType::class); } /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -38,7 +41,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_flexibleentity_price'; } diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Form/Validator/AttributeConstraintGuesser.php b/src/Oro/Bundle/FlexibleEntityBundle/Form/Validator/AttributeConstraintGuesser.php index 6d770025310..7cf3270e732 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Form/Validator/AttributeConstraintGuesser.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Form/Validator/AttributeConstraintGuesser.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FlexibleEntityBundle\Form\Validator; -use Symfony\Component\Validator\Constraints; +use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; -use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; +use Symfony\Component\Validator\Constraints; /** * Attribute constraint guesser diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Grid/EventListener.php b/src/Oro/Bundle/FlexibleEntityBundle/Grid/EventListener.php index 0e626cd2e7d..7bbadea5fbd 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Grid/EventListener.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Grid/EventListener.php @@ -5,12 +5,12 @@ use Oro\Bundle\DataGridBundle\Common\Object; use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; +use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; use Oro\Bundle\DataGridBundle\Event\BuildAfter; use Oro\Bundle\DataGridBundle\Event\BuildBefore; -use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; +use Oro\Bundle\DataGridBundle\Extension\Formatter\Configuration as FormatterConfiguration; use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface; use Oro\Bundle\DataGridBundle\Extension\Sorter\Configuration as OrmSorterConfiguration; -use Oro\Bundle\DataGridBundle\Extension\Formatter\Configuration as FormatterConfiguration; use Oro\Bundle\FilterBundle\Extension\Configuration as FilterConfiguration; use Oro\Bundle\FilterBundle\Extension\Orm\FilterInterface; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; @@ -18,8 +18,8 @@ use Oro\Bundle\FlexibleEntityBundle\Grid\Extension\Filter\FlexibleFilterUtility; use Oro\Bundle\FlexibleEntityBundle\Grid\Extension\Formatter\Property\FlexibleFieldProperty; use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; -use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; +use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessor; diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/AbstractFlexibleDateFilter.php b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/AbstractFlexibleDateFilter.php index 18eaa1aab81..93a9b6f5133 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/AbstractFlexibleDateFilter.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/AbstractFlexibleDateFilter.php @@ -4,10 +4,10 @@ use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Form\FormFactoryInterface; - use Oro\Bundle\FilterBundle\Extension\Orm\AbstractDateFilter; + use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; +use Symfony\Component\Form\FormFactoryInterface; abstract class AbstractFlexibleDateFilter extends AbstractDateFilter { diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleBooleanFilter.php b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleBooleanFilter.php index bbee309072e..84086398f07 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleBooleanFilter.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleBooleanFilter.php @@ -4,10 +4,10 @@ use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Form\FormFactoryInterface; - use Oro\Bundle\FilterBundle\Extension\Orm\BooleanFilter; + use Oro\Bundle\FilterBundle\Form\Type\Filter\BooleanFilterType; +use Symfony\Component\Form\FormFactoryInterface; class FlexibleBooleanFilter extends BooleanFilter { diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleChoiceFilter.php b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleChoiceFilter.php index 0df68cd6921..a4659a918d9 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleChoiceFilter.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleChoiceFilter.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\FlexibleEntityBundle\Grid\Extension\Filter; -use Doctrine\ORM\QueryBuilder; use Doctrine\Common\Persistence\ObjectRepository; +use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Form\FormFactoryInterface; +use Oro\Bundle\FilterBundle\Extension\Orm\ChoiceFilter; use Oro\Bundle\FlexibleEntityBundle\Entity\Attribute; -use Oro\Bundle\FilterBundle\Extension\Orm\ChoiceFilter; use Oro\Bundle\FlexibleEntityBundle\Entity\AttributeOption; +use Symfony\Component\Form\FormFactoryInterface; class FlexibleChoiceFilter extends ChoiceFilter { diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleEntityFilter.php b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleEntityFilter.php index c00704f029d..ff38eae0b22 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleEntityFilter.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleEntityFilter.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\FlexibleEntityBundle\Grid\Extension\Filter; -use Doctrine\ORM\QueryBuilder; use Doctrine\Common\Collections\ArrayCollection; - -use Symfony\Component\Form\FormFactoryInterface; +use Doctrine\ORM\QueryBuilder; use Oro\Bundle\FilterBundle\Extension\Orm\EntityFilter; +use Symfony\Component\Form\FormFactoryInterface; + class FlexibleEntityFilter extends EntityFilter { const BACKEND_TYPE_KEY = 'backend_type'; diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleFilterUtility.php b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleFilterUtility.php index 332b2d925e6..52d6badd916 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleFilterUtility.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleFilterUtility.php @@ -5,9 +5,9 @@ use Doctrine\ORM\QueryBuilder; use Oro\Bundle\FilterBundle\Extension\Configuration; +use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository; use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; -use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository; class FlexibleFilterUtility { diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleNumberFilter.php b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleNumberFilter.php index 6f6a9d6e507..38136d8b5a7 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleNumberFilter.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleNumberFilter.php @@ -4,10 +4,10 @@ use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Form\FormFactoryInterface; - use Oro\Bundle\FilterBundle\Extension\Orm\NumberFilter; +use Symfony\Component\Form\FormFactoryInterface; + class FlexibleNumberFilter extends NumberFilter { /** @var FlexibleFilterUtility */ diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleStringFilter.php b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleStringFilter.php index 879c71aa682..5c193aae305 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleStringFilter.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Filter/FlexibleStringFilter.php @@ -4,10 +4,10 @@ use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Form\FormFactoryInterface; - use Oro\Bundle\FilterBundle\Extension\Orm\StringFilter; +use Symfony\Component\Form\FormFactoryInterface; + class FlexibleStringFilter extends StringFilter { /** @var FlexibleFilterUtility */ diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Formatter/Property/FlexibleFieldProperty.php b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Formatter/Property/FlexibleFieldProperty.php index b74f5c9bd36..b58d493832f 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Formatter/Property/FlexibleFieldProperty.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Grid/Extension/Formatter/Property/FlexibleFieldProperty.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\FlexibleEntityBundle\Grid\Extension\Formatter\Property; -use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\FieldProperty; +use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; class FlexibleFieldProperty extends FieldProperty { diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Manager/FlexibleManager.php b/src/Oro/Bundle/FlexibleEntityBundle/Manager/FlexibleManager.php index e41be6017b6..31db96c74e3 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Manager/FlexibleManager.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Manager/FlexibleManager.php @@ -5,23 +5,23 @@ use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\Persistence\ObjectRepository; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AttributeTypeFactory; -use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; -use Oro\Bundle\FlexibleEntityBundle\FlexibleEntityEvents; +use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository; use Oro\Bundle\FlexibleEntityBundle\Event\FilterAttributeEvent; use Oro\Bundle\FlexibleEntityBundle\Event\FilterFlexibleEvent; use Oro\Bundle\FlexibleEntityBundle\Event\FilterFlexibleValueEvent; use Oro\Bundle\FlexibleEntityBundle\Exception\FlexibleConfigurationException; -use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleInterface; -use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; -use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TranslatableInterface; -use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\ScopableInterface; +use Oro\Bundle\FlexibleEntityBundle\FlexibleEntityEvents; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttributeOption; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttributeOptionValue; -use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository; +use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\ScopableInterface; +use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TranslatableInterface; +use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleInterface; +use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; /** * Flexible object manager, allow to use flexible entity in storage agnostic way diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Manager/SimpleManager.php b/src/Oro/Bundle/FlexibleEntityBundle/Manager/SimpleManager.php index b3c245ae736..4d7a15acb1e 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Manager/SimpleManager.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Manager/SimpleManager.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FlexibleEntityBundle\Manager; -use Oro\Bundle\FlexibleEntityBundle\Model\Entity; - use Doctrine\Common\Persistence\ObjectManager; +use Oro\Bundle\FlexibleEntityBundle\Model\Entity; + /** * Aims to manage simple entity */ diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Model/AbstractFlexible.php b/src/Oro/Bundle/FlexibleEntityBundle/Model/AbstractFlexible.php index ba8c896306c..af86158a9ca 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Model/AbstractFlexible.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Model/AbstractFlexible.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\FlexibleEntityBundle\Model; use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\ScopableInterface; -use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TranslatableInterface; use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TimestampableInterface; +use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TranslatableInterface; /** * Abstract entity, independent of storage diff --git a/src/Oro/Bundle/FlexibleEntityBundle/Model/AbstractFlexibleValue.php b/src/Oro/Bundle/FlexibleEntityBundle/Model/AbstractFlexibleValue.php index f691d90881a..706131e9238 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/Model/AbstractFlexibleValue.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/Model/AbstractFlexibleValue.php @@ -4,8 +4,8 @@ use Oro\Bundle\FlexibleEntityBundle\Exception\FlexibleConfigurationException; -use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TranslatableInterface; use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\ScopableInterface; +use Oro\Bundle\FlexibleEntityBundle\Model\Behavior\TranslatableInterface; /** * Abstract entity value, independent of storage diff --git a/src/Oro/Bundle/FlexibleEntityBundle/OroFlexibleEntityBundle.php b/src/Oro/Bundle/FlexibleEntityBundle/OroFlexibleEntityBundle.php index 486f5310762..18cf5c49945 100644 --- a/src/Oro/Bundle/FlexibleEntityBundle/OroFlexibleEntityBundle.php +++ b/src/Oro/Bundle/FlexibleEntityBundle/OroFlexibleEntityBundle.php @@ -1,10 +1,10 @@ getIdPropertyPathFromEntityManager($em, $className); } $this->property = $property; - $this->propertyAccessor = PropertyAccess::getPropertyAccessor(); + $this->propertyAccessor = PropertyAccess::createPropertyAccessor(); $this->propertyPath = new PropertyPath($this->property); if (null !== $queryBuilderCallback && !is_callable($queryBuilderCallback)) { throw new UnexpectedTypeException($queryBuilderCallback, 'callable'); diff --git a/src/Oro/Bundle/FormBundle/Form/EventListener/FixArrayToStringListener.php b/src/Oro/Bundle/FormBundle/Form/EventListener/FixArrayToStringListener.php index 3e27a9d3e28..c6ce1dd96c4 100644 --- a/src/Oro/Bundle/FormBundle/Form/EventListener/FixArrayToStringListener.php +++ b/src/Oro/Bundle/FormBundle/Form/EventListener/FixArrayToStringListener.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\FormBundle\Form\EventListener; -use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\FormEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Symfony\Component\Form\FormEvent; +use Symfony\Component\Form\FormEvents; class FixArrayToStringListener implements EventSubscriberInterface { @@ -28,6 +28,6 @@ public function preBind(FormEvent $event) public static function getSubscribedEvents() { - return array(FormEvents::PRE_BIND => 'preBind'); + return array(FormEvents::PRE_SUBMIT => 'preBind'); } } diff --git a/src/Oro/Bundle/FormBundle/Form/Extension/ClientValidationExtension.php b/src/Oro/Bundle/FormBundle/Form/Extension/ClientValidationExtension.php index 3c8dce54beb..281015f39ec 100644 --- a/src/Oro/Bundle/FormBundle/Form/Extension/ClientValidationExtension.php +++ b/src/Oro/Bundle/FormBundle/Form/Extension/ClientValidationExtension.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\FormBundle\Form\Extension; use Symfony\Component\Form\AbstractTypeExtension; -use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\OptionsResolverInterface; class ClientValidationExtension extends AbstractTypeExtension diff --git a/src/Oro/Bundle/FormBundle/Form/Extension/ConstraintAsOptionExtension.php b/src/Oro/Bundle/FormBundle/Form/Extension/ConstraintAsOptionExtension.php index 689de490b15..0662539c1ac 100644 --- a/src/Oro/Bundle/FormBundle/Form/Extension/ConstraintAsOptionExtension.php +++ b/src/Oro/Bundle/FormBundle/Form/Extension/ConstraintAsOptionExtension.php @@ -5,8 +5,8 @@ use Oro\Bundle\FormBundle\Validator\ConstraintFactory; use Symfony\Component\Form\AbstractTypeExtension; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\Options; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; class ConstraintAsOptionExtension extends AbstractTypeExtension { diff --git a/src/Oro/Bundle/FormBundle/Form/Extension/DataBlockExtension.php b/src/Oro/Bundle/FormBundle/Form/Extension/DataBlockExtension.php index 78357e9eca3..bf180d4ae0e 100644 --- a/src/Oro/Bundle/FormBundle/Form/Extension/DataBlockExtension.php +++ b/src/Oro/Bundle/FormBundle/Form/Extension/DataBlockExtension.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\FormBundle\Form\Extension; -use Symfony\Component\Form\FormView; -use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\AbstractTypeExtension; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\OptionsResolverInterface; class DataBlockExtension extends AbstractTypeExtension diff --git a/src/Oro/Bundle/FormBundle/Form/Twig/DataBlocks.php b/src/Oro/Bundle/FormBundle/Form/Twig/DataBlocks.php index fed3fc7aad4..08881df9f01 100644 --- a/src/Oro/Bundle/FormBundle/Form/Twig/DataBlocks.php +++ b/src/Oro/Bundle/FormBundle/Form/Twig/DataBlocks.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\FormBundle\Form\Twig; +use Oro\Bundle\FormBundle\Config\BlockConfig; +use Oro\Bundle\FormBundle\Config\FormConfig; + use Oro\Bundle\FormBundle\Config\SubBlockConfig; use Symfony\Component\Form\FormView; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessor; -use Oro\Bundle\FormBundle\Config\BlockConfig; -use Oro\Bundle\FormBundle\Config\FormConfig; - class DataBlocks { /** diff --git a/src/Oro/Bundle/FormBundle/Form/Type/EntityIdentifierType.php b/src/Oro/Bundle/FormBundle/Form/Type/EntityIdentifierType.php index aa0ad949e82..142e2df099a 100644 --- a/src/Oro/Bundle/FormBundle/Form/Type/EntityIdentifierType.php +++ b/src/Oro/Bundle/FormBundle/Form/Type/EntityIdentifierType.php @@ -2,20 +2,21 @@ namespace Oro\Bundle\FormBundle\Form\Type; -use Doctrine\ORM\EntityManager; use Doctrine\Common\Persistence\ManagerRegistry; - -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\Options; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; - +use Doctrine\ORM\EntityManager; use Oro\Bundle\FormBundle\Form\DataTransformer\ArrayToStringTransformer; + use Oro\Bundle\FormBundle\Form\DataTransformer\EntitiesToIdsTransformer; use Oro\Bundle\FormBundle\Form\DataTransformer\EntityToIdTransformer; use Oro\Bundle\FormBundle\Form\EventListener\FixArrayToStringListener; use Oro\Bundle\FormBundle\Form\Exception\FormException; +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\Options; +use Symfony\Component\OptionsResolver\OptionsResolver; + class EntityIdentifierType extends AbstractType { const NAME = 'oro_entity_identifier'; @@ -72,7 +73,7 @@ protected function createEntitiesToIdsTransformer(array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -145,7 +146,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -155,6 +156,6 @@ public function getName() */ public function getParent() { - return 'hidden'; + return HiddenType::class; } } diff --git a/src/Oro/Bundle/FormBundle/Form/Type/MultipleEntityType.php b/src/Oro/Bundle/FormBundle/Form/Type/MultipleEntityType.php index 5d072fc75b8..52c2a479653 100644 --- a/src/Oro/Bundle/FormBundle/Form/Type/MultipleEntityType.php +++ b/src/Oro/Bundle/FormBundle/Form/Type/MultipleEntityType.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\FormBundle\Form\Type; use Doctrine\Common\Inflector\Inflector; +use Oro\Bundle\EntityBundle\ORM\OroEntityManager; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\EntityBundle\ORM\OroEntityManager; +use Symfony\Component\OptionsResolver\OptionsResolver; class MultipleEntityType extends AbstractType { @@ -80,7 +80,7 @@ function (FormEvent $event) use ($em, $class) { /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setRequired(array('class')); $resolver->setDefaults( @@ -120,7 +120,7 @@ protected function setOptionToView(FormView $view, array $options, $option) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_multiple_entity'; } diff --git a/src/Oro/Bundle/FormBundle/Form/Type/OroDateTimeType.php b/src/Oro/Bundle/FormBundle/Form/Type/OroDateTimeType.php index a848e7a148c..9eebf098d8c 100644 --- a/src/Oro/Bundle/FormBundle/Form/Type/OroDateTimeType.php +++ b/src/Oro/Bundle/FormBundle/Form/Type/OroDateTimeType.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\FormBundle\Form\Type; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormView; -use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\Extension\Core\Type\DateTimeType; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; +use Symfony\Component\OptionsResolver\OptionsResolver; class OroDateTimeType extends AbstractType { @@ -38,7 +38,7 @@ public function finishView(FormView $view, FormInterface $form, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -56,13 +56,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ public function getParent() { - return 'datetime'; + return DateTimeType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } diff --git a/src/Oro/Bundle/FormBundle/Form/Type/OroDateType.php b/src/Oro/Bundle/FormBundle/Form/Type/OroDateType.php index 8fc8a40d7be..bfa219d3999 100644 --- a/src/Oro/Bundle/FormBundle/Form/Type/OroDateType.php +++ b/src/Oro/Bundle/FormBundle/Form/Type/OroDateType.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\FormBundle\Form\Type; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Oro\Bundle\LocaleBundle\Converter\DateTimeFormatConverterRegistry; +use Oro\Bundle\LocaleBundle\Converter\IntlDateTimeFormatConverter; +use Oro\Bundle\UIBundle\Converter\JqueryUiDateTimeFormatConverter; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; + use Symfony\Component\OptionsResolver\Options; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Translation\TranslatorInterface; -use Oro\Bundle\LocaleBundle\Converter\DateTimeFormatConverterRegistry; -use Oro\Bundle\LocaleBundle\Converter\IntlDateTimeFormatConverter; -use Oro\Bundle\UIBundle\Converter\JqueryUiDateTimeFormatConverter; - class OroDateType extends AbstractType { const NAME = 'oro_date'; @@ -28,7 +28,7 @@ public function finishView(FormView $view, FormInterface $form, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -52,7 +52,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } diff --git a/src/Oro/Bundle/FormBundle/Form/Type/OroIconType.php b/src/Oro/Bundle/FormBundle/Form/Type/OroIconType.php index 805847e5658..10f192a344e 100644 --- a/src/Oro/Bundle/FormBundle/Form/Type/OroIconType.php +++ b/src/Oro/Bundle/FormBundle/Form/Type/OroIconType.php @@ -4,7 +4,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class OroIconType extends AbstractType { @@ -28,7 +28,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -58,7 +58,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_icon_select'; } diff --git a/src/Oro/Bundle/FormBundle/Form/Type/OroJquerySelect2HiddenType.php b/src/Oro/Bundle/FormBundle/Form/Type/OroJquerySelect2HiddenType.php index 46f73bf63b4..a25723f82b2 100644 --- a/src/Oro/Bundle/FormBundle/Form/Type/OroJquerySelect2HiddenType.php +++ b/src/Oro/Bundle/FormBundle/Form/Type/OroJquerySelect2HiddenType.php @@ -2,22 +2,23 @@ namespace Oro\Bundle\FormBundle\Form\Type; +use Doctrine\ORM\EntityManager; +use Oro\Bundle\FormBundle\Autocomplete\ConverterInterface; +use Oro\Bundle\FormBundle\Autocomplete\SearchRegistry; +use Oro\Bundle\FormBundle\Form\DataTransformer\EntityToIdTransformer; +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\DataTransformerInterface; +use Symfony\Component\Form\Exception\FormException; use Symfony\Component\Form\Exception\InvalidConfigurationException; use Symfony\Component\Form\Exception\TransformationFailedException; use Symfony\Component\Form\Exception\UnexpectedTypeException; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\OptionsResolver\Options; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormView; -use Symfony\Component\Form\Exception\FormException; use Symfony\Component\Form\FormInterface; -use Symfony\Component\Form\DataTransformerInterface; -use Doctrine\ORM\EntityManager; +use Symfony\Component\Form\FormView; -use Oro\Bundle\FormBundle\Autocomplete\ConverterInterface; -use Oro\Bundle\FormBundle\Form\DataTransformer\EntityToIdTransformer; -use Oro\Bundle\FormBundle\Autocomplete\SearchRegistry; +use Symfony\Component\OptionsResolver\Options; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; class OroJquerySelect2HiddenType extends AbstractType { @@ -40,7 +41,7 @@ public function __construct(EntityManager $entityManager, SearchRegistry $regist /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $defaultConfig = array( 'placeholder' => 'oro.form.choose_value', @@ -218,7 +219,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_jqueryselect2_hidden'; } diff --git a/src/Oro/Bundle/FormBundle/Form/Type/OroMoneyType.php b/src/Oro/Bundle/FormBundle/Form/Type/OroMoneyType.php index 17ce1ff4a15..ac659d30740 100644 --- a/src/Oro/Bundle/FormBundle/Form/Type/OroMoneyType.php +++ b/src/Oro/Bundle/FormBundle/Form/Type/OroMoneyType.php @@ -2,13 +2,14 @@ namespace Oro\Bundle\FormBundle\Form\Type; +use Oro\Bundle\LocaleBundle\Formatter\NumberFormatter; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\MoneyType; use Symfony\Component\Form\FormInterface; -use Symfony\Component\Form\FormView; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; -use Oro\Bundle\LocaleBundle\Formatter\NumberFormatter; +use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; class OroMoneyType extends AbstractType { @@ -37,7 +38,7 @@ public function __construct(LocaleSettings $localeSettings, NumberFormatter $num /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -47,13 +48,13 @@ public function getName() */ public function getParent() { - return 'money'; + return MoneyType::class; } /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $currencyCode = $this->localeSettings->getCurrency(); $currencySymbol = $this->localeSettings->getCurrencySymbolByCurrency($currencyCode); diff --git a/src/Oro/Bundle/FormBundle/OroFormBundle.php b/src/Oro/Bundle/FormBundle/OroFormBundle.php index 872205b1d31..275e203c2d5 100644 --- a/src/Oro/Bundle/FormBundle/OroFormBundle.php +++ b/src/Oro/Bundle/FormBundle/OroFormBundle.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\FormBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; - use Oro\Bundle\FormBundle\DependencyInjection\Compiler\AutocompleteCompilerPass; use Oro\Bundle\FormBundle\DependencyInjection\Compiler\FormCompilerPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; + class OroFormBundle extends Bundle { /** diff --git a/src/Oro/Bundle/FormBundle/Tests/Unit/Autocomplete/SearchHandlerTest.php b/src/Oro/Bundle/FormBundle/Tests/Unit/Autocomplete/SearchHandlerTest.php index 476693120f5..4363400c660 100644 --- a/src/Oro/Bundle/FormBundle/Tests/Unit/Autocomplete/SearchHandlerTest.php +++ b/src/Oro/Bundle/FormBundle/Tests/Unit/Autocomplete/SearchHandlerTest.php @@ -2,24 +2,24 @@ namespace Oro\Bundle\FormBundle\Tests\Unit\Autocomplete; -use Doctrine\ORM\QueryBuilder; +use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\AbstractQuery; -use Doctrine\ORM\Query\Expr; -use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\ORM\EntityRepository; use Doctrine\ORM\Mapping\ClassMetadata; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\ORM\Query\Expr; +use Doctrine\ORM\QueryBuilder; use Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface; -use Oro\Bundle\SearchBundle\Engine\Indexer; - -use Oro\Bundle\SearchBundle\Query\Result; -use Oro\Bundle\SearchBundle\Query\Result\Item; use Oro\Bundle\FormBundle\Autocomplete\SearchHandler; use Oro\Bundle\FormBundle\Tests\Unit\MockHelper; +use Oro\Bundle\SearchBundle\Engine\Indexer; +use Oro\Bundle\SearchBundle\Query\Result; + +use Oro\Bundle\SearchBundle\Query\Result\Item; class SearchHandlerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/FormBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php b/src/Oro/Bundle/FormBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php index 51de5520e4f..3235d0a8a39 100644 --- a/src/Oro/Bundle/FormBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php +++ b/src/Oro/Bundle/FormBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php @@ -1,11 +1,11 @@ assertEquals(array(FormEvents::PRE_BIND => 'preBind'), FixArrayToStringListener::getSubscribedEvents()); + $this->assertEquals(array(FormEvents::PRE_SUBMIT => 'preBind'), FixArrayToStringListener::getSubscribedEvents()); } } diff --git a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Extension/ConstraintAsOptionExtensionTest.php b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Extension/ConstraintAsOptionExtensionTest.php index ffbe377c4f6..dc08cfae8dd 100644 --- a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Extension/ConstraintAsOptionExtensionTest.php +++ b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Extension/ConstraintAsOptionExtensionTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\FormBundle\Tests\Unit\Extension; -use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Validator\Constraints\NotBlank; - use Oro\Bundle\FormBundle\Form\Extension\ConstraintAsOptionExtension; use Oro\Bundle\FormBundle\Validator\ConstraintFactory; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\Validator\Constraints\NotBlank; + class ConstraintAsOptionExtensionTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Extension/DataBlockExtensionTest.php b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Extension/DataBlockExtensionTest.php index bb6070faf30..04db3093f61 100644 --- a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Extension/DataBlockExtensionTest.php +++ b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Extension/DataBlockExtensionTest.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\FormBundle\Tests\Unit\Extension; use Oro\Bundle\FormBundle\Form\Extension\DataBlockExtension; -use Symfony\Component\OptionsResolver\OptionsResolver; - use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; + class DataBlockExtensionTest extends \PHPUnit_Framework_TestCase { /** @var DataBlockExtension */ diff --git a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Twig/DataBlocksTest.php b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Twig/DataBlocksTest.php index 110eaa67a26..493a8d4bc3c 100644 --- a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Twig/DataBlocksTest.php +++ b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Twig/DataBlocksTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\FormBundle\Tests\Unit\Form\Twig; -use Symfony\Component\Form\FormFactory; -use Symfony\Component\Form\Forms; - use Oro\Bundle\FormBundle\Form\Extension\DataBlockExtension; use Oro\Bundle\FormBundle\Form\Twig\DataBlocks; +use Symfony\Component\Form\FormFactory; +use Symfony\Component\Form\Forms; + class DataBlocksTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/EntityIdentifierTypeTest.php b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/EntityIdentifierTypeTest.php index 14dc38e452b..71185acf643 100644 --- a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/EntityIdentifierTypeTest.php +++ b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/EntityIdentifierTypeTest.php @@ -3,16 +3,16 @@ namespace Oro\Bundle\FormBundle\Tests\Unit\Form\Type; use Doctrine\Common\Persistence\ManagerRegistry; -use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\AbstractQuery; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityRepository; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\QueryBuilder; -use Doctrine\ORM\AbstractQuery; -use Symfony\Component\Form\Test\FormIntegrationTestCase; +use Oro\Bundle\FormBundle\Form\DataTransformer\EntitiesToIdsTransformer; -use Oro\Bundle\FormBundle\Form\DataTransformer\EntitiesToIdsTransformer; use Oro\Bundle\FormBundle\Form\Type\EntityIdentifierType; +use Symfony\Component\Form\Test\FormIntegrationTestCase; class EntityIdentifierTypeTest extends FormIntegrationTestCase { diff --git a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroIconTypeTest.php b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroIconTypeTest.php index aaec3f257b4..a1391553753 100644 --- a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroIconTypeTest.php +++ b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroIconTypeTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FormBundle\Tests\Unit\Form\Type; +use Oro\Bundle\FormBundle\Form\Type\EntityIdentifierType; use Oro\Bundle\FormBundle\Form\Type\OroIconType; -use Symfony\Component\Form\Test\FormIntegrationTestCase; -use Oro\Bundle\FormBundle\Form\Type\EntityIdentifierType; +use Symfony\Component\Form\Test\FormIntegrationTestCase; class OroIconTypeTest extends FormIntegrationTestCase { diff --git a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroJquerySelect2HiddenTypeTest.php b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroJquerySelect2HiddenTypeTest.php index 0575cef65ab..c934c392e77 100644 --- a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroJquerySelect2HiddenTypeTest.php +++ b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroJquerySelect2HiddenTypeTest.php @@ -2,21 +2,21 @@ namespace Oro\Bundle\FormBundle\Tests\Unit\Form\Type; +use Doctrine\ORM\AbstractQuery; use Doctrine\ORM\EntityManager; use Doctrine\ORM\QueryBuilder; -use Doctrine\ORM\AbstractQuery; - -use Symfony\Component\Form\Test\FormIntegrationTestCase; -use Oro\Bundle\FormBundle\Autocomplete\SearchRegistry; -use Oro\Bundle\FormBundle\Autocomplete\SearchHandlerInterface; use Oro\Bundle\FormBundle\Autocomplete\ConverterInterface; +use Oro\Bundle\FormBundle\Autocomplete\SearchHandlerInterface; +use Oro\Bundle\FormBundle\Autocomplete\SearchRegistry; use Oro\Bundle\FormBundle\Form\DataTransformer\EntityToIdTransformer; -use Oro\Bundle\FormBundle\Form\Type\OroJquerySelect2HiddenType; +use Oro\Bundle\FormBundle\Form\Type\OroJquerySelect2HiddenType; use Oro\Bundle\FormBundle\Tests\Unit\MockHelper; +use Symfony\Component\Form\Test\FormIntegrationTestCase; + class OroJquerySelect2HiddenTypeTest extends FormIntegrationTestCase { /** diff --git a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroMoneyTypeTest.php b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroMoneyTypeTest.php index 9e0786be0f6..6b0cddf812c 100644 --- a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroMoneyTypeTest.php +++ b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/OroMoneyTypeTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\FormBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\Test\FormIntegrationTestCase; - use Oro\Bundle\FormBundle\Form\Type\OroMoneyType; +use Symfony\Component\Form\Test\FormIntegrationTestCase; + class OroMoneyTypeTest extends FormIntegrationTestCase { /** diff --git a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/TestFormExtension.php b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/TestFormExtension.php index 860ac541093..19e50083ce0 100644 --- a/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/TestFormExtension.php +++ b/src/Oro/Bundle/FormBundle/Tests/Unit/Form/Type/TestFormExtension.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\FormBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\AbstractExtension; use Genemu\Bundle\FormBundle\Form\JQuery\Type; +use Symfony\Component\Form\AbstractExtension; class TestFormExtension extends AbstractExtension { diff --git a/src/Oro/Bundle/GridBundle/Action/ActionFactory.php b/src/Oro/Bundle/GridBundle/Action/ActionFactory.php index b50afd185e6..b501c757b89 100644 --- a/src/Oro/Bundle/GridBundle/Action/ActionFactory.php +++ b/src/Oro/Bundle/GridBundle/Action/ActionFactory.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Action; -use Symfony\Component\DependencyInjection\ContainerInterface; use Oro\Bundle\GridBundle\Action\ActionInterface; use Oro\Bundle\GridBundle\Action\RedirectAction; +use Symfony\Component\DependencyInjection\ContainerInterface; class ActionFactory implements ActionFactoryInterface { diff --git a/src/Oro/Bundle/GridBundle/Action/MassAction/DeleteMassActionHandler.php b/src/Oro/Bundle/GridBundle/Action/MassAction/DeleteMassActionHandler.php index 092e9991325..c8dca8f21f5 100644 --- a/src/Oro/Bundle/GridBundle/Action/MassAction/DeleteMassActionHandler.php +++ b/src/Oro/Bundle/GridBundle/Action/MassAction/DeleteMassActionHandler.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\GridBundle\Action\MassAction; -use Doctrine\ORM\Query\Parameter; use Doctrine\ORM\EntityManager; +use Doctrine\ORM\Query\Parameter; -use Symfony\Component\Translation\TranslatorInterface; +use Oro\Bundle\GridBundle\Datagrid\IterableResultInterface; use Oro\Bundle\GridBundle\Datagrid\ORM\ConstantPagerIterableResult; -use Oro\Bundle\GridBundle\Datagrid\IterableResultInterface; use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; +use Symfony\Component\Translation\TranslatorInterface; class DeleteMassActionHandler implements MassActionHandlerInterface { diff --git a/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionDispatcher.php b/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionDispatcher.php index 7c21822977a..883b62954fc 100644 --- a/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionDispatcher.php +++ b/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionDispatcher.php @@ -2,20 +2,20 @@ namespace Oro\Bundle\GridBundle\Action\MassAction; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpFoundation\File\Exception\UnexpectedTypeException; -use Symfony\Component\HttpFoundation\Request; use Doctrine\ORM\QueryBuilder; +use Oro\Bundle\GridBundle\Action\MassAction\MassActionMediator; +use Oro\Bundle\GridBundle\Action\MassAction\MassActionResponseInterface; +use Oro\Bundle\GridBundle\Datagrid\DatagridInterface; -use Oro\Bundle\GridBundle\Datagrid\ORM\IterableResult; use Oro\Bundle\GridBundle\Datagrid\DatagridManagerRegistry; +use Oro\Bundle\GridBundle\Datagrid\IterableResultInterface; +use Oro\Bundle\GridBundle\Datagrid\ORM\IterableResult; use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; -use Oro\Bundle\GridBundle\Datagrid\DatagridInterface; use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; -use Oro\Bundle\GridBundle\Datagrid\IterableResultInterface; use Oro\Bundle\GridBundle\Datagrid\ResultRecord; -use Oro\Bundle\GridBundle\Action\MassAction\MassActionMediator; -use Oro\Bundle\GridBundle\Action\MassAction\MassActionResponseInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\HttpFoundation\File\Exception\UnexpectedTypeException; +use Symfony\Component\HttpFoundation\Request; class MassActionDispatcher { diff --git a/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionMediator.php b/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionMediator.php index 07a71471973..3de089d4afb 100644 --- a/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionMediator.php +++ b/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionMediator.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\GridBundle\Action\MassAction; -use Symfony\Component\HttpFoundation\Request; - use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; -use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; + use Oro\Bundle\GridBundle\Datagrid\DatagridInterface; use Oro\Bundle\GridBundle\Datagrid\IterableResultInterface; +use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; +use Symfony\Component\HttpFoundation\Request; class MassActionMediator implements MassActionMediatorInterface { diff --git a/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionMediatorInterface.php b/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionMediatorInterface.php index 37de2d79642..46e8be4ef0b 100644 --- a/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionMediatorInterface.php +++ b/src/Oro/Bundle/GridBundle/Action/MassAction/MassActionMediatorInterface.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\GridBundle\Action\MassAction; -use Symfony\Component\HttpFoundation\Request; - use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; -use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; + use Oro\Bundle\GridBundle\Datagrid\DatagridInterface; use Oro\Bundle\GridBundle\Datagrid\IterableResultInterface; +use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; +use Symfony\Component\HttpFoundation\Request; interface MassActionMediatorInterface { diff --git a/src/Oro/Bundle/GridBundle/Builder/AbstractDatagridBuilder.php b/src/Oro/Bundle/GridBundle/Builder/AbstractDatagridBuilder.php index 7908f73f157..c3dde750722 100644 --- a/src/Oro/Bundle/GridBundle/Builder/AbstractDatagridBuilder.php +++ b/src/Oro/Bundle/GridBundle/Builder/AbstractDatagridBuilder.php @@ -2,23 +2,23 @@ namespace Oro\Bundle\GridBundle\Builder; -use Oro\Bundle\GridBundle\Filter\FilterInterface; -use Symfony\Component\Form\FormFactoryInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Oro\Bundle\GridBundle\Action\ActionFactoryInterface; +use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; +use Oro\Bundle\GridBundle\Datagrid\DatagridInterface; -use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Datagrid\PagerInterface; +use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; +use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Filter\FilterFactoryInterface; +use Oro\Bundle\GridBundle\Filter\FilterInterface; use Oro\Bundle\GridBundle\Property\PropertyInterface; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; -use Oro\Bundle\GridBundle\Datagrid\DatagridInterface; -use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; use Oro\Bundle\GridBundle\Route\RouteGeneratorInterface; -use Oro\Bundle\GridBundle\Filter\FilterFactoryInterface; use Oro\Bundle\GridBundle\Sorter\SorterFactoryInterface; -use Oro\Bundle\GridBundle\Action\ActionFactoryInterface; -use Oro\Bundle\GridBundle\Datagrid\PagerInterface; -use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; use Oro\Bundle\SecurityBundle\SecurityFacade; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\Form\FormFactoryInterface; abstract class AbstractDatagridBuilder implements DatagridBuilderInterface { diff --git a/src/Oro/Bundle/GridBundle/Builder/DatagridBuilderInterface.php b/src/Oro/Bundle/GridBundle/Builder/DatagridBuilderInterface.php index 1f2506e563b..57ddee10da4 100644 --- a/src/Oro/Bundle/GridBundle/Builder/DatagridBuilderInterface.php +++ b/src/Oro/Bundle/GridBundle/Builder/DatagridBuilderInterface.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\GridBundle\Builder; -use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; -use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; -use Oro\Bundle\GridBundle\Property\PropertyInterface; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; +use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; use Oro\Bundle\GridBundle\Datagrid\DatagridInterface; use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; +use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; +use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Property\PropertyInterface; use Oro\Bundle\GridBundle\Route\RouteGeneratorInterface; -use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; interface DatagridBuilderInterface { diff --git a/src/Oro/Bundle/GridBundle/Builder/ORM/DatagridBuilder.php b/src/Oro/Bundle/GridBundle/Builder/ORM/DatagridBuilder.php index 085fa5656e4..d53fba65024 100644 --- a/src/Oro/Bundle/GridBundle/Builder/ORM/DatagridBuilder.php +++ b/src/Oro/Bundle/GridBundle/Builder/ORM/DatagridBuilder.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\Builder\ORM; +use Oro\Bundle\GridBundle\Builder\AbstractDatagridBuilder; +use Oro\Bundle\GridBundle\Datagrid\ORM\Pager; use Oro\Bundle\GridBundle\Datagrid\PagerInterface; use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; -use Oro\Bundle\GridBundle\Datagrid\ORM\Pager; -use Oro\Bundle\GridBundle\Builder\AbstractDatagridBuilder; class DatagridBuilder extends AbstractDatagridBuilder { diff --git a/src/Oro/Bundle/GridBundle/Controller/MassActionController.php b/src/Oro/Bundle/GridBundle/Controller/MassActionController.php index 17d1540c867..1d2a5635101 100644 --- a/src/Oro/Bundle/GridBundle/Controller/MassActionController.php +++ b/src/Oro/Bundle/GridBundle/Controller/MassActionController.php @@ -2,14 +2,15 @@ namespace Oro\Bundle\GridBundle\Controller; +use Oro\Bundle\GridBundle\Action\MassAction\MassActionDispatcher; +use Oro\Bundle\GridBundle\Action\MassAction\MassActionParametersParser; +use Oro\Bundle\SecurityBundle\Annotation\Acl; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; + use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; - -use Oro\Bundle\SecurityBundle\Annotation\Acl; -use Oro\Bundle\GridBundle\Action\MassAction\MassActionDispatcher; -use Oro\Bundle\GridBundle\Action\MassAction\MassActionParametersParser; class MassActionController extends Controller { @@ -20,10 +21,8 @@ class MassActionController extends Controller * @return Response * @throws \LogicException */ - public function massActionAction($gridName, $actionName) + public function massActionAction(Request $request, $gridName, $actionName) { - $request = $this->getRequest(); - /** @var MassActionParametersParser $massActionParametersParser */ $parametersParser = $this->get('oro_grid.mass_action.parameters_parser'); $parameters = $parametersParser->parse($request); diff --git a/src/Oro/Bundle/GridBundle/Datagrid/Datagrid.php b/src/Oro/Bundle/GridBundle/Datagrid/Datagrid.php index 4fa2a99c6bb..d788465ac29 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/Datagrid.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/Datagrid.php @@ -2,22 +2,22 @@ namespace Oro\Bundle\GridBundle\Datagrid; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\Form; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Oro\Bundle\GridBundle\Action\ActionInterface; +use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; +use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; -use Oro\Bundle\GridBundle\Filter\FilterInterface; +use Oro\Bundle\GridBundle\Datagrid\Views\AbstractViewsList; +use Oro\Bundle\GridBundle\EventDispatcher\ResultDatagridEvent; use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Filter\FilterInterface; use Oro\Bundle\GridBundle\Property\PropertyCollection; use Oro\Bundle\GridBundle\Property\PropertyInterface; -use Oro\Bundle\GridBundle\Sorter\SorterInterface; use Oro\Bundle\GridBundle\Route\RouteGeneratorInterface; -use Oro\Bundle\GridBundle\Action\ActionInterface; -use Oro\Bundle\GridBundle\EventDispatcher\ResultDatagridEvent; -use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; -use Oro\Bundle\GridBundle\Datagrid\Views\AbstractViewsList; -use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; +use Oro\Bundle\GridBundle\Sorter\SorterInterface; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\Form\Form; +use Symfony\Component\Form\FormBuilderInterface; /** * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) diff --git a/src/Oro/Bundle/GridBundle/Datagrid/DatagridInterface.php b/src/Oro/Bundle/GridBundle/Datagrid/DatagridInterface.php index 2c8956d5aa5..9718e32cd33 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/DatagridInterface.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/DatagridInterface.php @@ -2,19 +2,19 @@ namespace Oro\Bundle\GridBundle\Datagrid; -use Symfony\Component\Form\Form; - -use Oro\Bundle\GridBundle\Property\PropertyInterface; -use Oro\Bundle\GridBundle\Sorter\SorterInterface; -use Oro\Bundle\GridBundle\Route\RouteGeneratorInterface; use Oro\Bundle\GridBundle\Action\ActionInterface; + use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; -use Oro\Bundle\GridBundle\Datagrid\Views\AbstractViewsList; use Oro\Bundle\GridBundle\Datagrid\PagerInterface; use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; -use Oro\Bundle\GridBundle\Filter\FilterInterface; use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; +use Oro\Bundle\GridBundle\Datagrid\Views\AbstractViewsList; use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Filter\FilterInterface; +use Oro\Bundle\GridBundle\Property\PropertyInterface; +use Oro\Bundle\GridBundle\Route\RouteGeneratorInterface; +use Oro\Bundle\GridBundle\Sorter\SorterInterface; +use Symfony\Component\Form\Form; interface DatagridInterface { diff --git a/src/Oro/Bundle/GridBundle/Datagrid/DatagridManager.php b/src/Oro/Bundle/GridBundle/Datagrid/DatagridManager.php index fdb3df87a2d..29e199081a3 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/DatagridManager.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/DatagridManager.php @@ -4,22 +4,22 @@ use Doctrine\ORM\EntityManager; -use Symfony\Component\Translation\TranslatorInterface; -use Symfony\Component\Validator\ValidatorInterface; -use Symfony\Component\Routing\Router; - +use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; use Oro\Bundle\GridBundle\Builder\DatagridBuilderInterface; use Oro\Bundle\GridBundle\Builder\ListBuilderInterface; -use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; + +use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; +use Oro\Bundle\GridBundle\Datagrid\Views\AbstractViewsList; +use Oro\Bundle\GridBundle\Field\FieldDescription; use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; +use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Filter\FilterInterface; use Oro\Bundle\GridBundle\Property\PropertyInterface; -use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; use Oro\Bundle\GridBundle\Route\RouteGeneratorInterface; -use Oro\Bundle\GridBundle\Filter\FilterInterface; -use Oro\Bundle\GridBundle\Field\FieldDescription; use Oro\Bundle\GridBundle\Sorter\SorterInterface; -use Oro\Bundle\GridBundle\Datagrid\Views\AbstractViewsList; -use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; +use Symfony\Component\Routing\Router; +use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Component\Validator\ValidatorInterface; /** * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) diff --git a/src/Oro/Bundle/GridBundle/Datagrid/DatagridManagerInterface.php b/src/Oro/Bundle/GridBundle/Datagrid/DatagridManagerInterface.php index 68cb09fdf6e..b5b8752f94d 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/DatagridManagerInterface.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/DatagridManagerInterface.php @@ -4,15 +4,15 @@ use Doctrine\ORM\EntityManager; -use Symfony\Component\Validator\ValidatorInterface; -use Symfony\Component\Routing\Router; -use Symfony\Component\Translation\TranslatorInterface; - -use Oro\Bundle\GridBundle\Datagrid\Views\AbstractViewsList; use Oro\Bundle\GridBundle\Builder\DatagridBuilderInterface; use Oro\Bundle\GridBundle\Builder\ListBuilderInterface; use Oro\Bundle\GridBundle\Datagrid\QueryFactoryInterface; + +use Oro\Bundle\GridBundle\Datagrid\Views\AbstractViewsList; use Oro\Bundle\GridBundle\Route\RouteGeneratorInterface; +use Symfony\Component\Routing\Router; +use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Component\Validator\ValidatorInterface; interface DatagridManagerInterface { diff --git a/src/Oro/Bundle/GridBundle/Datagrid/DatagridManagerRegistry.php b/src/Oro/Bundle/GridBundle/Datagrid/DatagridManagerRegistry.php index 73c5a2d7c1a..37d880dd048 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/DatagridManagerRegistry.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/DatagridManagerRegistry.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\Datagrid; -use Symfony\Component\DependencyInjection\ContainerInterface; - use Oro\Bundle\GridBundle\Datagrid\DatagridManagerInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; + class DatagridManagerRegistry { /** diff --git a/src/Oro/Bundle/GridBundle/Datagrid/FlexibleDatagridManager.php b/src/Oro/Bundle/GridBundle/Datagrid/FlexibleDatagridManager.php index 7475d04448e..fc0167d36ae 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/FlexibleDatagridManager.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/FlexibleDatagridManager.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\GridBundle\Datagrid; +use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; use Oro\Bundle\FlexibleEntityBundle\Model\AbstractAttribute; -use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; use Oro\Bundle\GridBundle\Field\FieldDescription; -use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; +use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; use Oro\Bundle\GridBundle\Filter\FilterInterface; abstract class FlexibleDatagridManager extends DatagridManager diff --git a/src/Oro/Bundle/GridBundle/Datagrid/ORM/EntityProxyQuery.php b/src/Oro/Bundle/GridBundle/Datagrid/ORM/EntityProxyQuery.php index 9e88e68aeae..d921688ed2b 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/ORM/EntityProxyQuery.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/ORM/EntityProxyQuery.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Datagrid\ORM; -use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\Query; +use Doctrine\ORM\QueryBuilder; class EntityProxyQuery extends ProxyQuery { diff --git a/src/Oro/Bundle/GridBundle/Datagrid/ORM/IterableResult.php b/src/Oro/Bundle/GridBundle/Datagrid/ORM/IterableResult.php index 86495264e7c..4566c1ec5b4 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/ORM/IterableResult.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/ORM/IterableResult.php @@ -5,9 +5,9 @@ use Doctrine\ORM\Query; use Oro\Bundle\BatchBundle\ORM\Query\BufferedQueryResultIterator; +use Oro\Bundle\GridBundle\Datagrid\IterableResultInterface; use Oro\Bundle\GridBundle\Datagrid\ORM\ProxyQuery; use Oro\Bundle\GridBundle\Datagrid\ResultRecord; -use Oro\Bundle\GridBundle\Datagrid\IterableResultInterface; /** * Iterates query result with elements of ResultRecord type diff --git a/src/Oro/Bundle/GridBundle/Datagrid/ORM/Pager.php b/src/Oro/Bundle/GridBundle/Datagrid/ORM/Pager.php index 9cd758c93a4..79c95878860 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/ORM/Pager.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/ORM/Pager.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Datagrid\ORM; -use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\Query; +use Doctrine\ORM\QueryBuilder; use Oro\Bundle\GridBundle\Datagrid\PagerInterface; use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; diff --git a/src/Oro/Bundle/GridBundle/Datagrid/ORM/ProxyQuery.php b/src/Oro/Bundle/GridBundle/Datagrid/ORM/ProxyQuery.php index 261318dcbe6..6202cb4257d 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/ORM/ProxyQuery.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/ORM/ProxyQuery.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Datagrid\ORM; -use Doctrine\ORM\QueryBuilder; -use Doctrine\ORM\Query; use Doctrine\ORM\AbstractQuery; +use Doctrine\ORM\Query; +use Doctrine\ORM\QueryBuilder; use Oro\Bundle\BatchBundle\ORM\Query\QueryCountCalculator; use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; diff --git a/src/Oro/Bundle/GridBundle/Datagrid/ORM/QueryFactory/EntityQueryFactory.php b/src/Oro/Bundle/GridBundle/Datagrid/ORM/QueryFactory/EntityQueryFactory.php index 1128aedc5de..dd62f76b989 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/ORM/QueryFactory/EntityQueryFactory.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/ORM/QueryFactory/EntityQueryFactory.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\GridBundle\Datagrid\ORM\QueryFactory; -use Symfony\Bridge\Doctrine\RegistryInterface; - use Doctrine\ORM\EntityRepository; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\GridBundle\Datagrid\ORM\EntityProxyQuery; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; +use Symfony\Bridge\Doctrine\RegistryInterface; + class EntityQueryFactory extends AbstractQueryFactory { /** diff --git a/src/Oro/Bundle/GridBundle/Datagrid/ORM/QueryFactory/QueryFactory.php b/src/Oro/Bundle/GridBundle/Datagrid/ORM/QueryFactory/QueryFactory.php index 868ed0f8d8c..afb478229f5 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/ORM/QueryFactory/QueryFactory.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/ORM/QueryFactory/QueryFactory.php @@ -4,8 +4,8 @@ use Doctrine\ORM\QueryBuilder; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\GridBundle\Datagrid\ORM\ProxyQuery; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; class QueryFactory extends AbstractQueryFactory { diff --git a/src/Oro/Bundle/GridBundle/Datagrid/QueryConverter/YamlConverter.php b/src/Oro/Bundle/GridBundle/Datagrid/QueryConverter/YamlConverter.php index af5e0f5b86a..b371e0bbd71 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/QueryConverter/YamlConverter.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/QueryConverter/YamlConverter.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\GridBundle\Datagrid\QueryConverter; -use Symfony\Component\Yaml\Yaml; -use Symfony\Component\Config\Definition\Processor; - -use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\EntityManager; use Doctrine\ORM\Query\Expr; +use Doctrine\ORM\QueryBuilder; use Oro\Bundle\GridBundle\Datagrid\QueryConverterInterface; use Oro\Bundle\GridBundle\DependencyInjection\ReportConfiguration; +use Symfony\Component\Config\Definition\Processor; +use Symfony\Component\Yaml\Yaml; + class YamlConverter implements QueryConverterInterface { /** diff --git a/src/Oro/Bundle/GridBundle/Datagrid/QueryConverterInterface.php b/src/Oro/Bundle/GridBundle/Datagrid/QueryConverterInterface.php index f1979acdebd..567f80391e9 100644 --- a/src/Oro/Bundle/GridBundle/Datagrid/QueryConverterInterface.php +++ b/src/Oro/Bundle/GridBundle/Datagrid/QueryConverterInterface.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Datagrid; -use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\EntityManager; +use Doctrine\ORM\QueryBuilder; interface QueryConverterInterface { diff --git a/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AbstractDatagridManagerCompilerPass.php b/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AbstractDatagridManagerCompilerPass.php index d72bc710eb7..936316311a1 100644 --- a/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AbstractDatagridManagerCompilerPass.php +++ b/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AbstractDatagridManagerCompilerPass.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\DependencyInjection\Compiler; +use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Container; -use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; abstract class AbstractDatagridManagerCompilerPass implements CompilerPassInterface diff --git a/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php b/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php index 0848ad72bc2..d58f79f628d 100644 --- a/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php +++ b/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\GridBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\Definition; +use Oro\Bundle\GridBundle\DependencyInjection\OroGridExtension; +use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException; +use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\DependencyInjection\Parameter; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\DependencyInjection\Container; -use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException; +use Symfony\Component\DependencyInjection\Definition; +use Symfony\Component\DependencyInjection\Parameter; -use Oro\Bundle\GridBundle\DependencyInjection\OroGridExtension; +use Symfony\Component\DependencyInjection\Reference; class AddDependencyCallsCompilerPass extends AbstractDatagridManagerCompilerPass { diff --git a/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AddFilterTypeCompilerPass.php b/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AddFilterTypeCompilerPass.php index 16a4b81e9fa..a94c48c19b9 100644 --- a/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AddFilterTypeCompilerPass.php +++ b/src/Oro/Bundle/GridBundle/DependencyInjection/Compiler/AddFilterTypeCompilerPass.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\ContainerInterface; class AddFilterTypeCompilerPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/GridBundle/DependencyInjection/OroGridExtension.php b/src/Oro/Bundle/GridBundle/DependencyInjection/OroGridExtension.php index 6be455fe818..4723e531f95 100644 --- a/src/Oro/Bundle/GridBundle/DependencyInjection/OroGridExtension.php +++ b/src/Oro/Bundle/GridBundle/DependencyInjection/OroGridExtension.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\GridBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\Config\Definition\Processor; +use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\Config\FileLocator; -use Symfony\Component\Config\Definition\Processor; class OroGridExtension extends Extension { diff --git a/src/Oro/Bundle/GridBundle/EventDispatcher/AbstractDatagridEvent.php b/src/Oro/Bundle/GridBundle/EventDispatcher/AbstractDatagridEvent.php index fff8bcae63e..7af701e5dbc 100644 --- a/src/Oro/Bundle/GridBundle/EventDispatcher/AbstractDatagridEvent.php +++ b/src/Oro/Bundle/GridBundle/EventDispatcher/AbstractDatagridEvent.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\EventDispatcher; -use Symfony\Component\EventDispatcher\Event; - use Oro\Bundle\GridBundle\Datagrid\DatagridInterface; +use Symfony\Component\EventDispatcher\Event; + abstract class AbstractDatagridEvent extends Event implements DatagridEventInterface { /** diff --git a/src/Oro/Bundle/GridBundle/Field/FieldDescription.php b/src/Oro/Bundle/GridBundle/Field/FieldDescription.php index 092233b71e5..1eba07b4c8c 100644 --- a/src/Oro/Bundle/GridBundle/Field/FieldDescription.php +++ b/src/Oro/Bundle/GridBundle/Field/FieldDescription.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\GridBundle\Field; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; -use Oro\Bundle\GridBundle\Property\PropertyInterface; use Oro\Bundle\GridBundle\Property\FieldProperty; +use Oro\Bundle\GridBundle\Property\PropertyInterface; class FieldDescription implements FieldDescriptionInterface { diff --git a/src/Oro/Bundle/GridBundle/Filter/FilterFactory.php b/src/Oro/Bundle/GridBundle/Filter/FilterFactory.php index 5c42b854455..65181c26b1b 100644 --- a/src/Oro/Bundle/GridBundle/Filter/FilterFactory.php +++ b/src/Oro/Bundle/GridBundle/Filter/FilterFactory.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Filter; -use Symfony\Component\DependencyInjection\ContainerInterface; use Oro\Bundle\GridBundle\Filter\FilterInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; class FilterFactory implements FilterFactoryInterface { diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/AbstractDateFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/AbstractDateFilter.php index 858234832e8..3e81ba300fe 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/AbstractDateFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/AbstractDateFilter.php @@ -4,8 +4,8 @@ use Doctrine\DBAL\Query\QueryBuilder; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; abstract class AbstractDateFilter extends AbstractFilter { diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/AbstractFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/AbstractFilter.php index d42c9ec11e5..804867c346a 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/AbstractFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/AbstractFilter.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\GridBundle\Filter\ORM; -use Symfony\Component\Translation\TranslatorInterface; - use Doctrine\DBAL\Query\QueryBuilder; -use Doctrine\ORM\Query\Expr; +use Doctrine\ORM\Query\Expr; use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; -use Oro\Bundle\GridBundle\Filter\FilterInterface; + use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; +use Oro\Bundle\GridBundle\Filter\FilterInterface; +use Symfony\Component\Translation\TranslatorInterface; abstract class AbstractFilter extends AbstractDescriptiveFilter implements FilterInterface { diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/BooleanFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/BooleanFilter.php index 0aded88474a..da992217949 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/BooleanFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/BooleanFilter.php @@ -4,8 +4,8 @@ use Doctrine\DBAL\Query\QueryBuilder; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\FilterBundle\Form\Type\Filter\BooleanFilterType; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; class BooleanFilter extends AbstractFilter { diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/ChoiceFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/ChoiceFilter.php index 53994293d7b..3e66b2b6b19 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/ChoiceFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/ChoiceFilter.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\GridBundle\Filter\ORM; -use Doctrine\DBAL\Query\QueryBuilder; use Doctrine\Common\Collections\Collection; +use Doctrine\DBAL\Query\QueryBuilder; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; class ChoiceFilter extends AbstractFilter { diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/AbstractFlexibleDateFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/AbstractFlexibleDateFilter.php index 6cb4fa80601..813140cf430 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/AbstractFlexibleDateFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/AbstractFlexibleDateFilter.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Filter\ORM\Flexible; +use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\GridBundle\Filter\ORM\AbstractDateFilter; -use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; abstract class AbstractFlexibleDateFilter extends AbstractFlexibleFilter { diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/AbstractFlexibleFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/AbstractFlexibleFilter.php index 3e86d95ce3b..03616c9689c 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/AbstractFlexibleFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/AbstractFlexibleFilter.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\GridBundle\Filter\ORM\Flexible; -use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; -use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository; +use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; +use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; +use Oro\Bundle\GridBundle\Datagrid\ORM\ProxyQuery; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\GridBundle\Filter\FilterInterface; use Oro\Bundle\GridBundle\Filter\ORM\AbstractFilter; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; -use Oro\Bundle\GridBundle\Datagrid\ORM\ProxyQuery; abstract class AbstractFlexibleFilter implements FilterInterface { diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/FlexibleBooleanFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/FlexibleBooleanFilter.php index 850e9bbc11f..718f999885f 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/FlexibleBooleanFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/FlexibleBooleanFilter.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Filter\ORM\Flexible; -use Oro\Bundle\GridBundle\Filter\ORM\NumberFilter; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\FilterBundle\Form\Type\Filter\BooleanFilterType; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; +use Oro\Bundle\GridBundle\Filter\ORM\NumberFilter; class FlexibleBooleanFilter extends AbstractFlexibleFilter { diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/FlexibleOptionsFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/FlexibleOptionsFilter.php index 41150dc1580..fb0920bfea8 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/FlexibleOptionsFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/Flexible/FlexibleOptionsFilter.php @@ -4,10 +4,10 @@ use Doctrine\Common\Persistence\ObjectRepository; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; use Oro\Bundle\FlexibleEntityBundle\Entity\Attribute; use Oro\Bundle\FlexibleEntityBundle\Entity\AttributeOption; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\GridBundle\Filter\ORM\ChoiceFilter; class FlexibleOptionsFilter extends AbstractFlexibleFilter diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/NumberFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/NumberFilter.php index 5e4c0134f28..8a7e900f57e 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/NumberFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/NumberFilter.php @@ -4,8 +4,8 @@ use Doctrine\ORM\QueryBuilder; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\FilterBundle\Form\Type\Filter\NumberFilterType; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; class NumberFilter extends AbstractFilter diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/SelectRowFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/SelectRowFilter.php index 11b209ba288..13e1d421de2 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/SelectRowFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/SelectRowFilter.php @@ -4,8 +4,8 @@ use Doctrine\DBAL\Query\QueryBuilder; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\FilterBundle\Form\Type\Filter\SelectRowFilterType; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; class SelectRowFilter extends AbstractFilter { diff --git a/src/Oro/Bundle/GridBundle/Filter/ORM/StringFilter.php b/src/Oro/Bundle/GridBundle/Filter/ORM/StringFilter.php index f44afaf1860..2cdae5da9ab 100644 --- a/src/Oro/Bundle/GridBundle/Filter/ORM/StringFilter.php +++ b/src/Oro/Bundle/GridBundle/Filter/ORM/StringFilter.php @@ -4,8 +4,8 @@ use Doctrine\DBAL\Query\QueryBuilder; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\FilterBundle\Form\Type\Filter\TextFilterType; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; class StringFilter extends AbstractFilter { diff --git a/src/Oro/Bundle/GridBundle/OroGridBundle.php b/src/Oro/Bundle/GridBundle/OroGridBundle.php index 60495846b00..a7ac2a61fff 100644 --- a/src/Oro/Bundle/GridBundle/OroGridBundle.php +++ b/src/Oro/Bundle/GridBundle/OroGridBundle.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\GridBundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\HttpKernel\Bundle\Bundle; - use Oro\Bundle\GridBundle\DependencyInjection\Compiler\AddDependencyCallsCompilerPass; -use Oro\Bundle\GridBundle\DependencyInjection\Compiler\AddFlexibleManagerCompilerPass; use Oro\Bundle\GridBundle\DependencyInjection\Compiler\AddFilterTypeCompilerPass; +use Oro\Bundle\GridBundle\DependencyInjection\Compiler\AddFlexibleManagerCompilerPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; + class OroGridBundle extends Bundle { /** diff --git a/src/Oro/Bundle/GridBundle/Property/TranslateableProperty.php b/src/Oro/Bundle/GridBundle/Property/TranslateableProperty.php index f4df89c2b4c..7ba2d42204a 100644 --- a/src/Oro/Bundle/GridBundle/Property/TranslateableProperty.php +++ b/src/Oro/Bundle/GridBundle/Property/TranslateableProperty.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\Property; -use Symfony\Component\Translation\TranslatorInterface; - use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; +use Symfony\Component\Translation\TranslatorInterface; + class TranslateableProperty extends AbstractProperty { /** diff --git a/src/Oro/Bundle/GridBundle/Property/UrlProperty.php b/src/Oro/Bundle/GridBundle/Property/UrlProperty.php index 6fb56f65681..c204360f001 100644 --- a/src/Oro/Bundle/GridBundle/Property/UrlProperty.php +++ b/src/Oro/Bundle/GridBundle/Property/UrlProperty.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Property; -use Symfony\Component\Routing\Router; use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; +use Symfony\Component\Routing\Router; class UrlProperty extends AbstractProperty { diff --git a/src/Oro/Bundle/GridBundle/Renderer/GridRenderer.php b/src/Oro/Bundle/GridBundle/Renderer/GridRenderer.php index 5835f48af5f..80e6c736ad6 100644 --- a/src/Oro/Bundle/GridBundle/Renderer/GridRenderer.php +++ b/src/Oro/Bundle/GridBundle/Renderer/GridRenderer.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Renderer; +use Oro\Bundle\GridBundle\Datagrid\DatagridView; use Symfony\Bundle\FrameworkBundle\Templating\PhpEngine; use Symfony\Component\HttpFoundation\Response; -use Oro\Bundle\GridBundle\Datagrid\DatagridView; class GridRenderer { diff --git a/src/Oro/Bundle/GridBundle/Route/DefaultRouteGenerator.php b/src/Oro/Bundle/GridBundle/Route/DefaultRouteGenerator.php index b08b0686a8a..5e9269cb999 100644 --- a/src/Oro/Bundle/GridBundle/Route/DefaultRouteGenerator.php +++ b/src/Oro/Bundle/GridBundle/Route/DefaultRouteGenerator.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Route; -use Symfony\Component\Routing\RouterInterface; -use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; use \Oro\Bundle\GridBundle\Datagrid\ParametersInterface; +use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Symfony\Component\Routing\RouterInterface; class DefaultRouteGenerator implements RouteGeneratorInterface { diff --git a/src/Oro/Bundle/GridBundle/Route/RouteGeneratorInterface.php b/src/Oro/Bundle/GridBundle/Route/RouteGeneratorInterface.php index 6f5eb5cedd1..790d7f4e4bd 100644 --- a/src/Oro/Bundle/GridBundle/Route/RouteGeneratorInterface.php +++ b/src/Oro/Bundle/GridBundle/Route/RouteGeneratorInterface.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Route; -use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; +use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; interface RouteGeneratorInterface { diff --git a/src/Oro/Bundle/GridBundle/Sorter/ORM/Flexible/FlexibleSorter.php b/src/Oro/Bundle/GridBundle/Sorter/ORM/Flexible/FlexibleSorter.php index 68db87c0bde..6630f16f287 100644 --- a/src/Oro/Bundle/GridBundle/Sorter/ORM/Flexible/FlexibleSorter.php +++ b/src/Oro/Bundle/GridBundle/Sorter/ORM/Flexible/FlexibleSorter.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\GridBundle\Sorter\ORM\Flexible; -use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; -use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository; +use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; +use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; -use Oro\Bundle\GridBundle\Sorter\ORM\Sorter; -use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; +use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Sorter\ORM\Sorter; class FlexibleSorter extends Sorter { diff --git a/src/Oro/Bundle/GridBundle/Sorter/ORM/Sorter.php b/src/Oro/Bundle/GridBundle/Sorter/ORM/Sorter.php index 49fa91b7acc..8e4a3ab76b9 100644 --- a/src/Oro/Bundle/GridBundle/Sorter/ORM/Sorter.php +++ b/src/Oro/Bundle/GridBundle/Sorter/ORM/Sorter.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Sorter\ORM; -use Oro\Bundle\GridBundle\Sorter\SorterInterface; use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Sorter\SorterInterface; class Sorter implements SorterInterface { diff --git a/src/Oro/Bundle/GridBundle/Sorter/SorterFactory.php b/src/Oro/Bundle/GridBundle/Sorter/SorterFactory.php index 0980853e258..3fda144a026 100644 --- a/src/Oro/Bundle/GridBundle/Sorter/SorterFactory.php +++ b/src/Oro/Bundle/GridBundle/Sorter/SorterFactory.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Sorter; -use Symfony\Component\DependencyInjection\ContainerInterface; use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; class SorterFactory implements SorterFactoryInterface { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassAction/Ajax/AjaxMassActionTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassAction/Ajax/AjaxMassActionTest.php index 33e4f542469..926e0111ece 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassAction/Ajax/AjaxMassActionTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassAction/Ajax/AjaxMassActionTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Action\MassAction\Ajax; -use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; use Oro\Bundle\GridBundle\Action\MassAction\Ajax\AjaxMassAction; +use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; use Oro\Bundle\GridBundle\Tests\Unit\Action\MassAction\MassActionWithExceptionsTestCase; class AjaxMassActionTest extends MassActionWithExceptionsTestCase diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassActionDispatcherTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassActionDispatcherTest.php index fbadd06fc02..e033025f098 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassActionDispatcherTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassActionDispatcherTest.php @@ -4,10 +4,10 @@ use Doctrine\ORM\Query\Expr; -use Symfony\Component\DependencyInjection\ContainerInterface; - use Oro\Bundle\GridBundle\Datagrid\ORM\ProxyQuery; + use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; class MassActionDispatcherTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassActionMediatorTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassActionMediatorTest.php index 58ec32c0d44..4eccc2614b5 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassActionMediatorTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Action/MassActionMediatorTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Action; -use Oro\Bundle\GridBundle\Action\MassAction\MassActionMediator; use Oro\Bundle\GridBundle\Action\MassAction\MassActionInterface; +use Oro\Bundle\GridBundle\Action\MassAction\MassActionMediator; use Oro\Bundle\GridBundle\Datagrid\DatagridInterface; use Oro\Bundle\GridBundle\Datagrid\IterableResultInterface; diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Builder/ORM/DatagridBuilderTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Builder/ORM/DatagridBuilderTest.php index c1bad86930e..c77db949a24 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Builder/ORM/DatagridBuilderTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Builder/ORM/DatagridBuilderTest.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Builder\ORM; use Oro\Bundle\GridBundle\Builder\ORM\DatagridBuilder; +use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; use Oro\Bundle\GridBundle\Field\FieldDescription; use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; use Oro\Bundle\GridBundle\Filter\FilterInterface; -use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; class DatagridBuilderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridManagerRegistryTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridManagerRegistryTest.php index f40244d3d97..dd2b38e3357 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridManagerRegistryTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridManagerRegistryTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Datagrid; -use Oro\Bundle\GridBundle\Datagrid\ResultRecord; use Oro\Bundle\GridBundle\Datagrid\DatagridManagerRegistry; +use Oro\Bundle\GridBundle\Datagrid\ResultRecord; class DatagridManagerRegistryTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridManagerTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridManagerTest.php index f1e297fd8be..78c861d769f 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridManagerTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridManagerTest.php @@ -2,19 +2,19 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Datagrid; -use Symfony\Component\HttpFoundation\Request; - -use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; -use Oro\Bundle\GridBundle\Filter\FilterInterface; use Oro\Bundle\GridBundle\Datagrid\DatagridManager; -use Oro\Bundle\GridBundle\Field\FieldDescription; -use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; + use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; use Oro\Bundle\GridBundle\Datagrid\RequestParameters; +use Oro\Bundle\GridBundle\Field\FieldDescription; +use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; +use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Filter\FilterInterface; use Oro\Bundle\GridBundle\Sorter\SorterInterface; - use Oro\Bundle\GridBundle\Tests\Unit\Datagrid\Stub\StubDatagridManager; +use Symfony\Component\HttpFoundation\Request; + class DatagridManagerTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridTest.php index d093d13f8fb..d21dedeaadb 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/DatagridTest.php @@ -2,20 +2,20 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Datagrid; -use Symfony\Component\HttpFoundation\Request; - -use Oro\Bundle\GridBundle\Datagrid\ResultRecord; use Oro\Bundle\GridBundle\Datagrid\Datagrid; -use Oro\Bundle\GridBundle\Filter\FilterInterface; -use Oro\Bundle\GridBundle\Sorter\SorterInterface; + +use Oro\Bundle\GridBundle\Datagrid\PagerInterface; use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; +use Oro\Bundle\GridBundle\Datagrid\RequestParameters; +use Oro\Bundle\GridBundle\Datagrid\ResultRecord; +use Oro\Bundle\GridBundle\EventDispatcher\ResultDatagridEvent; use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Filter\FilterInterface; use Oro\Bundle\GridBundle\Property\PropertyInterface; -use Oro\Bundle\GridBundle\Datagrid\RequestParameters; -use Oro\Bundle\GridBundle\Datagrid\PagerInterface; -use Oro\Bundle\GridBundle\EventDispatcher\ResultDatagridEvent; +use Oro\Bundle\GridBundle\Sorter\SorterInterface; +use Symfony\Component\HttpFoundation\Request; /** * @SuppressWarnings(PHPMD.TooManyMethods) diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/FlexibleDatagridManagerTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/FlexibleDatagridManagerTest.php index 9adc7d8f24d..0b7b5348bd5 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/FlexibleDatagridManagerTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/FlexibleDatagridManagerTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Datagrid; -use Oro\Bundle\GridBundle\Datagrid\FlexibleDatagridManager; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; +use Oro\Bundle\GridBundle\Datagrid\FlexibleDatagridManager; class FlexibleDatagridManagerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/ORM/PagerTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/ORM/PagerTest.php index 5202c0b2140..d4cf8b75566 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/ORM/PagerTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/ORM/PagerTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Datagrid\ORM; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\GridBundle\Datagrid\ORM\Pager; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; class PagerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/QueryConverter/YamlConverterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/QueryConverter/YamlConverterTest.php index b918e26d3c3..c9be2115992 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/QueryConverter/YamlConverterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/QueryConverter/YamlConverterTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Datagrid\QueryConverter; -use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\EntityManager; +use Doctrine\ORM\QueryBuilder; use Oro\Bundle\GridBundle\Datagrid\QueryConverter\YamlConverter; diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/RequestParametersTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/RequestParametersTest.php index a9c0965288c..b2f4efcb065 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/RequestParametersTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/RequestParametersTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Datagrid; -use Symfony\Component\HttpFoundation\Request; use Oro\Bundle\GridBundle\Datagrid\RequestParameters; +use Symfony\Component\HttpFoundation\Request; class RequestParametersTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/Views/AbstractViewsListTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/Views/AbstractViewsListTest.php index b9a82a06fd1..43f33a4bf1c 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/Views/AbstractViewsListTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Datagrid/Views/AbstractViewsListTest.php @@ -4,8 +4,8 @@ use Doctrine\Common\Collections\ArrayCollection; -use Oro\Bundle\GridBundle\Datagrid\Views\View; use Oro\Bundle\GridBundle\Datagrid\Views\AbstractViewsList; +use Oro\Bundle\GridBundle\Datagrid\Views\View; class AbstractViewsListTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php index e8f304a0cf2..639792914a8 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\DependencyInjection\Parameter; - use Oro\Bundle\GridBundle\DependencyInjection\Compiler\AddDependencyCallsCompilerPass; use Oro\Bundle\GridBundle\DependencyInjection\OroGridExtension; +use Symfony\Component\DependencyInjection\ContainerBuilder; + +use Symfony\Component\DependencyInjection\Parameter; +use Symfony\Component\DependencyInjection\Reference; class AddDependencyCallsCompilerPassTest extends AbstractCompilerPassTest { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddFilterTypeCompilerPassTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddFilterTypeCompilerPassTest.php index 4e431460d71..b8043657ba6 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddFilterTypeCompilerPassTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddFilterTypeCompilerPassTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\DependencyInjection\Compiler; +use Oro\Bundle\GridBundle\DependencyInjection\Compiler\AddFilterTypeCompilerPass; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Oro\Bundle\GridBundle\DependencyInjection\Compiler\AddFilterTypeCompilerPass; +use Symfony\Component\DependencyInjection\ContainerInterface; class AddFilterTypeCompilerPassTest extends AbstractCompilerPassTest { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddFlexibleManagerCompilerPassTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddFlexibleManagerCompilerPassTest.php index cf1566e6258..7a27fe30db0 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddFlexibleManagerCompilerPassTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/Compiler/AddFlexibleManagerCompilerPassTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\DependencyInjection\Compiler; +use Oro\Bundle\GridBundle\DependencyInjection\Compiler\AddFlexibleManagerCompilerPass; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Reference; -use Oro\Bundle\GridBundle\DependencyInjection\Compiler\AddFlexibleManagerCompilerPass; +use Symfony\Component\DependencyInjection\Reference; class AddFlexibleManagerCompilerPassTest extends AbstractCompilerPassTest { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php index 312ea36ec1c..15ac417260c 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\DependencyInjection; -use Symfony\Component\Config\Definition\ArrayNode; - use Oro\Bundle\GridBundle\DependencyInjection\Configuration; +use Symfony\Component\Config\Definition\ArrayNode; + class ConfigurationTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/OroGridExtensionTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/OroGridExtensionTest.php index 1bb1b704239..ba9449b5692 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/OroGridExtensionTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/DependencyInjection/OroGridExtensionTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Oro\Bundle\GridBundle\DependencyInjection\OroGridExtension; +use Symfony\Component\DependencyInjection\ContainerBuilder; class OroGridExtensionTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/EventDispatcher/AbstractDatagridEventTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/EventDispatcher/AbstractDatagridEventTest.php index 79c9c135745..818bb5eaa45 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/EventDispatcher/AbstractDatagridEventTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/EventDispatcher/AbstractDatagridEventTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\EventDispatcher; -use Oro\Bundle\GridBundle\EventDispatcher\AbstractDatagridEvent; use Oro\Bundle\GridBundle\Datagrid\DatagridInterface; +use Oro\Bundle\GridBundle\EventDispatcher\AbstractDatagridEvent; class AbstractDatagridEventTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Field/FieldDescriptionCollectionTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Field/FieldDescriptionCollectionTest.php index 54e58969531..9080c0d3781 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Field/FieldDescriptionCollectionTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Field/FieldDescriptionCollectionTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Field; -use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; use Oro\Bundle\GridBundle\Field\FieldDescription; +use Oro\Bundle\GridBundle\Field\FieldDescriptionCollection; class FieldDescriptionCollectionTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Field/FieldDescriptionTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Field/FieldDescriptionTest.php index f67aa8e82a2..3be48e3d9f6 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Field/FieldDescriptionTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Field/FieldDescriptionTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Field; -use Oro\Bundle\GridBundle\Field\FieldDescription; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; +use Oro\Bundle\GridBundle\Field\FieldDescription; /** * @SuppressWarnings(PHPMD.TooManyMethods) diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/AbstractDateFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/AbstractDateFilterTest.php index 9eb202f1d00..0a06daf1944 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/AbstractDateFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/AbstractDateFilterTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM; -use Oro\Bundle\GridBundle\Filter\ORM\AbstractDateFilter; - use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; +use Oro\Bundle\GridBundle\Filter\ORM\AbstractDateFilter; + class AbstractDateFilterTest extends FilterTestCase { /** diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/AbstractFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/AbstractFilterTest.php index 07d03f72878..c1bb65fe718 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/AbstractFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/AbstractFilterTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM; -use Oro\Bundle\GridBundle\Filter\ORM\AbstractFilter; -use Oro\Bundle\FilterBundle\Form\Type\Filter\TextFilterType; use Oro\Bundle\FilterBundle\Form\Type\Filter\FilterType; +use Oro\Bundle\FilterBundle\Form\Type\Filter\TextFilterType; +use Oro\Bundle\GridBundle\Filter\ORM\AbstractFilter; class AbstractFilterTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/ChoiceFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/ChoiceFilterTest.php index f7cc452898c..8ed5ea5e06f 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/ChoiceFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/ChoiceFilterTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM; +use Doctrine\Common\Collections\ArrayCollection; use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; use Oro\Bundle\GridBundle\Filter\ORM\ChoiceFilter; -use Doctrine\Common\Collections\ArrayCollection; class ChoiceFilterTest extends FilterTestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/DateRangeFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/DateRangeFilterTest.php index 9c9c26947fa..6c2b057c29d 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/DateRangeFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/DateRangeFilterTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM; -use Oro\Bundle\GridBundle\Filter\ORM\DateRangeFilter; use Oro\Bundle\FilterBundle\Form\Type\Filter\DateRangeFilterType; +use Oro\Bundle\GridBundle\Filter\ORM\DateRangeFilter; class DateRangeFilterTest extends AbstractDateFilterTest { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/DateTimeRangeFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/DateTimeRangeFilterTest.php index 74525b473d0..83589720089 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/DateTimeRangeFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/DateTimeRangeFilterTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM; -use Oro\Bundle\GridBundle\Filter\ORM\DateTimeRangeFilter; use Oro\Bundle\FilterBundle\Form\Type\Filter\DateTimeRangeFilterType; +use Oro\Bundle\GridBundle\Filter\ORM\DateTimeRangeFilter; class DateTimeRangeFilterTest extends AbstractDateFilterTest { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/EntityFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/EntityFilterTest.php index 47d3834698b..d67c3c5aca6 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/EntityFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/EntityFilterTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM; -use Oro\Bundle\GridBundle\Filter\ORM\EntityFilter; use Oro\Bundle\FilterBundle\Form\Type\Filter\EntityFilterType; +use Oro\Bundle\GridBundle\Filter\ORM\EntityFilter; class EntityFilterTest extends FilterTestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/FilterTestCase.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/FilterTestCase.php index ae0bb7e1f79..4faeccb7db8 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/FilterTestCase.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/FilterTestCase.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM; use Doctrine\ORM\Query\Expr; -use Symfony\Component\Translation\TranslatorInterface; +use Oro\Bundle\GridBundle\Filter\FilterInterface; use Oro\Bundle\GridBundle\Filter\ORM\AbstractFilter; -use Oro\Bundle\GridBundle\Filter\FilterInterface; +use Symfony\Component\Translation\TranslatorInterface; abstract class FilterTestCase extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/AbstractFlexibleFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/AbstractFlexibleFilterTest.php index 3071663a52a..5254e008c81 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/AbstractFlexibleFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/AbstractFlexibleFilterTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM\Flexible; -use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; -use Oro\Bundle\GridBundle\Filter\ORM\Flexible\AbstractFlexibleFilter; use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; +use Oro\Bundle\GridBundle\Datagrid\ProxyQueryInterface; use Oro\Bundle\GridBundle\Filter\FilterInterface; +use Oro\Bundle\GridBundle\Filter\ORM\Flexible\AbstractFlexibleFilter; /** * @SuppressWarnings(PHPMD.TooManyMethods) diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleEntityFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleEntityFilterTest.php index 1b590f5d02b..8b19f9877e1 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleEntityFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleEntityFilterTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM\Flexible; -use Doctrine\ORM\QueryBuilder; use Doctrine\Common\Collections\ArrayCollection; -use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository; +use Doctrine\ORM\QueryBuilder; use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; -use Oro\Bundle\GridBundle\Filter\ORM\Flexible\FlexibleEntityFilter; +use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository; use Oro\Bundle\GridBundle\Filter\ORM\EntityFilter; +use Oro\Bundle\GridBundle\Filter\ORM\Flexible\FlexibleEntityFilter; /** * Test related class diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleFilterTestCase.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleFilterTestCase.php index 0a17d29ccae..35470ba9d14 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleFilterTestCase.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleFilterTestCase.php @@ -4,14 +4,14 @@ use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Translation\TranslatorInterface; - use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository; -use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; -use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; +use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; +use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; use Oro\Bundle\GridBundle\Datagrid\ORM\ProxyQuery; + use Oro\Bundle\GridBundle\Filter\ORM\Flexible\AbstractFlexibleFilter; +use Symfony\Component\Translation\TranslatorInterface; abstract class FlexibleFilterTestCase extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleNumberFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleNumberFilterTest.php index 4b7ec9747e2..df5805368fb 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleNumberFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleNumberFilterTest.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM\Flexible; use Oro\Bundle\FilterBundle\Form\Type\Filter\NumberFilterType; -use Oro\Bundle\GridBundle\Filter\ORM\NumberFilter; use Oro\Bundle\GridBundle\Filter\ORM\Flexible\FlexibleNumberFilter; +use Oro\Bundle\GridBundle\Filter\ORM\NumberFilter; class FlexibleNumberFilterTest extends FlexibleFilterTestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleOptionsFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleOptionsFilterTest.php index 2b6e6cd0e97..487ccc85a5f 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleOptionsFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleOptionsFilterTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM\Flexible; -use Oro\Bundle\FlexibleEntityBundle\Entity\Attribute; +use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; +use Oro\Bundle\FlexibleEntityBundle\Entity\Attribute; use Oro\Bundle\FlexibleEntityBundle\Entity\AttributeOption; -use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityAttributeOptionValue; -use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType; +use Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityAttributeOptionValue; use Oro\Bundle\GridBundle\Filter\ORM\ChoiceFilter; use Oro\Bundle\GridBundle\Filter\ORM\Flexible\FlexibleOptionsFilter; diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleStringFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleStringFilterTest.php index 9af7b057471..b9854770e15 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleStringFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/Flexible/FlexibleStringFilterTest.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM\Flexible; use Oro\Bundle\FilterBundle\Form\Type\Filter\TextFilterType; -use Oro\Bundle\GridBundle\Filter\ORM\StringFilter; use Oro\Bundle\GridBundle\Filter\ORM\Flexible\FlexibleStringFilter; +use Oro\Bundle\GridBundle\Filter\ORM\StringFilter; class FlexibleStringFilterTest extends FlexibleFilterTestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/NumberFilterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/NumberFilterTest.php index da279434726..31d70168010 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/NumberFilterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Filter/ORM/NumberFilterTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Filter\ORM; -use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; use Oro\Bundle\FilterBundle\Form\Type\Filter\NumberFilterType; +use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; use Oro\Bundle\GridBundle\Filter\ORM\NumberFilter; class NumberFilterTest extends FilterTestCase diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Property/FieldPropertyTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Property/FieldPropertyTest.php index 9a49949b013..66b1ba69ebe 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Property/FieldPropertyTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Property/FieldPropertyTest.php @@ -5,8 +5,8 @@ use Oro\Bundle\GridBundle\Datagrid\ResultRecord; use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; -use Oro\Bundle\GridBundle\Property\FieldProperty; use Oro\Bundle\GridBundle\Field\FieldDescription; +use Oro\Bundle\GridBundle\Property\FieldProperty; class FieldPropertyTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Property/UrlPropertyTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Property/UrlPropertyTest.php index 77cbae6cdce..c1afc776423 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Property/UrlPropertyTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Property/UrlPropertyTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Property; -use Symfony\Bundle\FrameworkBundle\Routing\Router; - use Oro\Bundle\GridBundle\Datagrid\ResultRecord; + use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; use Oro\Bundle\GridBundle\Property\UrlProperty; +use Symfony\Bundle\FrameworkBundle\Routing\Router; class UrlPropertyTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Renderer/GridRendererTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Renderer/GridRendererTest.php index 1a79f812481..1933806c204 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Renderer/GridRendererTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Renderer/GridRendererTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Renderer; +use Oro\Bundle\GridBundle\Datagrid\DatagridView; +use Oro\Bundle\GridBundle\Renderer\GridRenderer; use Symfony\Bundle\FrameworkBundle\Templating\PhpEngine; use Symfony\Component\HttpFoundation\Response; -use Oro\Bundle\GridBundle\Renderer\GridRenderer; -use Oro\Bundle\GridBundle\Datagrid\DatagridView; class GridRendererTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Route/DefaultRouteGeneratorTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Route/DefaultRouteGeneratorTest.php index 96cf4a1c904..c7beec16d25 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Route/DefaultRouteGeneratorTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Route/DefaultRouteGeneratorTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Route; -use Symfony\Component\Routing\RouterInterface; -use Oro\Bundle\GridBundle\Route\DefaultRouteGenerator; use Oro\Bundle\GridBundle\Datagrid\ParametersInterface; use Oro\Bundle\GridBundle\Field\FieldDescription; +use Oro\Bundle\GridBundle\Route\DefaultRouteGenerator; +use Symfony\Component\Routing\RouterInterface; class DefaultRouteGeneratorTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/ORM/Flexible/FlexibleSorterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/ORM/Flexible/FlexibleSorterTest.php index 079754ee88a..cf48d705e3b 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/ORM/Flexible/FlexibleSorterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/ORM/Flexible/FlexibleSorterTest.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Sorter\ORM\Flexible; -use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; -use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; use Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository; +use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager; +use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManagerRegistry; use Oro\Bundle\GridBundle\Field\FieldDescription; -use Oro\Bundle\GridBundle\Sorter\SorterInterface; use Oro\Bundle\GridBundle\Sorter\ORM\Flexible\FlexibleSorter; +use Oro\Bundle\GridBundle\Sorter\SorterInterface; class FlexibleSorterTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/ORM/SorterTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/ORM/SorterTest.php index a7350c8345f..fdcf0c06b27 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/ORM/SorterTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/ORM/SorterTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Sorter\ORM; -use Oro\Bundle\GridBundle\Sorter\SorterInterface; -use Oro\Bundle\GridBundle\Sorter\ORM\Sorter; use Oro\Bundle\GridBundle\Field\FieldDescriptionInterface; +use Oro\Bundle\GridBundle\Sorter\ORM\Sorter; +use Oro\Bundle\GridBundle\Sorter\SorterInterface; class SorterTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/SorterFactoryTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/SorterFactoryTest.php index 4b7c18e93d6..b24bc76c096 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/SorterFactoryTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Sorter/SorterFactoryTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Sorter; -use Oro\Bundle\GridBundle\Sorter\SorterFactory; use Oro\Bundle\GridBundle\Field\FieldDescription; +use Oro\Bundle\GridBundle\Sorter\SorterFactory; class SorterFactoryTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/GridBundle/Tests/Unit/Twig/GridRendererExtensionTest.php b/src/Oro/Bundle/GridBundle/Tests/Unit/Twig/GridRendererExtensionTest.php index 1003a592039..0c33087bb50 100644 --- a/src/Oro/Bundle/GridBundle/Tests/Unit/Twig/GridRendererExtensionTest.php +++ b/src/Oro/Bundle/GridBundle/Tests/Unit/Twig/GridRendererExtensionTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\GridBundle\Tests\Unit\Twig; -use Oro\Bundle\GridBundle\Twig\GridRendererExtension; -use Oro\Bundle\GridBundle\Renderer\GridRenderer; use Oro\Bundle\GridBundle\Datagrid\DatagridView; +use Oro\Bundle\GridBundle\Renderer\GridRenderer; +use Oro\Bundle\GridBundle\Twig\GridRendererExtension; class GridRendererExtensionTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/HelpBundle/DependencyInjection/OroHelpExtension.php b/src/Oro/Bundle/HelpBundle/DependencyInjection/OroHelpExtension.php index 9daa50939ad..a5a444fb190 100644 --- a/src/Oro/Bundle/HelpBundle/DependencyInjection/OroHelpExtension.php +++ b/src/Oro/Bundle/HelpBundle/DependencyInjection/OroHelpExtension.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\HelpBundle\DependencyInjection; +use Symfony\Component\Config\FileLocator; use Symfony\Component\Config\Resource\FileResource; -use Symfony\Component\Yaml\Yaml; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; -use Symfony\Component\Config\FileLocator; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\Yaml\Yaml; class OroHelpExtension extends Extension { diff --git a/src/Oro/Bundle/HelpBundle/EventListener/HelpLinkRequestListener.php b/src/Oro/Bundle/HelpBundle/EventListener/HelpLinkRequestListener.php index f5f5b964de6..bd3d62130d4 100644 --- a/src/Oro/Bundle/HelpBundle/EventListener/HelpLinkRequestListener.php +++ b/src/Oro/Bundle/HelpBundle/EventListener/HelpLinkRequestListener.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\HelpBundle\EventListener; +use Oro\Bundle\HelpBundle\Model\HelpLinkProvider; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpKernel\HttpKernel; -use Symfony\Component\HttpKernel\Event\FilterControllerEvent; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Event\FilterControllerEvent; -use Oro\Bundle\HelpBundle\Model\HelpLinkProvider; +use Symfony\Component\HttpKernel\HttpKernel; class HelpLinkRequestListener { diff --git a/src/Oro/Bundle/HelpBundle/Model/HelpLinkProvider.php b/src/Oro/Bundle/HelpBundle/Model/HelpLinkProvider.php index 04897c8fb35..5bd280294f2 100644 --- a/src/Oro/Bundle/HelpBundle/Model/HelpLinkProvider.php +++ b/src/Oro/Bundle/HelpBundle/Model/HelpLinkProvider.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\HelpBundle\Model; +use Oro\Bundle\HelpBundle\Annotation\Help; use Oro\Bundle\PlatformBundle\OroPlatformBundle; use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser; -use Symfony\Component\HttpFoundation\Request; use Symfony\Component\DependencyInjection\ContainerInterface; -use Oro\Bundle\HelpBundle\Annotation\Help; +use Symfony\Component\HttpFoundation\Request; class HelpLinkProvider { diff --git a/src/Oro/Bundle/HelpBundle/OroHelpBundle.php b/src/Oro/Bundle/HelpBundle/OroHelpBundle.php index da8362039cf..d68cbe005ec 100644 --- a/src/Oro/Bundle/HelpBundle/OroHelpBundle.php +++ b/src/Oro/Bundle/HelpBundle/OroHelpBundle.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\HelpBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroHelpBundle extends Bundle { diff --git a/src/Oro/Bundle/ImapBundle/Command/Cron/EmailSyncCommand.php b/src/Oro/Bundle/ImapBundle/Command/Cron/EmailSyncCommand.php index 4d6c66f9ae7..68c67001759 100644 --- a/src/Oro/Bundle/ImapBundle/Command/Cron/EmailSyncCommand.php +++ b/src/Oro/Bundle/ImapBundle/Command/Cron/EmailSyncCommand.php @@ -3,12 +3,12 @@ namespace Oro\Bundle\ImapBundle\Command\Cron; use Oro\Bundle\CronBundle\Command\CronCommandInterface; +use Oro\Bundle\CronBundle\Command\Logger\OutputLogger; +use Oro\Bundle\ImapBundle\Sync\ImapEmailSynchronizer; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Oro\Bundle\ImapBundle\Sync\ImapEmailSynchronizer; -use Oro\Bundle\CronBundle\Command\Logger\OutputLogger; class EmailSyncCommand extends ContainerAwareCommand implements CronCommandInterface { diff --git a/src/Oro/Bundle/ImapBundle/Connector/ImapConnector.php b/src/Oro/Bundle/ImapBundle/Connector/ImapConnector.php index 39d251a4cf8..26aae019fe8 100644 --- a/src/Oro/Bundle/ImapBundle/Connector/ImapConnector.php +++ b/src/Oro/Bundle/ImapBundle/Connector/ImapConnector.php @@ -5,9 +5,9 @@ use Oro\Bundle\ImapBundle\Connector\Search\SearchQuery; use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryBuilder; use Oro\Bundle\ImapBundle\Connector\Search\SearchStringManagerInterface; +use Oro\Bundle\ImapBundle\Mail\Storage\Folder; use Oro\Bundle\ImapBundle\Mail\Storage\Imap; use Oro\Bundle\ImapBundle\Mail\Storage\Message; -use Oro\Bundle\ImapBundle\Mail\Storage\Folder; /** * A base class for connectors intended to work with email's servers through IMAP protocol. diff --git a/src/Oro/Bundle/ImapBundle/Connector/ImapServicesFactory.php b/src/Oro/Bundle/ImapBundle/Connector/ImapServicesFactory.php index 10d79ff6c9f..f2ad0d04462 100644 --- a/src/Oro/Bundle/ImapBundle/Connector/ImapServicesFactory.php +++ b/src/Oro/Bundle/ImapBundle/Connector/ImapServicesFactory.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ImapBundle\Connector; -use Oro\Bundle\ImapBundle\Mail\Storage\Imap; use Oro\Bundle\ImapBundle\Connector\Exception\InvalidConfigurationException; +use Oro\Bundle\ImapBundle\Mail\Storage\Imap; /** * Provides a factory class that creates ImapServices objects. diff --git a/src/Oro/Bundle/ImapBundle/DependencyInjection/OroImapExtension.php b/src/Oro/Bundle/ImapBundle/DependencyInjection/OroImapExtension.php index 61f09c0750a..09ae8d4c84d 100644 --- a/src/Oro/Bundle/ImapBundle/DependencyInjection/OroImapExtension.php +++ b/src/Oro/Bundle/ImapBundle/DependencyInjection/OroImapExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\ImapBundle\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 diff --git a/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php b/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php index 04a274fd023..228c689e3dc 100644 --- a/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php +++ b/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php @@ -2,14 +2,18 @@ namespace Oro\Bundle\ImapBundle\Form\Type; +use Oro\Bundle\ImapBundle\Entity\ImapEmailOrigin; +use Oro\Bundle\SecurityBundle\Encoder\Mcrypt; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormEvent; -use Symfony\Component\Form\FormEvents; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\NumberType; +use Symfony\Component\Form\Extension\Core\Type\PasswordType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\FormEvent; -use Oro\Bundle\ImapBundle\Entity\ImapEmailOrigin; -use Oro\Bundle\SecurityBundle\Encoder\Mcrypt; +use Symfony\Component\Form\FormEvents; +use Symfony\Component\OptionsResolver\OptionsResolver; class ConfigurationType extends AbstractType { @@ -73,11 +77,11 @@ function ($item) { ); $builder - ->add('host', 'text', array('required' => true)) - ->add('port', 'number', array('required' => true)) + ->add('host', TextType::class, array('required' => true)) + ->add('port', NumberType::class, array('required' => true)) ->add( 'ssl', - 'choice', + ChoiceType::class, array( 'choices' => array('ssl' => 'ssl', 'tsl' => 'tsl'), 'empty_data' => null, @@ -85,14 +89,14 @@ function ($item) { 'required' => false ) ) - ->add('user', 'text', array('required' => true)) - ->add('password', 'password', array('required' => true)); + ->add('user', TextType::class, array('required' => true)) + ->add('password', PasswordType::class, array('required' => true)); } /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -105,7 +109,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } diff --git a/src/Oro/Bundle/ImapBundle/Mail/Storage/Attachment.php b/src/Oro/Bundle/ImapBundle/Mail/Storage/Attachment.php index b4000f88515..b697e5733e4 100644 --- a/src/Oro/Bundle/ImapBundle/Mail/Storage/Attachment.php +++ b/src/Oro/Bundle/ImapBundle/Mail/Storage/Attachment.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\ImapBundle\Mail\Storage; -use Zend\Mail\Headers; use \Zend\Mail\Storage\Part; use \Zend\Mime\Decode; +use Zend\Mail\Headers; class Attachment { diff --git a/src/Oro/Bundle/ImapBundle/Mail/Storage/Body.php b/src/Oro/Bundle/ImapBundle/Mail/Storage/Body.php index 95b5c44d6dc..a91fbee1415 100644 --- a/src/Oro/Bundle/ImapBundle/Mail/Storage/Body.php +++ b/src/Oro/Bundle/ImapBundle/Mail/Storage/Body.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ImapBundle\Mail\Storage; -use Zend\Mail\Headers; use \Zend\Mail\Storage\Part; +use Zend\Mail\Headers; class Body { diff --git a/src/Oro/Bundle/ImapBundle/Manager/DTO/Email.php b/src/Oro/Bundle/ImapBundle/Manager/DTO/Email.php index b3db2d7cad8..ae510c1c860 100644 --- a/src/Oro/Bundle/ImapBundle/Manager/DTO/Email.php +++ b/src/Oro/Bundle/ImapBundle/Manager/DTO/Email.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\ImapBundle\Manager\DTO; use Oro\Bundle\ImapBundle\Mail\Storage\Body; -use Oro\Bundle\ImapBundle\Mail\Storage\Message; use Oro\Bundle\ImapBundle\Mail\Storage\Exception\InvalidBodyFormatException; +use Oro\Bundle\ImapBundle\Mail\Storage\Message; class Email { diff --git a/src/Oro/Bundle/ImapBundle/Manager/ImapEmailManager.php b/src/Oro/Bundle/ImapBundle/Manager/ImapEmailManager.php index 1b063954fd5..f5c85f5c2c6 100644 --- a/src/Oro/Bundle/ImapBundle/Manager/ImapEmailManager.php +++ b/src/Oro/Bundle/ImapBundle/Manager/ImapEmailManager.php @@ -4,16 +4,16 @@ use Oro\Bundle\ImapBundle\Connector\ImapConnector; use Oro\Bundle\ImapBundle\Connector\Search\SearchQuery; -use Oro\Bundle\ImapBundle\Manager\DTO\ItemId; -use Oro\Bundle\ImapBundle\Manager\DTO\Email; -use Oro\Bundle\ImapBundle\Mail\Storage\Folder; use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryBuilder; -use Zend\Mail\Headers; -use Zend\Mail\Header\HeaderInterface; -use Zend\Mail\Header\AbstractAddressList; +use Oro\Bundle\ImapBundle\Mail\Storage\Folder; +use Oro\Bundle\ImapBundle\Mail\Storage\Message; +use Oro\Bundle\ImapBundle\Manager\DTO\Email; +use Oro\Bundle\ImapBundle\Manager\DTO\ItemId; use Zend\Mail\Address\AddressInterface; +use Zend\Mail\Header\AbstractAddressList; +use Zend\Mail\Header\HeaderInterface; +use Zend\Mail\Headers; use Zend\Mail\Storage\Exception as MailException; -use Oro\Bundle\ImapBundle\Mail\Storage\Message; class ImapEmailManager { diff --git a/src/Oro/Bundle/ImapBundle/Provider/ImapEmailBodyLoader.php b/src/Oro/Bundle/ImapBundle/Provider/ImapEmailBodyLoader.php index 14d37be18bf..65c373d178b 100644 --- a/src/Oro/Bundle/ImapBundle/Provider/ImapEmailBodyLoader.php +++ b/src/Oro/Bundle/ImapBundle/Provider/ImapEmailBodyLoader.php @@ -3,15 +3,15 @@ namespace Oro\Bundle\ImapBundle\Provider; use Doctrine\ORM\EntityManager; +use Oro\Bundle\EmailBundle\Builder\EmailBodyBuilder; +use Oro\Bundle\EmailBundle\Entity\Email; use Oro\Bundle\EmailBundle\Entity\EmailOrigin; use Oro\Bundle\EmailBundle\Provider\EmailBodyLoaderInterface; -use Oro\Bundle\EmailBundle\Entity\Email; -use Oro\Bundle\EmailBundle\Builder\EmailBodyBuilder; -use Oro\Bundle\ImapBundle\Connector\ImapConnectorFactory; use Oro\Bundle\ImapBundle\Connector\ImapConfig; +use Oro\Bundle\ImapBundle\Connector\ImapConnectorFactory; +use Oro\Bundle\ImapBundle\Entity\ImapEmail; use Oro\Bundle\ImapBundle\Entity\ImapEmailOrigin; use Oro\Bundle\ImapBundle\Manager\ImapEmailManager; -use Oro\Bundle\ImapBundle\Entity\ImapEmail; use Oro\Bundle\SecurityBundle\Encoder\Mcrypt; class ImapEmailBodyLoader implements EmailBodyLoaderInterface diff --git a/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizationProcessor.php b/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizationProcessor.php index 083d7ae6b26..17890273947 100644 --- a/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizationProcessor.php +++ b/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizationProcessor.php @@ -2,24 +2,24 @@ namespace Oro\Bundle\ImapBundle\Sync; -use Doctrine\ORM\EntityManager; use Doctrine\Common\Collections\Criteria; +use Doctrine\ORM\EntityManager; use Doctrine\ORM\NoResultException; use Doctrine\ORM\Query; -use Psr\Log\LoggerInterface; +use Oro\Bundle\EmailBundle\Builder\EmailEntityBuilder; +use Oro\Bundle\EmailBundle\Entity\EmailAddress; +use Oro\Bundle\EmailBundle\Entity\EmailFolder; +use Oro\Bundle\EmailBundle\Entity\EmailOrigin; +use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; use Oro\Bundle\EmailBundle\Sync\AbstractEmailSynchronizationProcessor; use Oro\Bundle\ImapBundle\Connector\Search\SearchQuery; use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryBuilder; use Oro\Bundle\ImapBundle\Entity\ImapEmail; use Oro\Bundle\ImapBundle\Entity\ImapEmailFolder; -use Oro\Bundle\ImapBundle\Manager\ImapEmailManager; -use Oro\Bundle\EmailBundle\Entity\EmailAddress; -use Oro\Bundle\EmailBundle\Entity\EmailFolder; -use Oro\Bundle\EmailBundle\Entity\EmailOrigin; use Oro\Bundle\ImapBundle\Mail\Storage\Folder; use Oro\Bundle\ImapBundle\Manager\DTO\Email; -use Oro\Bundle\EmailBundle\Builder\EmailEntityBuilder; -use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; +use Oro\Bundle\ImapBundle\Manager\ImapEmailManager; +use Psr\Log\LoggerInterface; /** * @todo the implemented synchronization algorithm is just a demo and it will be fixed soon diff --git a/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizer.php b/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizer.php index 5b5a6b918ed..c5c0631de58 100644 --- a/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizer.php +++ b/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizer.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\ImapBundle\Sync; -use Oro\Bundle\EmailBundle\Sync\AbstractEmailSynchronizer; use Doctrine\ORM\EntityManager; use Oro\Bundle\EmailBundle\Builder\EmailEntityBuilder; use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; +use Oro\Bundle\EmailBundle\Sync\AbstractEmailSynchronizer; use Oro\Bundle\ImapBundle\Connector\ImapConfig; use Oro\Bundle\ImapBundle\Connector\ImapConnectorFactory; -use Oro\Bundle\ImapBundle\Manager\ImapEmailManager; use Oro\Bundle\ImapBundle\Entity\ImapEmailOrigin; +use Oro\Bundle\ImapBundle\Manager\ImapEmailManager; use Oro\Bundle\SecurityBundle\Encoder\Mcrypt; class ImapEmailSynchronizer extends AbstractEmailSynchronizer diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/ImapConnectorTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/ImapConnectorTest.php index edd93ee53ea..cf9f1c8cdc8 100644 --- a/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/ImapConnectorTest.php +++ b/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/ImapConnectorTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ImapBundle\Tests\Unit\Connector; -use Oro\Bundle\ImapBundle\Connector\ImapConnector; use Oro\Bundle\ImapBundle\Connector\ImapConfig; +use Oro\Bundle\ImapBundle\Connector\ImapConnector; use Oro\Bundle\ImapBundle\Connector\ImapServices; class ImapConnectorTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/ImapServicesFactoryTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/ImapServicesFactoryTest.php index 720e97a3a88..63d91f27d59 100644 --- a/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/ImapServicesFactoryTest.php +++ b/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/ImapServicesFactoryTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\ImapBundle\Tests\Unit\Connector; -use Oro\Bundle\ImapBundle\Connector\ImapServicesFactory; use Oro\Bundle\ImapBundle\Connector\ImapConfig; use Oro\Bundle\ImapBundle\Connector\ImapServices; +use Oro\Bundle\ImapBundle\Connector\ImapServicesFactory; class ImapServicesFactoryTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/Search/GmailSearchStringManagerTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/Search/GmailSearchStringManagerTest.php index 6cf6486ac99..37786d3c251 100644 --- a/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/Search/GmailSearchStringManagerTest.php +++ b/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/Search/GmailSearchStringManagerTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\ImapBundle\Tests\Unit\Connector\Search; +use Oro\Bundle\ImapBundle\Connector\Search\GmailSearchStringManager; use Oro\Bundle\ImapBundle\Connector\Search\SearchQuery; use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryExpr; use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryMatch; -use Oro\Bundle\ImapBundle\Connector\Search\GmailSearchStringManager; class GmailSearchStringManagerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/Search/SearchQueryBuilderTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/Search/SearchQueryBuilderTest.php index 846d14a9fd4..7dbdddbb1e9 100644 --- a/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/Search/SearchQueryBuilderTest.php +++ b/src/Oro/Bundle/ImapBundle/Tests/Unit/Connector/Search/SearchQueryBuilderTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\ImapBundle\Tests\Unit\Connector\Search; use Oro\Bundle\ImapBundle\Connector\Search\SearchQuery; +use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryBuilder; use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryExprItem; use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryExprOperator; use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryExprValue; use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryMatch; -use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryBuilder; use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryValueBuilder; use Oro\Bundle\ImapBundle\Connector\Search\SearchStringManagerInterface; diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php index df569ebb8fa..2b495d71156 100644 --- a/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php +++ b/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\ImapBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\Test\FormIntegrationTestCase; - use Oro\Bundle\ImapBundle\Entity\ImapEmailOrigin; + use Oro\Bundle\ImapBundle\Form\Type\ConfigurationType; use Oro\Bundle\SecurityBundle\Encoder\Mcrypt; +use Symfony\Component\Form\Test\FormIntegrationTestCase; class ConfigurationTypeTest extends FormIntegrationTestCase { diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Manager/DTO/EmailTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Manager/DTO/EmailTest.php index 58c385da339..c590cdd56da 100644 --- a/src/Oro/Bundle/ImapBundle/Tests/Unit/Manager/DTO/EmailTest.php +++ b/src/Oro/Bundle/ImapBundle/Tests/Unit/Manager/DTO/EmailTest.php @@ -5,9 +5,9 @@ use Oro\Bundle\ImapBundle\Mail\Storage\Body; use Oro\Bundle\ImapBundle\Mail\Storage\Exception\InvalidBodyFormatException; use Oro\Bundle\ImapBundle\Manager\DTO\Email; -use Oro\Bundle\ImapBundle\Manager\DTO\ItemId; -use Oro\Bundle\ImapBundle\Manager\DTO\EmailBody; use Oro\Bundle\ImapBundle\Manager\DTO\EmailAttachment; +use Oro\Bundle\ImapBundle\Manager\DTO\EmailBody; +use Oro\Bundle\ImapBundle\Manager\DTO\ItemId; class EmailTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/ImportExportBundle/Controller/ImportExportController.php b/src/Oro/Bundle/ImportExportBundle/Controller/ImportExportController.php index cedddb1a364..45a3c5e4fa5 100644 --- a/src/Oro/Bundle/ImportExportBundle/Controller/ImportExportController.php +++ b/src/Oro/Bundle/ImportExportBundle/Controller/ImportExportController.php @@ -2,8 +2,21 @@ namespace Oro\Bundle\ImportExportBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Oro\Bundle\BatchBundle\Entity\JobExecution; + +use Oro\Bundle\BatchBundle\Entity\JobInstance; +use Oro\Bundle\BatchBundle\Job\BatchStatus; +use Oro\Bundle\ImportExportBundle\Context\ContextInterface; +use Oro\Bundle\ImportExportBundle\File\FileSystemOperator; +use Oro\Bundle\ImportExportBundle\Form\Model\ImportData; +use Oro\Bundle\ImportExportBundle\Job\JobExecutor; +use Oro\Bundle\ImportExportBundle\Processor\ProcessorRegistry; +use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; + +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\JsonResponse; @@ -12,19 +25,6 @@ use Symfony\Component\HttpFoundation\ResponseHeaderBag; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; - -use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; -use Oro\Bundle\BatchBundle\Entity\JobInstance; -use Oro\Bundle\BatchBundle\Entity\JobExecution; -use Oro\Bundle\BatchBundle\Job\BatchStatus; -use Oro\Bundle\ImportExportBundle\Context\ContextInterface; -use Oro\Bundle\ImportExportBundle\Processor\ProcessorRegistry; -use Oro\Bundle\ImportExportBundle\Job\JobExecutor; -use Oro\Bundle\ImportExportBundle\File\FileSystemOperator; -use Oro\Bundle\ImportExportBundle\Form\Model\ImportData; - class ImportExportController extends Controller { const MAX_ERRORS_COUNT = 3; @@ -34,9 +34,9 @@ class ImportExportController extends Controller * @AclAncestor("oro_importexport_import") * @Template */ - public function importFormAction() + public function importFormAction(Request $request) { - $entityName = $this->getRequest()->get('entity'); + $entityName = $request->get('entity'); $importForm = $this->createForm('oro_importexport_import', null, array('entityName' => $entityName)); diff --git a/src/Oro/Bundle/ImportExportBundle/DependencyInjection/Compiler/AddNormalizerCompilerPass.php b/src/Oro/Bundle/ImportExportBundle/DependencyInjection/Compiler/AddNormalizerCompilerPass.php index 6b6f029ae8d..80e2a826344 100644 --- a/src/Oro/Bundle/ImportExportBundle/DependencyInjection/Compiler/AddNormalizerCompilerPass.php +++ b/src/Oro/Bundle/ImportExportBundle/DependencyInjection/Compiler/AddNormalizerCompilerPass.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\ImportExportBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\Reference; class AddNormalizerCompilerPass implements CompilerPassInterface diff --git a/src/Oro/Bundle/ImportExportBundle/DependencyInjection/Compiler/ProcessorRegistryCompilerPass.php b/src/Oro/Bundle/ImportExportBundle/DependencyInjection/Compiler/ProcessorRegistryCompilerPass.php index 6c6443c2d27..87791b666f7 100644 --- a/src/Oro/Bundle/ImportExportBundle/DependencyInjection/Compiler/ProcessorRegistryCompilerPass.php +++ b/src/Oro/Bundle/ImportExportBundle/DependencyInjection/Compiler/ProcessorRegistryCompilerPass.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\ImportExportBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; -use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\Exception\LogicException; +use Symfony\Component\DependencyInjection\Reference; class ProcessorRegistryCompilerPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/ImportExportBundle/DependencyInjection/OroImportExportExtension.php b/src/Oro/Bundle/ImportExportBundle/DependencyInjection/OroImportExportExtension.php index 24756a54388..d9edeae3dba 100644 --- a/src/Oro/Bundle/ImportExportBundle/DependencyInjection/OroImportExportExtension.php +++ b/src/Oro/Bundle/ImportExportBundle/DependencyInjection/OroImportExportExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\ImportExportBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\Config\FileLocator; class OroImportExportExtension extends Extension { diff --git a/src/Oro/Bundle/ImportExportBundle/Form/Type/ImportType.php b/src/Oro/Bundle/ImportExportBundle/Form/Type/ImportType.php index 4c1dc9e014f..03f23268d81 100644 --- a/src/Oro/Bundle/ImportExportBundle/Form/Type/ImportType.php +++ b/src/Oro/Bundle/ImportExportBundle/Form/Type/ImportType.php @@ -2,11 +2,13 @@ namespace Oro\Bundle\ImportExportBundle\Form\Type; +use Oro\Bundle\ImportExportBundle\Processor\ProcessorRegistry; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\FileType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\ImportExportBundle\Processor\ProcessorRegistry; +use Symfony\Component\OptionsResolver\OptionsResolver; class ImportType extends AbstractType { @@ -33,7 +35,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( 'file', - 'file', + FileType::class, array( 'required' => true ) @@ -43,7 +45,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->add( 'processorAlias', - 'choice', + ChoiceType::class, array( 'choices' => $processorChoices, 'required' => true, @@ -73,7 +75,7 @@ protected function generateProcessorLabel($alias) /** * @param OptionsResolverInterface $resolver */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -91,7 +93,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } diff --git a/src/Oro/Bundle/ImportExportBundle/Job/JobExecutor.php b/src/Oro/Bundle/ImportExportBundle/Job/JobExecutor.php index 4e9230d0774..cd2dff4168b 100644 --- a/src/Oro/Bundle/ImportExportBundle/Job/JobExecutor.php +++ b/src/Oro/Bundle/ImportExportBundle/Job/JobExecutor.php @@ -6,12 +6,12 @@ use Doctrine\ORM\EntityRepository; use Oro\Bundle\BatchBundle\Connector\ConnectorRegistry; -use Oro\Bundle\BatchBundle\Entity\JobInstance; use Oro\Bundle\BatchBundle\Entity\JobExecution; +use Oro\Bundle\BatchBundle\Entity\JobInstance; use Oro\Bundle\BatchBundle\Job\BatchStatus; use Oro\Bundle\ImportExportBundle\Context\ContextRegistry; -use Oro\Bundle\ImportExportBundle\Exception\RuntimeException; use Oro\Bundle\ImportExportBundle\Exception\LogicException; +use Oro\Bundle\ImportExportBundle\Exception\RuntimeException; class JobExecutor { diff --git a/src/Oro/Bundle/ImportExportBundle/OroImportExportBundle.php b/src/Oro/Bundle/ImportExportBundle/OroImportExportBundle.php index 59a42a7aeb2..72ecda7d9f2 100644 --- a/src/Oro/Bundle/ImportExportBundle/OroImportExportBundle.php +++ b/src/Oro/Bundle/ImportExportBundle/OroImportExportBundle.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\ImportExportBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Oro\Bundle\ImportExportBundle\DependencyInjection\Compiler\AddNormalizerCompilerPass; use Oro\Bundle\ImportExportBundle\DependencyInjection\Compiler\ProcessorRegistryCompilerPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroImportExportBundle extends Bundle { diff --git a/src/Oro/Bundle/ImportExportBundle/Processor/ExportProcessor.php b/src/Oro/Bundle/ImportExportBundle/Processor/ExportProcessor.php index 38d478ee467..180d66b616d 100644 --- a/src/Oro/Bundle/ImportExportBundle/Processor/ExportProcessor.php +++ b/src/Oro/Bundle/ImportExportBundle/Processor/ExportProcessor.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\ImportExportBundle\Processor; -use Symfony\Component\Serializer\SerializerInterface; - use Doctrine\ORM\QueryBuilder; use Oro\Bundle\ImportExportBundle\Context\ContextAwareInterface; + use Oro\Bundle\ImportExportBundle\Context\ContextInterface; -use Oro\Bundle\ImportExportBundle\Converter\QueryBuilderAwareInterface; use Oro\Bundle\ImportExportBundle\Converter\DataConverterInterface; -use Oro\Bundle\ImportExportBundle\Processor\ProcessorInterface; +use Oro\Bundle\ImportExportBundle\Converter\QueryBuilderAwareInterface; use Oro\Bundle\ImportExportBundle\Exception\InvalidConfigurationException; use Oro\Bundle\ImportExportBundle\Exception\RuntimeException; +use Oro\Bundle\ImportExportBundle\Processor\ProcessorInterface; +use Symfony\Component\Serializer\SerializerInterface; class ExportProcessor implements ProcessorInterface, ContextAwareInterface { diff --git a/src/Oro/Bundle/ImportExportBundle/Processor/ImportProcessor.php b/src/Oro/Bundle/ImportExportBundle/Processor/ImportProcessor.php index f226870a62d..34bec1e7e24 100644 --- a/src/Oro/Bundle/ImportExportBundle/Processor/ImportProcessor.php +++ b/src/Oro/Bundle/ImportExportBundle/Processor/ImportProcessor.php @@ -3,13 +3,13 @@ namespace Oro\Bundle\ImportExportBundle\Processor; use Oro\Bundle\ImportExportBundle\Context\ContextAwareInterface; -use Symfony\Component\Serializer\SerializerAwareInterface; -use Symfony\Component\Serializer\SerializerInterface; - use Oro\Bundle\ImportExportBundle\Context\ContextInterface; -use Oro\Bundle\ImportExportBundle\Processor\ContextAwareProcessor; use Oro\Bundle\ImportExportBundle\Converter\DataConverterInterface; + +use Oro\Bundle\ImportExportBundle\Processor\ContextAwareProcessor; use Oro\Bundle\ImportExportBundle\Strategy\StrategyInterface; +use Symfony\Component\Serializer\SerializerAwareInterface; +use Symfony\Component\Serializer\SerializerInterface; class ImportProcessor implements ProcessorInterface, ContextAwareProcessor, SerializerAwareInterface { diff --git a/src/Oro/Bundle/ImportExportBundle/Processor/ProcessorRegistry.php b/src/Oro/Bundle/ImportExportBundle/Processor/ProcessorRegistry.php index 1caa8ffa2fa..ac2bc13ea5f 100644 --- a/src/Oro/Bundle/ImportExportBundle/Processor/ProcessorRegistry.php +++ b/src/Oro/Bundle/ImportExportBundle/Processor/ProcessorRegistry.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ImportExportBundle\Processor; -use Oro\Bundle\ImportExportBundle\Exception\UnexpectedValueException; use Oro\Bundle\ImportExportBundle\Exception\LogicException; +use Oro\Bundle\ImportExportBundle\Exception\UnexpectedValueException; class ProcessorRegistry { diff --git a/src/Oro/Bundle/ImportExportBundle/Processor/RegistryDelegateProcessor.php b/src/Oro/Bundle/ImportExportBundle/Processor/RegistryDelegateProcessor.php index 73812cc418e..ba9ace2b13c 100644 --- a/src/Oro/Bundle/ImportExportBundle/Processor/RegistryDelegateProcessor.php +++ b/src/Oro/Bundle/ImportExportBundle/Processor/RegistryDelegateProcessor.php @@ -5,8 +5,8 @@ use Oro\Bundle\BatchBundle\Entity\StepExecution; use Oro\Bundle\BatchBundle\Step\StepExecutionAwareInterface; -use Oro\Bundle\ImportExportBundle\Context\ContextRegistry; use Oro\Bundle\ImportExportBundle\Context\ContextAwareInterface; +use Oro\Bundle\ImportExportBundle\Context\ContextRegistry; use Oro\Bundle\ImportExportBundle\Exception\InvalidConfigurationException; use Oro\Bundle\ImportExportBundle\Exception\LogicException; diff --git a/src/Oro/Bundle/ImportExportBundle/Reader/AbstractReader.php b/src/Oro/Bundle/ImportExportBundle/Reader/AbstractReader.php index 1bf78dc1c01..de83d049e80 100644 --- a/src/Oro/Bundle/ImportExportBundle/Reader/AbstractReader.php +++ b/src/Oro/Bundle/ImportExportBundle/Reader/AbstractReader.php @@ -4,9 +4,9 @@ use Oro\Bundle\BatchBundle\Entity\StepExecution; -use Oro\Bundle\ImportExportBundle\Exception\LogicException; -use Oro\Bundle\ImportExportBundle\Context\ContextRegistry; use Oro\Bundle\ImportExportBundle\Context\ContextInterface; +use Oro\Bundle\ImportExportBundle\Context\ContextRegistry; +use Oro\Bundle\ImportExportBundle\Exception\LogicException; abstract class AbstractReader implements ReaderInterface { diff --git a/src/Oro/Bundle/ImportExportBundle/Reader/CsvFileReader.php b/src/Oro/Bundle/ImportExportBundle/Reader/CsvFileReader.php index 6d6c2d79dca..f6e62b59b82 100644 --- a/src/Oro/Bundle/ImportExportBundle/Reader/CsvFileReader.php +++ b/src/Oro/Bundle/ImportExportBundle/Reader/CsvFileReader.php @@ -5,8 +5,8 @@ use Oro\Bundle\BatchBundle\Item\InvalidItemException; use Oro\Bundle\ImportExportBundle\Context\ContextInterface; -use Oro\Bundle\ImportExportBundle\Exception\InvalidConfigurationException; use Oro\Bundle\ImportExportBundle\Exception\InvalidArgumentException; +use Oro\Bundle\ImportExportBundle\Exception\InvalidConfigurationException; use Oro\Bundle\ImportExportBundle\Exception\RuntimeException; class CsvFileReader extends AbstractReader diff --git a/src/Oro/Bundle/ImportExportBundle/Reader/EntityReader.php b/src/Oro/Bundle/ImportExportBundle/Reader/EntityReader.php index e91213fd7f2..4dfcea839e0 100644 --- a/src/Oro/Bundle/ImportExportBundle/Reader/EntityReader.php +++ b/src/Oro/Bundle/ImportExportBundle/Reader/EntityReader.php @@ -3,15 +3,15 @@ namespace Oro\Bundle\ImportExportBundle\Reader; use Doctrine\Common\Persistence\ManagerRegistry; -use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\Query; +use Doctrine\ORM\QueryBuilder; use Oro\Bundle\BatchBundle\ORM\Query\BufferedQueryResultIterator; +use Oro\Bundle\ImportExportBundle\Context\ContextInterface; use Oro\Bundle\ImportExportBundle\Context\ContextRegistry; use Oro\Bundle\ImportExportBundle\Exception\InvalidConfigurationException; use Oro\Bundle\ImportExportBundle\Exception\LogicException; -use Oro\Bundle\ImportExportBundle\Context\ContextInterface; class EntityReader extends AbstractReader { diff --git a/src/Oro/Bundle/ImportExportBundle/Serializer/Encoder/DummyEncoder.php b/src/Oro/Bundle/ImportExportBundle/Serializer/Encoder/DummyEncoder.php index 7f6ed401957..65e2802c914 100644 --- a/src/Oro/Bundle/ImportExportBundle/Serializer/Encoder/DummyEncoder.php +++ b/src/Oro/Bundle/ImportExportBundle/Serializer/Encoder/DummyEncoder.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ImportExportBundle\Serializer\Encoder; -use Symfony\Component\Serializer\Encoder\EncoderInterface; use Symfony\Component\Serializer\Encoder\DecoderInterface; +use Symfony\Component\Serializer\Encoder\EncoderInterface; /** * This encoder is used by import/export processor, no encoding/decoding is required, all work is done by normalizers diff --git a/src/Oro/Bundle/ImportExportBundle/Serializer/Normalizer/CollectionNormalizer.php b/src/Oro/Bundle/ImportExportBundle/Serializer/Normalizer/CollectionNormalizer.php index a94716f4f45..78851efc18f 100644 --- a/src/Oro/Bundle/ImportExportBundle/Serializer/Normalizer/CollectionNormalizer.php +++ b/src/Oro/Bundle/ImportExportBundle/Serializer/Normalizer/CollectionNormalizer.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\ImportExportBundle\Serializer\Normalizer; -use Symfony\Component\Serializer\SerializerAwareInterface; -use Symfony\Component\Serializer\SerializerInterface; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; -use Symfony\Component\Serializer\Exception\InvalidArgumentException; - use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; +use Symfony\Component\Serializer\Exception\InvalidArgumentException; +use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; +use Symfony\Component\Serializer\Normalizer\NormalizerInterface; + +use Symfony\Component\Serializer\SerializerAwareInterface; +use Symfony\Component\Serializer\SerializerInterface; class CollectionNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface { diff --git a/src/Oro/Bundle/ImportExportBundle/Serializer/Normalizer/DateTimeNormalizer.php b/src/Oro/Bundle/ImportExportBundle/Serializer/Normalizer/DateTimeNormalizer.php index bcc55e85381..cd5fb85c35c 100644 --- a/src/Oro/Bundle/ImportExportBundle/Serializer/Normalizer/DateTimeNormalizer.php +++ b/src/Oro/Bundle/ImportExportBundle/Serializer/Normalizer/DateTimeNormalizer.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\ImportExportBundle\Serializer\Normalizer; +use Symfony\Component\Serializer\Exception\RuntimeException; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use Symfony\Component\Serializer\Exception\RuntimeException; class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface { diff --git a/src/Oro/Bundle/ImportExportBundle/Serializer/Serializer.php b/src/Oro/Bundle/ImportExportBundle/Serializer/Serializer.php index 71b09e87837..d4d4ca6acff 100644 --- a/src/Oro/Bundle/ImportExportBundle/Serializer/Serializer.php +++ b/src/Oro/Bundle/ImportExportBundle/Serializer/Serializer.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ImportExportBundle\Serializer; -use Symfony\Component\Serializer\Serializer as BaseSerializer; use Doctrine\Common\Collections\Collection; +use Symfony\Component\Serializer\Serializer as BaseSerializer; class Serializer extends BaseSerializer { diff --git a/src/Oro/Bundle/ImportExportBundle/Strategy/Import/ImportStrategyHelper.php b/src/Oro/Bundle/ImportExportBundle/Strategy/Import/ImportStrategyHelper.php index 51c1b272dcf..d98152fb7c5 100644 --- a/src/Oro/Bundle/ImportExportBundle/Strategy/Import/ImportStrategyHelper.php +++ b/src/Oro/Bundle/ImportExportBundle/Strategy/Import/ImportStrategyHelper.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\ImportExportBundle\Strategy\Import; -use Symfony\Component\Translation\TranslatorInterface; -use Symfony\Component\Validator\ValidatorInterface; -use Symfony\Component\Validator\ConstraintViolationInterface; - use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\Common\Util\ClassUtils; use Doctrine\ORM\EntityManager; use Oro\Bundle\ImportExportBundle\Context\ContextInterface; -use Oro\Bundle\ImportExportBundle\Exception\LogicException; use Oro\Bundle\ImportExportBundle\Exception\InvalidArgumentException; +use Oro\Bundle\ImportExportBundle\Exception\LogicException; + +use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Component\Validator\ConstraintViolationInterface; +use Symfony\Component\Validator\ValidatorInterface; class ImportStrategyHelper { diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/Stub/QueryBuilderAwareDataConverter.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/Stub/QueryBuilderAwareDataConverter.php index 3fb5c90b536..8c89fe4b6af 100644 --- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/Stub/QueryBuilderAwareDataConverter.php +++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/Stub/QueryBuilderAwareDataConverter.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ImportExportBundle\Tests\Unit\Converter\Stub; -use Oro\Bundle\ImportExportBundle\Converter\QueryBuilderAwareInterface; use Oro\Bundle\ImportExportBundle\Converter\DataConverterInterface; +use Oro\Bundle\ImportExportBundle\Converter\QueryBuilderAwareInterface; interface QueryBuilderAwareDataConverter extends QueryBuilderAwareInterface, DataConverterInterface { diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/DependencyInjection/Compiler/AddNormalizerCompilerPassTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/DependencyInjection/Compiler/AddNormalizerCompilerPassTest.php index fa712981390..9ffc43a9052 100644 --- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/DependencyInjection/Compiler/AddNormalizerCompilerPassTest.php +++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/DependencyInjection/Compiler/AddNormalizerCompilerPassTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\ImportExportBundle\Tests\Unit\DependencyInjection\Compiler; +use Oro\Bundle\ImportExportBundle\DependencyInjection\Compiler\AddNormalizerCompilerPass; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\DependencyInjection\Reference; -use Oro\Bundle\ImportExportBundle\DependencyInjection\Compiler\AddNormalizerCompilerPass; +use Symfony\Component\DependencyInjection\Reference; class AddNormalizerCompilerPassTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/DependencyInjection/OroImportExportExtensionTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/DependencyInjection/OroImportExportExtensionTest.php index c878be1cc1c..d985ab77239 100644 --- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/DependencyInjection/OroImportExportExtensionTest.php +++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/DependencyInjection/OroImportExportExtensionTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ImportExportBundle\Tests\Unit\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Oro\Bundle\ImportExportBundle\DependencyInjection\OroImportExportExtension; +use Symfony\Component\DependencyInjection\ContainerBuilder; class OroGridExtensionTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Writer/EntityWriterTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Writer/EntityWriterTest.php index f07661a3ebb..81395ebcb60 100644 --- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Writer/EntityWriterTest.php +++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Writer/EntityWriterTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\ImportExportBundle\Tests\Unit\Writer; -use Oro\Bundle\ImportExportBundle\Writer\EntityWriter; use Oro\Bundle\ImportExportBundle\Writer\EntityDetachFixer; +use Oro\Bundle\ImportExportBundle\Writer\EntityWriter; class EntityWriterTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/InstallerBundle/Command/InstallCommand.php b/src/Oro/Bundle/InstallerBundle/Command/InstallCommand.php index adbce64e2ff..720420a6f3c 100644 --- a/src/Oro/Bundle/InstallerBundle/Command/InstallCommand.php +++ b/src/Oro/Bundle/InstallerBundle/Command/InstallCommand.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\InstallerBundle\Command; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; +use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Input\ArrayInput; +use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Process\PhpExecutableFinder; use Symfony\Component\Process\ProcessBuilder; diff --git a/src/Oro/Bundle/InstallerBundle/Command/LoadDemoDataCommand.php b/src/Oro/Bundle/InstallerBundle/Command/LoadDemoDataCommand.php index d79f21c9896..cc6705ab2b2 100644 --- a/src/Oro/Bundle/InstallerBundle/Command/LoadDemoDataCommand.php +++ b/src/Oro/Bundle/InstallerBundle/Command/LoadDemoDataCommand.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\InstallerBundle\Command; +use Doctrine\Common\DataFixtures\Executor\ORMExecutor; +use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader; -use Doctrine\Common\DataFixtures\Executor\ORMExecutor; class LoadDemoDataCommand extends ContainerAwareCommand { diff --git a/src/Oro/Bundle/InstallerBundle/DependencyInjection/Compiler/InstallerPass.php b/src/Oro/Bundle/InstallerBundle/DependencyInjection/Compiler/InstallerPass.php index 9c7e5a2b515..9bf8f2c350d 100644 --- a/src/Oro/Bundle/InstallerBundle/DependencyInjection/Compiler/InstallerPass.php +++ b/src/Oro/Bundle/InstallerBundle/DependencyInjection/Compiler/InstallerPass.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\InstallerBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; class InstallerPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/InstallerBundle/EventListener/RequestListener.php b/src/Oro/Bundle/InstallerBundle/EventListener/RequestListener.php index 45e669d0cbc..01ba20d1319 100644 --- a/src/Oro/Bundle/InstallerBundle/EventListener/RequestListener.php +++ b/src/Oro/Bundle/InstallerBundle/EventListener/RequestListener.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\InstallerBundle\EventListener; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\HttpKernel; -use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\Routing\Router; class RequestListener diff --git a/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/DatabaseType.php b/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/DatabaseType.php index 648d463f9c7..43735f02b14 100644 --- a/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/DatabaseType.php +++ b/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/DatabaseType.php @@ -3,6 +3,9 @@ namespace Oro\Bundle\InstallerBundle\Form\Type\Configuration; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\IntegerType; +use Symfony\Component\Form\Extension\Core\Type\PasswordType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints as Assert; @@ -13,7 +16,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add( 'oro_installer_database_host', - 'text', + TextType::class, array( 'label' => 'form.configuration.database.host', 'constraints' => array( @@ -23,7 +26,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_database_port', - 'integer', + IntegerType::class, array( 'label' => 'form.configuration.database.port', 'required' => false, @@ -34,7 +37,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_database_name', - 'text', + TextType::class, array( 'label' => 'form.configuration.database.name', 'constraints' => array( @@ -44,7 +47,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_database_user', - 'text', + TextType::class, array( 'label' => 'form.configuration.database.user', 'constraints' => array( @@ -54,7 +57,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_database_password', - 'password', + PasswordType::class, array( 'label' => 'form.configuration.database.password', 'required' => false, @@ -62,7 +65,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ); } - public function getName() + public function getBlockPrefix() { return 'oro_installer_configuration_database'; } diff --git a/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/MailerType.php b/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/MailerType.php index 8025f46e3b9..5d207ed9ac3 100644 --- a/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/MailerType.php +++ b/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/MailerType.php @@ -3,10 +3,14 @@ namespace Oro\Bundle\InstallerBundle\Form\Type\Configuration; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\IntegerType; +use Symfony\Component\Form\Extension\Core\Type\PasswordType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Validator\Constraints as Assert; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; class MailerType extends AbstractType { @@ -15,7 +19,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add( 'oro_installer_mailer_transport', - 'choice', + ChoiceType::class, array( 'label' => 'form.configuration.mailer.transport', 'preferred_choices' => array('mail'), @@ -32,7 +36,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_mailer_host', - 'text', + TextType::class, array( 'label' => 'form.configuration.mailer.host', 'constraints' => array( @@ -42,7 +46,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_mailer_port', - 'integer', + IntegerType::class, array( 'label' => 'form.configuration.mailer.port', 'required' => false, @@ -53,7 +57,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_mailer_encryption', - 'choice', + ChoiceType::class, array( 'label' => 'form.configuration.mailer.encryption', 'required' => false, @@ -68,7 +72,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_mailer_user', - 'text', + TextType::class, array( 'label' => 'form.configuration.mailer.user', 'required' => false, @@ -76,7 +80,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_mailer_password', - 'password', + PasswordType::class, array( 'label' => 'form.configuration.mailer.password', 'required' => false, @@ -84,7 +88,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ); } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( 'validation_groups' => function (FormInterface $form) { @@ -97,7 +101,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) )); } - public function getName() + public function getBlockPrefix() { return 'oro_installer_configuration_mailer'; } diff --git a/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/SystemType.php b/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/SystemType.php index c67cedd3839..eea4f4bd552 100644 --- a/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/SystemType.php +++ b/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/SystemType.php @@ -3,6 +3,8 @@ namespace Oro\Bundle\InstallerBundle\Form\Type\Configuration; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\LocaleType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints as Assert; @@ -13,7 +15,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add( 'oro_installer_locale', - 'locale', + LocaleType::class, array( 'label' => 'form.configuration.system.locale', 'preferred_choices' => array('en'), @@ -26,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_secret', - 'text', + TextType::class, array( 'label' => 'form.configuration.system.secret', 'data' => md5(uniqid()), @@ -37,7 +39,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ); } - public function getName() + public function getBlockPrefix() { return 'oro_installer_configuration_system'; } diff --git a/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/WebsocketType.php b/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/WebsocketType.php index 3eed4371fcc..022f585620d 100644 --- a/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/WebsocketType.php +++ b/src/Oro/Bundle/InstallerBundle/Form/Type/Configuration/WebsocketType.php @@ -3,6 +3,8 @@ namespace Oro\Bundle\InstallerBundle\Form\Type\Configuration; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\IntegerType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints as Assert; @@ -13,7 +15,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add( 'oro_installer_websocket_host', - 'text', + TextType::class, array( 'label' => 'form.configuration.websocket.host', 'required' => false, @@ -21,7 +23,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'oro_installer_websocket_port', - 'integer', + IntegerType::class, array( 'label' => 'form.configuration.websocket.port', 'required' => false, @@ -32,7 +34,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ); } - public function getName() + public function getBlockPrefix() { return 'oro_installer_configuration_websocket'; } diff --git a/src/Oro/Bundle/InstallerBundle/Form/Type/ConfigurationType.php b/src/Oro/Bundle/InstallerBundle/Form/Type/ConfigurationType.php index 2597ca95c0c..b1057985954 100644 --- a/src/Oro/Bundle/InstallerBundle/Form/Type/ConfigurationType.php +++ b/src/Oro/Bundle/InstallerBundle/Form/Type/ConfigurationType.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\InstallerBundle\Form\Type; +use Oro\Bundle\InstallerBundle\Validator\Constraints as Assert; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; -use Oro\Bundle\InstallerBundle\Validator\Constraints as Assert; +use Symfony\Component\Form\FormBuilderInterface; class ConfigurationType extends AbstractType { @@ -45,7 +45,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ); } - public function getName() + public function getBlockPrefix() { return 'oro_installer_configuration'; } diff --git a/src/Oro/Bundle/InstallerBundle/Form/Type/SetupType.php b/src/Oro/Bundle/InstallerBundle/Form/Type/SetupType.php index 88c4a9a1e11..5f24fa11a7f 100644 --- a/src/Oro/Bundle/InstallerBundle/Form/Type/SetupType.php +++ b/src/Oro/Bundle/InstallerBundle/Form/Type/SetupType.php @@ -3,8 +3,12 @@ namespace Oro\Bundle\InstallerBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; +use Symfony\Component\Form\Extension\Core\Type\EmailType; +use Symfony\Component\Form\Extension\Core\Type\RepeatedType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class SetupType extends AbstractType { @@ -20,14 +24,14 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add( 'username', - 'text', + TextType::class, array( 'label' => 'form.setup.username', ) ) ->add( 'plainPassword', - 'repeated', + RepeatedType::class, array( 'type' => 'password', 'invalid_message' => 'The password fields must match.', @@ -37,28 +41,28 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'email', - 'email', + EmailType::class, array( 'label' => 'form.setup.email', ) ) ->add( 'firstName', - 'text', + TextType::class, array( 'label' => 'form.setup.firstname', ) ) ->add( 'lastName', - 'text', + TextType::class, array( 'label' => 'form.setup.lastname', ) ) ->add( 'loadFixtures', - 'checkbox', + CheckboxType::class, array( 'label' => 'form.setup.load_fixtures', 'required' => false, @@ -67,7 +71,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ); } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -77,7 +81,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) ); } - public function getName() + public function getBlockPrefix() { return 'oro_installer_setup'; } diff --git a/src/Oro/Bundle/InstallerBundle/OroInstallerBundle.php b/src/Oro/Bundle/InstallerBundle/OroInstallerBundle.php index fd3b0a8b74b..9b3e2f94417 100644 --- a/src/Oro/Bundle/InstallerBundle/OroInstallerBundle.php +++ b/src/Oro/Bundle/InstallerBundle/OroInstallerBundle.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\InstallerBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; +use Oro\Bundle\InstallerBundle\DependencyInjection\Compiler\InstallerPass; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Oro\Bundle\InstallerBundle\DependencyInjection\Compiler\InstallerPass; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroInstallerBundle extends Bundle { diff --git a/src/Oro/Bundle/InstallerBundle/Process/InstallerScenario.php b/src/Oro/Bundle/InstallerBundle/Process/InstallerScenario.php index 8a5c15f1e01..c51898bb4f4 100644 --- a/src/Oro/Bundle/InstallerBundle/Process/InstallerScenario.php +++ b/src/Oro/Bundle/InstallerBundle/Process/InstallerScenario.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\InstallerBundle\Process; -use Symfony\Component\DependencyInjection\ContainerAware; - use Sylius\Bundle\FlowBundle\Process\Builder\ProcessBuilderInterface; + use Sylius\Bundle\FlowBundle\Process\Scenario\ProcessScenarioInterface; +use Symfony\Component\DependencyInjection\ContainerAware; class InstallerScenario extends ContainerAware implements ProcessScenarioInterface { diff --git a/src/Oro/Bundle/InstallerBundle/Process/Step/AbstractStep.php b/src/Oro/Bundle/InstallerBundle/Process/Step/AbstractStep.php index a0fee9c1cdd..7164cebef53 100644 --- a/src/Oro/Bundle/InstallerBundle/Process/Step/AbstractStep.php +++ b/src/Oro/Bundle/InstallerBundle/Process/Step/AbstractStep.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\InstallerBundle\Process\Step; +use Sylius\Bundle\FlowBundle\Process\Step\ControllerStep; use Symfony\Bundle\FrameworkBundle\Console\Application; -use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\StreamOutput; -use Sylius\Bundle\FlowBundle\Process\Step\ControllerStep; +use Symfony\Component\HttpFoundation\JsonResponse; abstract class AbstractStep extends ControllerStep { diff --git a/src/Oro/Bundle/InstallerBundle/Process/Step/InstallationStep.php b/src/Oro/Bundle/InstallerBundle/Process/Step/InstallationStep.php index 77fcada7d47..af3313ab86b 100644 --- a/src/Oro/Bundle/InstallerBundle/Process/Step/InstallationStep.php +++ b/src/Oro/Bundle/InstallerBundle/Process/Step/InstallationStep.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\InstallerBundle\Process\Step; -use Sylius\Bundle\FlowBundle\Process\Context\ProcessContextInterface; use Oro\Bundle\InstallerBundle\InstallerEvents; +use Sylius\Bundle\FlowBundle\Process\Context\ProcessContextInterface; class InstallationStep extends AbstractStep { diff --git a/src/Oro/Bundle/InstallerBundle/Validator/Constraints/DatabaseConnectionValidator.php b/src/Oro/Bundle/InstallerBundle/Validator/Constraints/DatabaseConnectionValidator.php index 93fea826f58..a6e1d249569 100644 --- a/src/Oro/Bundle/InstallerBundle/Validator/Constraints/DatabaseConnectionValidator.php +++ b/src/Oro/Bundle/InstallerBundle/Validator/Constraints/DatabaseConnectionValidator.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\InstallerBundle\Validator\Constraints; +use Doctrine\DBAL\DriverManager; use Symfony\Component\Validator\Constraint; -use Symfony\Component\Validator\ConstraintValidator; -use Doctrine\DBAL\DriverManager; +use Symfony\Component\Validator\ConstraintValidator; class DatabaseConnectionValidator extends ConstraintValidator { diff --git a/src/Oro/Bundle/JsFormValidationBundle/DependencyInjection/OroJsFormValidationExtension.php b/src/Oro/Bundle/JsFormValidationBundle/DependencyInjection/OroJsFormValidationExtension.php index a9f56490d9d..04bf01a1fe8 100644 --- a/src/Oro/Bundle/JsFormValidationBundle/DependencyInjection/OroJsFormValidationExtension.php +++ b/src/Oro/Bundle/JsFormValidationBundle/DependencyInjection/OroJsFormValidationExtension.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\JsFormValidationBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\Config\Definition\Processor; +use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\Config\FileLocator; -use Symfony\Component\Config\Definition\Processor; class OroJsFormValidationExtension extends Extension { diff --git a/src/Oro/Bundle/JsFormValidationBundle/Generator/FormValidationScriptGenerator.php b/src/Oro/Bundle/JsFormValidationBundle/Generator/FormValidationScriptGenerator.php index fab1b116d63..cf7f50ce315 100644 --- a/src/Oro/Bundle/JsFormValidationBundle/Generator/FormValidationScriptGenerator.php +++ b/src/Oro/Bundle/JsFormValidationBundle/Generator/FormValidationScriptGenerator.php @@ -2,19 +2,19 @@ namespace Oro\Bundle\JsFormValidationBundle\Generator; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Validator\MetadataFactoryInterface; -use Symfony\Component\Validator\Mapping\ClassMetadata; -use Symfony\Component\Form\FormView; -use Symfony\Component\Validator\Constraint; +use APY\JsFormValidationBundle\Generator\FieldsConstraints; +use APY\JsFormValidationBundle\Generator\FormValidationScriptGenerator as BaseFormValidationScriptGenerator; +use APY\JsFormValidationBundle\Generator\PostProcessEvent; +use APY\JsFormValidationBundle\Generator\PreProcessEvent; +use APY\JsFormValidationBundle\JsfvEvents; use Assetic\Asset\AssetCollection; use Assetic\Filter\Yui\JsCompressorFilter; -use APY\JsFormValidationBundle\Generator\PostProcessEvent; -use APY\JsFormValidationBundle\JsfvEvents; -use APY\JsFormValidationBundle\Generator\PreProcessEvent; -use APY\JsFormValidationBundle\Generator\FieldsConstraints; -use APY\JsFormValidationBundle\Generator\FormValidationScriptGenerator as BaseFormValidationScriptGenerator; +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\Form\FormView; +use Symfony\Component\Validator\Constraint; +use Symfony\Component\Validator\Mapping\ClassMetadata; +use Symfony\Component\Validator\MetadataFactoryInterface; /** * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) diff --git a/src/Oro/Bundle/JsFormValidationBundle/Generator/GettersLibraries.php b/src/Oro/Bundle/JsFormValidationBundle/Generator/GettersLibraries.php index 24d97946436..cfe8b53e415 100644 --- a/src/Oro/Bundle/JsFormValidationBundle/Generator/GettersLibraries.php +++ b/src/Oro/Bundle/JsFormValidationBundle/Generator/GettersLibraries.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\JsFormValidationBundle\Generator; -use Symfony\Component\Validator\Mapping\GetterMetadata; use APY\JsFormValidationBundle\Generator\GettersLibraries as BaseGettersLibraries; +use Symfony\Component\Validator\Mapping\GetterMetadata; class GettersLibraries extends BaseGettersLibraries { diff --git a/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/DependencyInjection/OroJsFormValidationExtensionTest.php b/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/DependencyInjection/OroJsFormValidationExtensionTest.php index 810b10aadba..ff9554e205c 100644 --- a/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/DependencyInjection/OroJsFormValidationExtensionTest.php +++ b/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/DependencyInjection/OroJsFormValidationExtensionTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\JsFormValidationBundle\Tests\Unit\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Oro\Bundle\JsFormValidationBundle\DependencyInjection\OroJsFormValidationExtension; +use Symfony\Component\DependencyInjection\ContainerBuilder; class OroJsFormValidationExtensionTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/Generator/FormValidationScriptGeneratorTest.php b/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/Generator/FormValidationScriptGeneratorTest.php index eb2a39ab8a4..ade30bf12c8 100644 --- a/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/Generator/FormValidationScriptGeneratorTest.php +++ b/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/Generator/FormValidationScriptGeneratorTest.php @@ -4,10 +4,10 @@ use Doctrine\ORM\EntityManager; +use Oro\Bundle\JsFormValidationBundle\Generator\FormValidationScriptGenerator; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Validator\MetadataFactoryInterface; -use Oro\Bundle\JsFormValidationBundle\Generator\FormValidationScriptGenerator; +use Symfony\Component\Validator\MetadataFactoryInterface; class FormValidationScriptGeneratorTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/Generator/GettersLibrariesTest.php b/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/Generator/GettersLibrariesTest.php index 605c77092b8..a41d82bcb76 100644 --- a/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/Generator/GettersLibrariesTest.php +++ b/src/Oro/Bundle/JsFormValidationBundle/Tests/Unit/Generator/GettersLibrariesTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\JsFormValidationBundle\Tests\Unit\Generator; +use Oro\Bundle\JsFormValidationBundle\Generator\GettersLibraries; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Form\FormView; -use Symfony\Component\Validator\Mapping\GetterMetadata; -use Oro\Bundle\JsFormValidationBundle\Generator\GettersLibraries; +use Symfony\Component\Validator\Mapping\GetterMetadata; class GettersLibrariesTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/LocaleBundle/Command/OroLocalizationDumpCommand.php b/src/Oro/Bundle/LocaleBundle/Command/OroLocalizationDumpCommand.php index 5cb0c80224d..f0665814b6b 100644 --- a/src/Oro/Bundle/LocaleBundle/Command/OroLocalizationDumpCommand.php +++ b/src/Oro/Bundle/LocaleBundle/Command/OroLocalizationDumpCommand.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\LocaleBundle\Command; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; +use Symfony\Component\Console\Output\OutputInterface; class OroLocalizationDumpCommand extends ContainerAwareCommand { diff --git a/src/Oro/Bundle/LocaleBundle/DependencyInjection/Compiler/AddDateTimeFormatConverterCompilerPass.php b/src/Oro/Bundle/LocaleBundle/DependencyInjection/Compiler/AddDateTimeFormatConverterCompilerPass.php index 6c20393667c..06c1dcab226 100644 --- a/src/Oro/Bundle/LocaleBundle/DependencyInjection/Compiler/AddDateTimeFormatConverterCompilerPass.php +++ b/src/Oro/Bundle/LocaleBundle/DependencyInjection/Compiler/AddDateTimeFormatConverterCompilerPass.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\LocaleBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\Exception\LogicException; class AddDateTimeFormatConverterCompilerPass implements CompilerPassInterface diff --git a/src/Oro/Bundle/LocaleBundle/DependencyInjection/Configuration.php b/src/Oro/Bundle/LocaleBundle/DependencyInjection/Configuration.php index f393c8e0282..f9efc717fa0 100644 --- a/src/Oro/Bundle/LocaleBundle/DependencyInjection/Configuration.php +++ b/src/Oro/Bundle/LocaleBundle/DependencyInjection/Configuration.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\LocaleBundle\DependencyInjection; +use Oro\Bundle\ConfigBundle\DependencyInjection\SettingsBuilder; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\TreeBuilder; -use Symfony\Component\Config\Definition\ConfigurationInterface; -use Oro\Bundle\ConfigBundle\DependencyInjection\SettingsBuilder; +use Symfony\Component\Config\Definition\ConfigurationInterface; use Symfony\Component\Intl\Intl; /** diff --git a/src/Oro/Bundle/LocaleBundle/DependencyInjection/OroLocaleExtension.php b/src/Oro/Bundle/LocaleBundle/DependencyInjection/OroLocaleExtension.php index 72b305f6ef9..715b7e0dbe6 100644 --- a/src/Oro/Bundle/LocaleBundle/DependencyInjection/OroLocaleExtension.php +++ b/src/Oro/Bundle/LocaleBundle/DependencyInjection/OroLocaleExtension.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\LocaleBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; -use Symfony\Component\Yaml\Yaml; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\Intl\Intl; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; +use Symfony\Component\Yaml\Yaml; class OroLocaleExtension extends Extension { diff --git a/src/Oro/Bundle/LocaleBundle/EventListener/LocaleListener.php b/src/Oro/Bundle/LocaleBundle/EventListener/LocaleListener.php index 06b18faf12d..b52429bc368 100644 --- a/src/Oro/Bundle/LocaleBundle/EventListener/LocaleListener.php +++ b/src/Oro/Bundle/LocaleBundle/EventListener/LocaleListener.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\LocaleBundle\EventListener; -use Symfony\Component\HttpKernel\Event\GetResponseEvent; -use Symfony\Component\HttpKernel\KernelEvents; -use Symfony\Component\HttpFoundation\Request; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Event\GetResponseEvent; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; +use Symfony\Component\HttpKernel\KernelEvents; class LocaleListener implements EventSubscriberInterface { diff --git a/src/Oro/Bundle/LocaleBundle/Form/Type/CountryType.php b/src/Oro/Bundle/LocaleBundle/Form/Type/CountryType.php index fbd2c99c71c..c4e14a5fffa 100644 --- a/src/Oro/Bundle/LocaleBundle/Form/Type/CountryType.php +++ b/src/Oro/Bundle/LocaleBundle/Form/Type/CountryType.php @@ -3,15 +3,16 @@ namespace Oro\Bundle\LocaleBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CountryType; use Symfony\Component\Intl\Intl; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class CountryType extends AbstractType { /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -25,13 +26,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ public function getParent() { - return 'country'; + return CountryType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_locale_country'; } diff --git a/src/Oro/Bundle/LocaleBundle/Form/Type/CurrencyType.php b/src/Oro/Bundle/LocaleBundle/Form/Type/CurrencyType.php index fd5597cb9f3..8f6f047fd69 100644 --- a/src/Oro/Bundle/LocaleBundle/Form/Type/CurrencyType.php +++ b/src/Oro/Bundle/LocaleBundle/Form/Type/CurrencyType.php @@ -3,15 +3,16 @@ namespace Oro\Bundle\LocaleBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CurrencyType; use Symfony\Component\Intl\Intl; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class CurrencyType extends AbstractType { /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( 'choices' => Intl::getCurrencyBundle()->getCurrencyNames('en'), @@ -23,13 +24,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ public function getParent() { - return 'currency'; + return CurrencyType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_currency'; } diff --git a/src/Oro/Bundle/LocaleBundle/Form/Type/LocaleType.php b/src/Oro/Bundle/LocaleBundle/Form/Type/LocaleType.php index 15d616610f6..72575200a80 100644 --- a/src/Oro/Bundle/LocaleBundle/Form/Type/LocaleType.php +++ b/src/Oro/Bundle/LocaleBundle/Form/Type/LocaleType.php @@ -3,15 +3,16 @@ namespace Oro\Bundle\LocaleBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\LocaleType; use Symfony\Component\Intl\Intl; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class LocaleType extends AbstractType { /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -25,13 +26,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ public function getParent() { - return 'locale'; + return LocaleType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_locale'; } diff --git a/src/Oro/Bundle/LocaleBundle/Form/Type/NameFormatType.php b/src/Oro/Bundle/LocaleBundle/Form/Type/NameFormatType.php index 120c52d4d74..6ad3bf0a20e 100644 --- a/src/Oro/Bundle/LocaleBundle/Form/Type/NameFormatType.php +++ b/src/Oro/Bundle/LocaleBundle/Form/Type/NameFormatType.php @@ -2,10 +2,11 @@ namespace Oro\Bundle\LocaleBundle\Form\Type; +use Oro\Bundle\LocaleBundle\Formatter\NameFormatter; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\Extension\Core\Type\TextType; -use Oro\Bundle\LocaleBundle\Formatter\NameFormatter; +use Symfony\Component\OptionsResolver\OptionsResolver; class NameFormatType extends AbstractType { @@ -25,7 +26,7 @@ public function __construct(NameFormatter $nameFormatter) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -39,13 +40,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ public function getParent() { - return 'text'; + return TextType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_name_format'; } diff --git a/src/Oro/Bundle/LocaleBundle/Form/Type/TimezoneType.php b/src/Oro/Bundle/LocaleBundle/Form/Type/TimezoneType.php index f6955301c91..69e9937d9f2 100644 --- a/src/Oro/Bundle/LocaleBundle/Form/Type/TimezoneType.php +++ b/src/Oro/Bundle/LocaleBundle/Form/Type/TimezoneType.php @@ -4,7 +4,8 @@ use Doctrine\Common\Cache\Cache; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\OptionsResolver\OptionsResolver; class TimezoneType extends AbstractType { @@ -29,7 +30,7 @@ public function __construct(Cache $cache = null) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $cacheKey = 'timezones'; if ($this->cache) { @@ -52,13 +53,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ public function getParent() { - return 'choice'; + return ChoiceType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_locale_timezone'; } diff --git a/src/Oro/Bundle/LocaleBundle/Formatter/AddressFormatter.php b/src/Oro/Bundle/LocaleBundle/Formatter/AddressFormatter.php index 468d86db765..21ea4585097 100644 --- a/src/Oro/Bundle/LocaleBundle/Formatter/AddressFormatter.php +++ b/src/Oro/Bundle/LocaleBundle/Formatter/AddressFormatter.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\LocaleBundle\Formatter; +use Oro\Bundle\LocaleBundle\DependencyInjection\Configuration as LocaleConfiguration; +use Oro\Bundle\LocaleBundle\Model\AddressInterface; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; + use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessor; -use Oro\Bundle\LocaleBundle\Model\AddressInterface; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; -use Oro\Bundle\LocaleBundle\DependencyInjection\Configuration as LocaleConfiguration; - class AddressFormatter { /** diff --git a/src/Oro/Bundle/LocaleBundle/Formatter/NameFormatter.php b/src/Oro/Bundle/LocaleBundle/Formatter/NameFormatter.php index 899704c2171..e4c1201675d 100644 --- a/src/Oro/Bundle/LocaleBundle/Formatter/NameFormatter.php +++ b/src/Oro/Bundle/LocaleBundle/Formatter/NameFormatter.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\LocaleBundle\Formatter; +use Oro\Bundle\LocaleBundle\DependencyInjection\Configuration as LocaleConfiguration; use Oro\Bundle\LocaleBundle\Model\FirstNameInterface; use Oro\Bundle\LocaleBundle\Model\LastNameInterface; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; use Oro\Bundle\LocaleBundle\Model\MiddleNameInterface; use Oro\Bundle\LocaleBundle\Model\NamePrefixInterface; use Oro\Bundle\LocaleBundle\Model\NameSuffixInterface; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; -use Oro\Bundle\LocaleBundle\DependencyInjection\Configuration as LocaleConfiguration; class NameFormatter { diff --git a/src/Oro/Bundle/LocaleBundle/Formatter/NumberFormatter.php b/src/Oro/Bundle/LocaleBundle/Formatter/NumberFormatter.php index 869812e3bf6..4d4c98ef7f7 100644 --- a/src/Oro/Bundle/LocaleBundle/Formatter/NumberFormatter.php +++ b/src/Oro/Bundle/LocaleBundle/Formatter/NumberFormatter.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\LocaleBundle\Formatter; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; use NumberFormatter as IntlNumberFormatter; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; class NumberFormatter { diff --git a/src/Oro/Bundle/LocaleBundle/Model/LocaleSettings.php b/src/Oro/Bundle/LocaleBundle/Model/LocaleSettings.php index 011b18ec9c0..1ae7c68d978 100644 --- a/src/Oro/Bundle/LocaleBundle/Model/LocaleSettings.php +++ b/src/Oro/Bundle/LocaleBundle/Model/LocaleSettings.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\LocaleBundle\Model; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Intl\Intl; - use Oro\Bundle\ConfigBundle\Config\ConfigManager; use Oro\Bundle\LocaleBundle\DependencyInjection\Configuration as LocaleConfiguration; +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\Intl\Intl; + class LocaleSettings { const ADDRESS_FORMAT_KEY = 'format'; diff --git a/src/Oro/Bundle/LocaleBundle/OroLocaleBundle.php b/src/Oro/Bundle/LocaleBundle/OroLocaleBundle.php index 5924c568273..237391ab9c5 100644 --- a/src/Oro/Bundle/LocaleBundle/OroLocaleBundle.php +++ b/src/Oro/Bundle/LocaleBundle/OroLocaleBundle.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\LocaleBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; - use Oro\Bundle\LocaleBundle\DependencyInjection\Compiler\AddDateTimeFormatConverterCompilerPass; use Oro\Bundle\LocaleBundle\DependencyInjection\Compiler\TwigSandboxConfigurationPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; + class OroLocaleBundle extends Bundle { /** diff --git a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php index 563efad5bf3..6409707da1a 100644 --- a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php +++ b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\LocaleBundle\Tests\Unit\Converter; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; use Oro\Bundle\LocaleBundle\Converter\DateTimeFormatConverterInterface; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; abstract class AbstractFormatConverterTestCase extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/DateTimeFormatConverterRegistryTest.php b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/DateTimeFormatConverterRegistryTest.php index eb2db83fc2c..c95f7c45455 100644 --- a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/DateTimeFormatConverterRegistryTest.php +++ b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/DateTimeFormatConverterRegistryTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\LocaleBundle\Tests\Unit\Converter; -use Oro\Bundle\LocaleBundle\Converter\DateTimeFormatConverterRegistry; use Oro\Bundle\LocaleBundle\Converter\DateTimeFormatConverterInterface; +use Oro\Bundle\LocaleBundle\Converter\DateTimeFormatConverterRegistry; class DateTimeFormatConverterRegistryTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/LocaleBundle/Tests/Unit/EventListener/LocaleListenerTest.php b/src/Oro/Bundle/LocaleBundle/Tests/Unit/EventListener/LocaleListenerTest.php index 2b43ea9f45f..a1feeb54f37 100644 --- a/src/Oro/Bundle/LocaleBundle/Tests/Unit/EventListener/LocaleListenerTest.php +++ b/src/Oro/Bundle/LocaleBundle/Tests/Unit/EventListener/LocaleListenerTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\LocaleBundle\Tests\EventListener; +use Oro\Bundle\LocaleBundle\EventListener\LocaleListener; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpKernel\Event\GetResponseEvent; -use Oro\Bundle\LocaleBundle\EventListener\LocaleListener; +use Symfony\Component\HttpKernel\Event\GetResponseEvent; class LocaleListenerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Formatter/AddressFormatterTest.php b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Formatter/AddressFormatterTest.php index 05f300d4c23..5370719f5ba 100644 --- a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Formatter/AddressFormatterTest.php +++ b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Formatter/AddressFormatterTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\LocaleBundle\Tests\Unit\Formatter; +use Oro\Bundle\LocaleBundle\DependencyInjection\Configuration as LocaleConfiguration; use Oro\Bundle\LocaleBundle\Formatter\AddressFormatter; -use Oro\Bundle\LocaleBundle\Tests\Unit\Formatter\Stubs\AddressStub; use Oro\Bundle\LocaleBundle\Model\LocaleSettings; -use Oro\Bundle\LocaleBundle\DependencyInjection\Configuration as LocaleConfiguration; +use Oro\Bundle\LocaleBundle\Tests\Unit\Formatter\Stubs\AddressStub; class AddressFormatterTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Formatter/NameFormatterTest.php b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Formatter/NameFormatterTest.php index 746d743fa22..b2137ad7318 100644 --- a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Formatter/NameFormatterTest.php +++ b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Formatter/NameFormatterTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\LocaleBundle\Test\Unit\Formatter; -use Oro\Bundle\LocaleBundle\Formatter\NameFormatter; use Oro\Bundle\LocaleBundle\DependencyInjection\Configuration as LocaleConfiguration; +use Oro\Bundle\LocaleBundle\Formatter\NameFormatter; use Oro\Bundle\LocaleBundle\Tests\Unit\Formatter\Stubs\PersonAllNamePartsStub; use Oro\Bundle\LocaleBundle\Tests\Unit\Formatter\Stubs\PersonFullNameStub; diff --git a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Model/CalendarTest.php b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Model/CalendarTest.php index 9cc4bab6a4b..0d0374fca8f 100644 --- a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Model/CalendarTest.php +++ b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Model/CalendarTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\LocaleBundle\Tests\Unit\Model; -use Oro\Bundle\LocaleBundle\Tests\Unit\IcuAwareTestCase; use Oro\Bundle\LocaleBundle\Model\Calendar; +use Oro\Bundle\LocaleBundle\Tests\Unit\IcuAwareTestCase; class CalendarTest extends IcuAwareTestCase { diff --git a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Model/LocaleSettingsTest.php b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Model/LocaleSettingsTest.php index 96c4450231a..683e63e4f39 100644 --- a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Model/LocaleSettingsTest.php +++ b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Model/LocaleSettingsTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\LocaleBundle\Tests\Unit\Model; -use Oro\Bundle\LocaleBundle\Model\LocaleSettings; use Oro\Bundle\LocaleBundle\DependencyInjection\Configuration as LocaleConfiguration; +use Oro\Bundle\LocaleBundle\Model\LocaleSettings; class LocaleSettingsTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Twig/CalendarExtensionTest.php b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Twig/CalendarExtensionTest.php index 189ed71ca3f..bf28ddd418c 100644 --- a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Twig/CalendarExtensionTest.php +++ b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Twig/CalendarExtensionTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\LocaleBundle\Tests\Unit\Twig; -use Oro\Bundle\LocaleBundle\Twig\CalendarExtension; use Oro\Bundle\LocaleBundle\Model\Calendar; +use Oro\Bundle\LocaleBundle\Twig\CalendarExtension; class CalendarExtensionTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/LocaleBundle/Twig/AddressExtension.php b/src/Oro/Bundle/LocaleBundle/Twig/AddressExtension.php index 512520ae9b0..c3e053b1acb 100644 --- a/src/Oro/Bundle/LocaleBundle/Twig/AddressExtension.php +++ b/src/Oro/Bundle/LocaleBundle/Twig/AddressExtension.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\LocaleBundle\Twig; -use Oro\Bundle\LocaleBundle\Model\AddressInterface; use Oro\Bundle\LocaleBundle\Formatter\AddressFormatter; +use Oro\Bundle\LocaleBundle\Model\AddressInterface; class AddressExtension extends \Twig_Extension { diff --git a/src/Oro/Bundle/LocaleBundle/Twig/NameExtension.php b/src/Oro/Bundle/LocaleBundle/Twig/NameExtension.php index 8e89d28a8a4..d05ee10eff4 100644 --- a/src/Oro/Bundle/LocaleBundle/Twig/NameExtension.php +++ b/src/Oro/Bundle/LocaleBundle/Twig/NameExtension.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\LocaleBundle\Twig; use Oro\Bundle\LocaleBundle\Formatter\NameFormatter; -use Oro\Bundle\LocaleBundle\Model\NamePrefixInterface; use Oro\Bundle\LocaleBundle\Model\FirstNameInterface; -use Oro\Bundle\LocaleBundle\Model\MiddleNameInterface; use Oro\Bundle\LocaleBundle\Model\LastNameInterface; +use Oro\Bundle\LocaleBundle\Model\MiddleNameInterface; +use Oro\Bundle\LocaleBundle\Model\NamePrefixInterface; use Oro\Bundle\LocaleBundle\Model\NameSuffixInterface; class NameExtension extends \Twig_Extension diff --git a/src/Oro/Bundle/MeasureBundle/DependencyInjection/OroMeasureExtension.php b/src/Oro/Bundle/MeasureBundle/DependencyInjection/OroMeasureExtension.php index 9732f00a7c2..46ca2e113b1 100644 --- a/src/Oro/Bundle/MeasureBundle/DependencyInjection/OroMeasureExtension.php +++ b/src/Oro/Bundle/MeasureBundle/DependencyInjection/OroMeasureExtension.php @@ -1,10 +1,10 @@ add( 'pageId', - 'text', + TextType::class, array( 'required' => true, ) ) ->add( 'data', - 'textarea', + TextareaType::class, array( 'required' => true, ) @@ -33,7 +35,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -47,7 +49,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'pagestate'; } diff --git a/src/Oro/Bundle/NavigationBundle/Menu/AclAwareMenuFactoryExtension.php b/src/Oro/Bundle/NavigationBundle/Menu/AclAwareMenuFactoryExtension.php index 648492c91d1..55800dfdcf9 100644 --- a/src/Oro/Bundle/NavigationBundle/Menu/AclAwareMenuFactoryExtension.php +++ b/src/Oro/Bundle/NavigationBundle/Menu/AclAwareMenuFactoryExtension.php @@ -6,8 +6,8 @@ use Knp\Menu\Factory; use Knp\Menu\ItemInterface; use Oro\Bundle\SecurityBundle\SecurityFacade; -use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Routing\Exception\ResourceNotFoundException; +use Symfony\Component\Routing\RouterInterface; class AclAwareMenuFactoryExtension implements Factory\ExtensionInterface { diff --git a/src/Oro/Bundle/NavigationBundle/Menu/BreadcrumbManager.php b/src/Oro/Bundle/NavigationBundle/Menu/BreadcrumbManager.php index f99a59610d5..a0c75bdbab8 100644 --- a/src/Oro/Bundle/NavigationBundle/Menu/BreadcrumbManager.php +++ b/src/Oro/Bundle/NavigationBundle/Menu/BreadcrumbManager.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\NavigationBundle\Menu; use Knp\Menu\ItemInterface; +use Knp\Menu\Matcher\Matcher; use Knp\Menu\Provider\MenuProviderInterface; use Knp\Menu\Util\MenuManipulator; -use Knp\Menu\Matcher\Matcher; use Symfony\Component\Routing\Router; class BreadcrumbManager diff --git a/src/Oro/Bundle/NavigationBundle/Menu/Matcher/Voter/RoutePatternVoter.php b/src/Oro/Bundle/NavigationBundle/Menu/Matcher/Voter/RoutePatternVoter.php index c6711fa5cc2..8748f4b6e97 100644 --- a/src/Oro/Bundle/NavigationBundle/Menu/Matcher/Voter/RoutePatternVoter.php +++ b/src/Oro/Bundle/NavigationBundle/Menu/Matcher/Voter/RoutePatternVoter.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\NavigationBundle\Menu\Matcher\Voter; -use Symfony\Component\HttpFoundation\Request; +use Knp\Menu\ItemInterface; use Knp\Menu\Matcher\Voter\VoterInterface; -use Knp\Menu\ItemInterface; +use Symfony\Component\HttpFoundation\Request; class RoutePatternVoter implements VoterInterface { diff --git a/src/Oro/Bundle/NavigationBundle/Menu/NavigationItemBuilder.php b/src/Oro/Bundle/NavigationBundle/Menu/NavigationItemBuilder.php index 2280171f8c5..a2cc9640b4f 100644 --- a/src/Oro/Bundle/NavigationBundle/Menu/NavigationItemBuilder.php +++ b/src/Oro/Bundle/NavigationBundle/Menu/NavigationItemBuilder.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\NavigationBundle\Menu; -use Symfony\Component\Security\Core\SecurityContextInterface; use Doctrine\ORM\EntityManager; use Knp\Menu\ItemInterface; -use Oro\Bundle\NavigationBundle\Menu\BuilderInterface; - use Oro\Bundle\NavigationBundle\Entity\Builder\ItemFactory; use Oro\Bundle\NavigationBundle\Entity\NavigationItemInterface; + use Oro\Bundle\NavigationBundle\Entity\Repository\NavigationRepositoryInterface; +use Oro\Bundle\NavigationBundle\Menu\BuilderInterface; +use Symfony\Component\Security\Core\SecurityContextInterface; class NavigationItemBuilder implements BuilderInterface { diff --git a/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php b/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php index ff3a88ed850..8c0af14ee2c 100644 --- a/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php +++ b/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\NavigationBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\MenuBuilderChainPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroNavigationBundle extends Bundle { diff --git a/src/Oro/Bundle/NavigationBundle/Provider/BuilderChainProvider.php b/src/Oro/Bundle/NavigationBundle/Provider/BuilderChainProvider.php index 70a3e4a3664..7b51b3bb728 100644 --- a/src/Oro/Bundle/NavigationBundle/Provider/BuilderChainProvider.php +++ b/src/Oro/Bundle/NavigationBundle/Provider/BuilderChainProvider.php @@ -2,7 +2,7 @@ namespace Oro\Bundle\NavigationBundle\Provider; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use \Doctrine\Common\Cache\CacheProvider; use Knp\Menu\FactoryInterface; use Knp\Menu\ItemInterface; @@ -11,7 +11,7 @@ use Oro\Bundle\NavigationBundle\Event\ConfigureMenuEvent; use Oro\Bundle\NavigationBundle\Menu\BuilderInterface; -use \Doctrine\Common\Cache\CacheProvider; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; class BuilderChainProvider implements MenuProviderInterface { diff --git a/src/Oro/Bundle/NavigationBundle/Provider/TitleService.php b/src/Oro/Bundle/NavigationBundle/Provider/TitleService.php index b79726b6a81..521f37e559f 100644 --- a/src/Oro/Bundle/NavigationBundle/Provider/TitleService.php +++ b/src/Oro/Bundle/NavigationBundle/Provider/TitleService.php @@ -2,20 +2,20 @@ namespace Oro\Bundle\NavigationBundle\Provider; +use Doctrine\Common\Persistence\ObjectManager; +use Doctrine\ORM\EntityRepository; use JMS\Serializer\Exception\RuntimeException; -use Symfony\Bundle\FrameworkBundle\Translation\Translator; -use Symfony\Component\Routing\Route; use JMS\Serializer\Serializer; -use Doctrine\Common\Persistence\ObjectManager; +use Oro\Bundle\ConfigBundle\Config\UserConfigManager; use Oro\Bundle\NavigationBundle\Entity\Title; -use Oro\Bundle\NavigationBundle\Title\TitleReader\ConfigReader; -use Oro\Bundle\NavigationBundle\Title\TitleReader\AnnotationsReader; -use Oro\Bundle\NavigationBundle\Title\StoredTitle; use Oro\Bundle\NavigationBundle\Menu\BreadcrumbManager; -use Oro\Bundle\ConfigBundle\Config\UserConfigManager; +use Oro\Bundle\NavigationBundle\Title\StoredTitle; +use Oro\Bundle\NavigationBundle\Title\TitleReader\AnnotationsReader; +use Oro\Bundle\NavigationBundle\Title\TitleReader\ConfigReader; +use Symfony\Bundle\FrameworkBundle\Translation\Translator; -use Doctrine\ORM\EntityRepository; +use Symfony\Component\Routing\Route; /** * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) diff --git a/src/Oro/Bundle/NavigationBundle/Tests/Functional/API/RestApiTest.php b/src/Oro/Bundle/NavigationBundle/Tests/Functional/API/RestApiTest.php index 913dfb343fa..f214a9830f9 100644 --- a/src/Oro/Bundle/NavigationBundle/Tests/Functional/API/RestApiTest.php +++ b/src/Oro/Bundle/NavigationBundle/Tests/Functional/API/RestApiTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\NavigationBundle\Tests\Functional\API; -use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; use Oro\Bundle\TestFrameworkBundle\Test\Client; use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; +use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/Builder/HistoryItemBuilderTest.php b/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/Builder/HistoryItemBuilderTest.php index 8a859d3e261..a583a64690a 100644 --- a/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/Builder/HistoryItemBuilderTest.php +++ b/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/Builder/HistoryItemBuilderTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\NavigationBundle\Tests\Entity; -use Oro\Bundle\NavigationBundle\Entity\NavigationHistoryItem; use Oro\Bundle\NavigationBundle\Entity\Builder\HistoryItemBuilder; +use Oro\Bundle\NavigationBundle\Entity\NavigationHistoryItem; class HistoryItemBuilderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/NavigationHistoryItemTest.php b/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/NavigationHistoryItemTest.php index ce920ca5819..c49f5dc17ca 100644 --- a/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/NavigationHistoryItemTest.php +++ b/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/NavigationHistoryItemTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\NavigationBundle\Tests\Entity; -use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\NavigationBundle\Entity\NavigationHistoryItem; +use Oro\Bundle\UserBundle\Entity\User; class NavigationHistoryItemTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/NavigationItemTest.php b/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/NavigationItemTest.php index c28e5ff2bd8..bd65fb775d4 100644 --- a/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/NavigationItemTest.php +++ b/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/NavigationItemTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\NavigationBundle\Tests\Entity; -use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\NavigationBundle\Entity\NavigationItem; +use Oro\Bundle\UserBundle\Entity\User; class NavigationItemTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/PageStateTest.php b/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/PageStateTest.php index 15edaa3d086..b94de71e486 100644 --- a/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/PageStateTest.php +++ b/src/Oro/Bundle/NavigationBundle/Tests/Unit/Entity/PageStateTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\NavigationBundle\Tests\Entity; -use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\NavigationBundle\Entity\PageState; +use Oro\Bundle\UserBundle\Entity\User; class PageStateTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/NavigationBundle/Tests/Unit/Event/ResponseHistoryListenerTest.php b/src/Oro/Bundle/NavigationBundle/Tests/Unit/Event/ResponseHistoryListenerTest.php index 6552c721d14..eb2d960bc46 100644 --- a/src/Oro/Bundle/NavigationBundle/Tests/Unit/Event/ResponseHistoryListenerTest.php +++ b/src/Oro/Bundle/NavigationBundle/Tests/Unit/Event/ResponseHistoryListenerTest.php @@ -1,10 +1,10 @@ add( 'entityName', - 'choice', + ChoiceType::class, array( 'choices' => $this->entityNameChoices, 'multiple' => false, @@ -115,7 +116,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -130,7 +131,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'emailnotification'; } diff --git a/src/Oro/Bundle/NotificationBundle/Form/Type/RecipientListType.php b/src/Oro/Bundle/NotificationBundle/Form/Type/RecipientListType.php index f0454d269f2..67a46b6f4d3 100644 --- a/src/Oro/Bundle/NotificationBundle/Form/Type/RecipientListType.php +++ b/src/Oro/Bundle/NotificationBundle/Form/Type/RecipientListType.php @@ -3,10 +3,12 @@ namespace Oro\Bundle\NotificationBundle\Form\Type; use Doctrine\ORM\EntityManager; - use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; + +use Symfony\Component\Form\Extension\Core\Type\EmailType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class RecipientListType extends AbstractType { @@ -51,7 +53,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) // custom email $builder->add( 'email', - 'email', + EmailType::class, array( 'required' => false ) @@ -60,7 +62,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) // owner $builder->add( 'owner', - 'checkbox', + CheckboxType::class, array( 'required' => false ) @@ -70,7 +72,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -85,7 +87,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_notification_recipient_list'; } diff --git a/src/Oro/Bundle/NotificationBundle/OroNotificationBundle.php b/src/Oro/Bundle/NotificationBundle/OroNotificationBundle.php index 5c82e742eab..9dc4b559453 100644 --- a/src/Oro/Bundle/NotificationBundle/OroNotificationBundle.php +++ b/src/Oro/Bundle/NotificationBundle/OroNotificationBundle.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\NotificationBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\HttpKernel\KernelInterface; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Compiler\PassConfig; - use Oro\Bundle\NotificationBundle\DependencyInjection\Compiler\EventsCompilerPass; use Oro\Bundle\NotificationBundle\DependencyInjection\Compiler\NotificationHandlerPass; +use Symfony\Component\DependencyInjection\Compiler\PassConfig; +use Symfony\Component\DependencyInjection\ContainerBuilder; + +use Symfony\Component\HttpKernel\Bundle\Bundle; +use Symfony\Component\HttpKernel\KernelInterface; class OroNotificationBundle extends Bundle { diff --git a/src/Oro/Bundle/NotificationBundle/Processor/AbstractNotificationProcessor.php b/src/Oro/Bundle/NotificationBundle/Processor/AbstractNotificationProcessor.php index 2986771afcd..6021875d899 100644 --- a/src/Oro/Bundle/NotificationBundle/Processor/AbstractNotificationProcessor.php +++ b/src/Oro/Bundle/NotificationBundle/Processor/AbstractNotificationProcessor.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\NotificationBundle\Processor; -use Psr\Log\LoggerInterface; use Doctrine\ORM\EntityManager; use JMS\JobQueueBundle\Entity\Job; +use Psr\Log\LoggerInterface; abstract class AbstractNotificationProcessor { diff --git a/src/Oro/Bundle/NotificationBundle/Processor/EmailNotificationProcessor.php b/src/Oro/Bundle/NotificationBundle/Processor/EmailNotificationProcessor.php index b07f2c62ea0..0e8354289b8 100644 --- a/src/Oro/Bundle/NotificationBundle/Processor/EmailNotificationProcessor.php +++ b/src/Oro/Bundle/NotificationBundle/Processor/EmailNotificationProcessor.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\NotificationBundle\Processor; -use Psr\Log\LoggerInterface; use Doctrine\ORM\EntityManager; -use Symfony\Component\HttpFoundation\ParameterBag; use Oro\Bundle\EmailBundle\Provider\EmailRenderer; use Oro\Bundle\NotificationBundle\Processor\EmailNotificationInterface; +use Psr\Log\LoggerInterface; +use Symfony\Component\HttpFoundation\ParameterBag; class EmailNotificationProcessor extends AbstractNotificationProcessor { diff --git a/src/Oro/Bundle/NotificationBundle/Provider/DoctrineListener.php b/src/Oro/Bundle/NotificationBundle/Provider/DoctrineListener.php index 095b0b900a7..c5e74aa5c44 100644 --- a/src/Oro/Bundle/NotificationBundle/Provider/DoctrineListener.php +++ b/src/Oro/Bundle/NotificationBundle/Provider/DoctrineListener.php @@ -4,10 +4,10 @@ use Doctrine\ORM\Event\LifecycleEventArgs; +use Oro\Bundle\NotificationBundle\Event\NotificationEvent; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Oro\Bundle\NotificationBundle\Event\NotificationEvent; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; class DoctrineListener { diff --git a/src/Oro/Bundle/NotificationBundle/Provider/NotificationManager.php b/src/Oro/Bundle/NotificationBundle/Provider/NotificationManager.php index 52da263f429..31e119a8711 100644 --- a/src/Oro/Bundle/NotificationBundle/Provider/NotificationManager.php +++ b/src/Oro/Bundle/NotificationBundle/Provider/NotificationManager.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\NotificationBundle\Provider; -use Doctrine\Common\Util\ClassUtils; use Doctrine\Common\Persistence\ObjectManager; +use Doctrine\Common\Util\ClassUtils; use Oro\Bundle\NotificationBundle\Entity\EmailNotification; -use Oro\Bundle\NotificationBundle\Event\NotificationEvent; use Oro\Bundle\NotificationBundle\Event\Handler\EventHandlerInterface; +use Oro\Bundle\NotificationBundle\Event\NotificationEvent; class NotificationManager { diff --git a/src/Oro/Bundle/NotificationBundle/Tests/Functional/ControllersTest.php b/src/Oro/Bundle/NotificationBundle/Tests/Functional/ControllersTest.php index dcfc2ab5c88..011923d5e0b 100644 --- a/src/Oro/Bundle/NotificationBundle/Tests/Functional/ControllersTest.php +++ b/src/Oro/Bundle/NotificationBundle/Tests/Functional/ControllersTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\NotificationBundle\Tests\Functional; -use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; -use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; use Oro\Bundle\TestFrameworkBundle\Test\Client; -use Symfony\Component\DomCrawler\Form; +use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; +use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; use Symfony\Component\DomCrawler\Field\ChoiceFormField; +use Symfony\Component\DomCrawler\Form; /** * @outputBuffering enabled diff --git a/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/NotificationHandlerPassTest.php b/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/NotificationHandlerPassTest.php index b997c24d157..a6cddde96b6 100644 --- a/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/NotificationHandlerPassTest.php +++ b/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/NotificationHandlerPassTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\NotificationBundle\Tests\Unit\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\Reference; - use Oro\Bundle\NotificationBundle\DependencyInjection\Compiler\NotificationHandlerPass; +use Symfony\Component\DependencyInjection\Reference; + class NotificationHandlerPassTest extends \PHPUnit_Framework_TestCase { const TEST_SERVICE_ID = 'test.id'; diff --git a/src/Oro/Bundle/NotificationBundle/Tests/Unit/Form/Handler/EmailNotificationHandlerTest.php b/src/Oro/Bundle/NotificationBundle/Tests/Unit/Form/Handler/EmailNotificationHandlerTest.php index c538c86f7ea..7c0fc086b9a 100644 --- a/src/Oro/Bundle/NotificationBundle/Tests/Unit/Form/Handler/EmailNotificationHandlerTest.php +++ b/src/Oro/Bundle/NotificationBundle/Tests/Unit/Form/Handler/EmailNotificationHandlerTest.php @@ -4,12 +4,12 @@ use Doctrine\Common\Persistence\ObjectManager; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Request; - use Oro\Bundle\NotificationBundle\Entity\EmailNotification; use Oro\Bundle\NotificationBundle\Form\Handler\EmailNotificationHandler; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\Request; + class EmailNotificationHandlerTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/NotificationBundle/Tests/Unit/Processor/EmailNotificationProcessorTest.php b/src/Oro/Bundle/NotificationBundle/Tests/Unit/Processor/EmailNotificationProcessorTest.php index 6417d91a0c6..016008f3521 100644 --- a/src/Oro/Bundle/NotificationBundle/Tests/Unit/Processor/EmailNotificationProcessorTest.php +++ b/src/Oro/Bundle/NotificationBundle/Tests/Unit/Processor/EmailNotificationProcessorTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\NotificationBundle\Tests\Unit\Processor; -use Oro\Bundle\NotificationBundle\Processor\EmailNotificationProcessor; use Monolog\Logger; +use Oro\Bundle\NotificationBundle\Processor\EmailNotificationProcessor; class EmailNotificationProcessorTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/NotificationBundle/Tests/Unit/Provider/DoctrineListenerTest.php b/src/Oro/Bundle/NotificationBundle/Tests/Unit/Provider/DoctrineListenerTest.php index 09d72b0d744..52eb27d9726 100644 --- a/src/Oro/Bundle/NotificationBundle/Tests/Unit/Provider/DoctrineListenerTest.php +++ b/src/Oro/Bundle/NotificationBundle/Tests/Unit/Provider/DoctrineListenerTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\NotificationBundle\Tests\Unit\Provider; -use Symfony\Bundle\FrameworkBundle\Tests\TestCase; - use Oro\Bundle\NotificationBundle\Provider\DoctrineListener; +use Symfony\Bundle\FrameworkBundle\Tests\TestCase; + class DoctrineListenerTest extends TestCase { /** diff --git a/src/Oro/Bundle/OrganizationBundle/Controller/Api/Rest/BusinessUnitController.php b/src/Oro/Bundle/OrganizationBundle/Controller/Api/Rest/BusinessUnitController.php index 29c2dd68f14..f7b4c3769c2 100644 --- a/src/Oro/Bundle/OrganizationBundle/Controller/Api/Rest/BusinessUnitController.php +++ b/src/Oro/Bundle/OrganizationBundle/Controller/Api/Rest/BusinessUnitController.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\OrganizationBundle\Controller\Api\Rest; -use Symfony\Component\HttpFoundation\Response; - -use Nelmio\ApiDocBundle\Annotation\ApiDoc; -use FOS\RestBundle\Routing\ClassResourceInterface; use FOS\RestBundle\Controller\Annotations\NamePrefix; -use FOS\RestBundle\Controller\Annotations\RouteResource; -use FOS\RestBundle\Controller\Annotations\QueryParam; +use FOS\RestBundle\Controller\Annotations\QueryParam; +use FOS\RestBundle\Controller\Annotations\RouteResource; +use FOS\RestBundle\Routing\ClassResourceInterface; +use Nelmio\ApiDocBundle\Annotation\ApiDoc; use Oro\Bundle\SecurityBundle\Annotation\Acl; + use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; +use Symfony\Component\HttpFoundation\Response; /** * @RouteResource("businessunit") diff --git a/src/Oro/Bundle/OrganizationBundle/Controller/Api/Soap/BusinessUnitController.php b/src/Oro/Bundle/OrganizationBundle/Controller/Api/Soap/BusinessUnitController.php index 1b84f649950..a74c57fa5c7 100644 --- a/src/Oro/Bundle/OrganizationBundle/Controller/Api/Soap/BusinessUnitController.php +++ b/src/Oro/Bundle/OrganizationBundle/Controller/Api/Soap/BusinessUnitController.php @@ -1,13 +1,13 @@ add( 'name', - 'text', + TextType::class, array( 'required' => true, ) ) ->add( 'phone', - 'text', + TextType::class, array( 'required' => false, ) ) ->add( 'website', - 'text', + TextType::class, array( 'required' => false, ) ) ->add( 'email', - 'text', + TextType::class, array( 'required' => false, ) ) ->add( 'fax', - 'text', + TextType::class, array( 'required' => false, ) @@ -85,7 +86,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ); } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -94,7 +95,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) ); } - public function getName() + public function getBlockPrefix() { return self::FORM_NAME; } diff --git a/src/Oro/Bundle/OrganizationBundle/Form/Type/OwnershipType.php b/src/Oro/Bundle/OrganizationBundle/Form/Type/OwnershipType.php index 6e7cb5fd303..f81a5d5683c 100644 --- a/src/Oro/Bundle/OrganizationBundle/Form/Type/OwnershipType.php +++ b/src/Oro/Bundle/OrganizationBundle/Form/Type/OwnershipType.php @@ -3,7 +3,8 @@ namespace Oro\Bundle\OrganizationBundle\Form\Type; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Translation\TranslatorInterface; class OwnershipType extends AbstractType @@ -28,7 +29,7 @@ public function __construct(TranslatorInterface $translator) $this->translator = $translator; } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -49,10 +50,10 @@ public function getOwnershipsArray() public function getParent() { - return 'choice'; + return ChoiceType::class; } - public function getName() + public function getBlockPrefix() { return self::NAME; } diff --git a/src/Oro/Bundle/OrganizationBundle/Tests/Functional/API/RestApiTest.php b/src/Oro/Bundle/OrganizationBundle/Tests/Functional/API/RestApiTest.php index 13e8496a24a..f7f0103d1ec 100644 --- a/src/Oro/Bundle/OrganizationBundle/Tests/Functional/API/RestApiTest.php +++ b/src/Oro/Bundle/OrganizationBundle/Tests/Functional/API/RestApiTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\OrganizationBundle\Tests\Functional\API; +use Oro\Bundle\TestFrameworkBundle\Test\Client; use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; -use Oro\Bundle\TestFrameworkBundle\Test\Client; use Symfony\Component\BrowserKit\Response; /** diff --git a/src/Oro/Bundle/OrganizationBundle/Tests/Functional/API/SoapApiTest.php b/src/Oro/Bundle/OrganizationBundle/Tests/Functional/API/SoapApiTest.php index 89fa173158f..322d4417d06 100644 --- a/src/Oro/Bundle/OrganizationBundle/Tests/Functional/API/SoapApiTest.php +++ b/src/Oro/Bundle/OrganizationBundle/Tests/Functional/API/SoapApiTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\OrganizationBundle\Tests\Functional\API; +use Oro\Bundle\TestFrameworkBundle\Test\Client; use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; -use Oro\Bundle\TestFrameworkBundle\Test\Client; use Symfony\Component\BrowserKit\Response; /** diff --git a/src/Oro/Bundle/OrganizationBundle/Tests/Functional/ControllersTest.php b/src/Oro/Bundle/OrganizationBundle/Tests/Functional/ControllersTest.php index 8aa4fe996e8..4a97b0bbbbb 100644 --- a/src/Oro/Bundle/OrganizationBundle/Tests/Functional/ControllersTest.php +++ b/src/Oro/Bundle/OrganizationBundle/Tests/Functional/ControllersTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\OrganizationBundle\Tests\Functional; -use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; -use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; use Oro\Bundle\TestFrameworkBundle\Test\Client; +use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; +use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; use Symfony\Component\DomCrawler\Form; /** diff --git a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Entity/BusinessUnitTest.php b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Entity/BusinessUnitTest.php index cfd3ca86dc9..9f4f4fa15cf 100644 --- a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Entity/BusinessUnitTest.php +++ b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Entity/BusinessUnitTest.php @@ -3,9 +3,9 @@ use Doctrine\Common\Collections\ArrayCollection; -use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; use Oro\Bundle\OrganizationBundle\Entity\Organization; +use Oro\Bundle\UserBundle\Entity\User; class BusinessUnitTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Form/Extension/FormTypeExtensionTest.php b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Form/Extension/FormTypeExtensionTest.php index 0ae14896c6e..5d5c178d34c 100644 --- a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Form/Extension/FormTypeExtensionTest.php +++ b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Form/Extension/FormTypeExtensionTest.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\OrganizationBundle\Tests\Form\Extension; +use Oro\Bundle\OrganizationBundle\Event\RecordOwnerDataListener; +use Oro\Bundle\OrganizationBundle\Form\Extension\FormTypeExtension; +use Oro\Bundle\OrganizationBundle\Form\Type\OwnershipType; + use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; use Symfony\Component\Form\FormEvents; use Symfony\Component\Validator\Constraints\NotBlank; -use Oro\Bundle\OrganizationBundle\Form\Extension\FormTypeExtension; -use Oro\Bundle\OrganizationBundle\Form\Type\OwnershipType; -use Oro\Bundle\OrganizationBundle\Event\RecordOwnerDataListener; - class FormTypeExtensionTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Form/Handler/BusinessUnitHandlerTest.php b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Form/Handler/BusinessUnitHandlerTest.php index 4e42d8d5435..f632b047a52 100644 --- a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Form/Handler/BusinessUnitHandlerTest.php +++ b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Form/Handler/BusinessUnitHandlerTest.php @@ -1,14 +1,14 @@ getRequest()->isXmlHttpRequest() + return $request->isXmlHttpRequest() ? new JsonResponse( $this->get('oro_search.index')->advancedSearch( $this->getRequest()->get('query') @@ -43,11 +43,11 @@ public function ajaxAdvancedSearchAction() * @Template("OroSearchBundle:Search:searchBar.html.twig") * @AclAncestor("oro_search") */ - public function searchBarAction() + public function searchBarAction(Request $request) { return array( 'entities' => $this->get('oro_search.index')->getAllowedEntitiesListAliases(), - 'searchString' => $this->getRequest()->get('searchString'), + 'searchString' => $request->get('searchString'), 'fromString' => $this->getRequest()->get('fromString'), ); } diff --git a/src/Oro/Bundle/SearchBundle/DependencyInjection/OroSearchExtension.php b/src/Oro/Bundle/SearchBundle/DependencyInjection/OroSearchExtension.php index 22ef6582c67..c59b10ab127 100644 --- a/src/Oro/Bundle/SearchBundle/DependencyInjection/OroSearchExtension.php +++ b/src/Oro/Bundle/SearchBundle/DependencyInjection/OroSearchExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\SearchBundle\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; use Symfony\Component\Yaml\Yaml; /** diff --git a/src/Oro/Bundle/SearchBundle/Engine/AbstractEngine.php b/src/Oro/Bundle/SearchBundle/Engine/AbstractEngine.php index 107cbcf5376..8cceaecf536 100644 --- a/src/Oro/Bundle/SearchBundle/Engine/AbstractEngine.php +++ b/src/Oro/Bundle/SearchBundle/Engine/AbstractEngine.php @@ -4,12 +4,12 @@ use Doctrine\ORM\EntityManager; -use Symfony\Component\EventDispatcher\EventDispatcher; +use Oro\Bundle\SearchBundle\Entity\Query as QueryLog; +use Oro\Bundle\SearchBundle\Event\PrepareResultItemEvent; use Oro\Bundle\SearchBundle\Query\Query; use Oro\Bundle\SearchBundle\Query\Result; -use Oro\Bundle\SearchBundle\Entity\Query as QueryLog; -use Oro\Bundle\SearchBundle\Event\PrepareResultItemEvent; +use Symfony\Component\EventDispatcher\EventDispatcher; /** * Connector abstract class diff --git a/src/Oro/Bundle/SearchBundle/Engine/AbstractMapper.php b/src/Oro/Bundle/SearchBundle/Engine/AbstractMapper.php index f45f2cf9d21..72a17da8859 100644 --- a/src/Oro/Bundle/SearchBundle/Engine/AbstractMapper.php +++ b/src/Oro/Bundle/SearchBundle/Engine/AbstractMapper.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\SearchBundle\Engine; -use Symfony\Component\PropertyAccess\PropertyAccess; use Oro\Bundle\FlexibleEntityBundle\AttributeType\AbstractAttributeType; - use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\PropertyAccess\PropertyAccess; + abstract class AbstractMapper { /** diff --git a/src/Oro/Bundle/SearchBundle/Engine/Indexer.php b/src/Oro/Bundle/SearchBundle/Engine/Indexer.php index f056e436d3f..7b72cde698e 100644 --- a/src/Oro/Bundle/SearchBundle/Engine/Indexer.php +++ b/src/Oro/Bundle/SearchBundle/Engine/Indexer.php @@ -4,11 +4,11 @@ use Doctrine\Common\Persistence\ObjectManager; -use Oro\Bundle\SearchBundle\Query\Query; +use Oro\Bundle\SearchBundle\Engine\AbstractEngine; +use Oro\Bundle\SearchBundle\Engine\ObjectMapper; use Oro\Bundle\SearchBundle\Query\Parser; +use Oro\Bundle\SearchBundle\Query\Query; use Oro\Bundle\SearchBundle\Query\Result; -use Oro\Bundle\SearchBundle\Engine\ObjectMapper; -use Oro\Bundle\SearchBundle\Engine\AbstractEngine; use Oro\Bundle\SearchBundle\Security\SecurityProvider; class Indexer diff --git a/src/Oro/Bundle/SearchBundle/Engine/ObjectMapper.php b/src/Oro/Bundle/SearchBundle/Engine/ObjectMapper.php index 918e4893119..5e0ccee6522 100644 --- a/src/Oro/Bundle/SearchBundle/Engine/ObjectMapper.php +++ b/src/Oro/Bundle/SearchBundle/Engine/ObjectMapper.php @@ -1,10 +1,10 @@ add( 'name', - 'hidden', + HiddenType::class, array( 'required' => false, ) @@ -32,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_acl_permission'; } @@ -40,7 +41,7 @@ public function getName() /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( diff --git a/src/Oro/Bundle/SecurityBundle/Form/Type/AclPrivilegeIdentityType.php b/src/Oro/Bundle/SecurityBundle/Form/Type/AclPrivilegeIdentityType.php index d3d2e83052c..3d27fd6f5cb 100644 --- a/src/Oro/Bundle/SecurityBundle/Form/Type/AclPrivilegeIdentityType.php +++ b/src/Oro/Bundle/SecurityBundle/Form/Type/AclPrivilegeIdentityType.php @@ -3,8 +3,9 @@ namespace Oro\Bundle\SecurityBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class AclPrivilegeIdentityType extends AbstractType { @@ -15,7 +16,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( 'id', - 'hidden', + HiddenType::class, array( 'required' => true, ) @@ -32,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_acl_privilege_identity'; } @@ -40,7 +41,7 @@ public function getName() /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( diff --git a/src/Oro/Bundle/SecurityBundle/Form/Type/AclPrivilegeType.php b/src/Oro/Bundle/SecurityBundle/Form/Type/AclPrivilegeType.php index d0c98fedd61..724c3dc7cd9 100644 --- a/src/Oro/Bundle/SecurityBundle/Form/Type/AclPrivilegeType.php +++ b/src/Oro/Bundle/SecurityBundle/Form/Type/AclPrivilegeType.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\SecurityBundle\Form\Type; +use Oro\Bundle\SecurityBundle\Form\Type\AclPermissionType; +use Oro\Bundle\SecurityBundle\Form\Type\AclPrivilegeIdentityType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormInterface; -use Symfony\Component\Form\FormView; -use Oro\Bundle\SecurityBundle\Form\Type\AclPrivilegeIdentityType; -use Oro\Bundle\SecurityBundle\Form\Type\AclPermissionType; +use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; class AclPrivilegeType extends AbstractType { @@ -52,7 +52,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -65,7 +65,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_acl_privilege'; } diff --git a/src/Oro/Bundle/SecurityBundle/Form/Type/ObjectLabelType.php b/src/Oro/Bundle/SecurityBundle/Form/Type/ObjectLabelType.php index 7cd75d8e418..f77e0868098 100644 --- a/src/Oro/Bundle/SecurityBundle/Form/Type/ObjectLabelType.php +++ b/src/Oro/Bundle/SecurityBundle/Form/Type/ObjectLabelType.php @@ -3,13 +3,14 @@ namespace Oro\Bundle\SecurityBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; class ObjectLabelType extends AbstractType { /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_acl_label'; } @@ -19,6 +20,6 @@ public function getName() */ public function getParent() { - return 'hidden'; + return HiddenType::class; } } diff --git a/src/Oro/Bundle/SecurityBundle/Form/Type/PermissionCollectionType.php b/src/Oro/Bundle/SecurityBundle/Form/Type/PermissionCollectionType.php index 68add2f32a9..57b8aa51fe2 100644 --- a/src/Oro/Bundle/SecurityBundle/Form/Type/PermissionCollectionType.php +++ b/src/Oro/Bundle/SecurityBundle/Form/Type/PermissionCollectionType.php @@ -3,6 +3,7 @@ namespace Oro\Bundle\SecurityBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; @@ -23,7 +24,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_acl_permission_collection'; } @@ -33,6 +34,6 @@ public function getName() */ public function getParent() { - return 'collection'; + return CollectionType::class; } } diff --git a/src/Oro/Bundle/SecurityBundle/Form/Type/PrivilegeCollectionType.php b/src/Oro/Bundle/SecurityBundle/Form/Type/PrivilegeCollectionType.php index 557be1579ea..cc8e044b442 100644 --- a/src/Oro/Bundle/SecurityBundle/Form/Type/PrivilegeCollectionType.php +++ b/src/Oro/Bundle/SecurityBundle/Form/Type/PrivilegeCollectionType.php @@ -3,6 +3,7 @@ namespace Oro\Bundle\SecurityBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; @@ -23,7 +24,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_acl_collection'; } @@ -33,6 +34,6 @@ public function getName() */ public function getParent() { - return 'collection'; + return CollectionType::class; } } diff --git a/src/Oro/Bundle/SecurityBundle/Metadata/AclAnnotationProvider.php b/src/Oro/Bundle/SecurityBundle/Metadata/AclAnnotationProvider.php index 6119de79068..76ef9f8913c 100644 --- a/src/Oro/Bundle/SecurityBundle/Metadata/AclAnnotationProvider.php +++ b/src/Oro/Bundle/SecurityBundle/Metadata/AclAnnotationProvider.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\SecurityBundle\Metadata; use Doctrine\Common\Cache\CacheProvider; -use Oro\Bundle\SecurityBundle\Annotation\Loader\AclAnnotationLoaderInterface; use Oro\Bundle\SecurityBundle\Annotation\Acl as AclAnnotation; +use Oro\Bundle\SecurityBundle\Annotation\Loader\AclAnnotationLoaderInterface; class AclAnnotationProvider { diff --git a/src/Oro/Bundle/SecurityBundle/ORM/SqlFilter/OwnershipFilter.php b/src/Oro/Bundle/SecurityBundle/ORM/SqlFilter/OwnershipFilter.php index 3d9caa94339..f4bbd034076 100644 --- a/src/Oro/Bundle/SecurityBundle/ORM/SqlFilter/OwnershipFilter.php +++ b/src/Oro/Bundle/SecurityBundle/ORM/SqlFilter/OwnershipFilter.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\SecurityBundle\ORM\SqlFilter; -use Oro\Bundle\SecurityBundle\ORM\SqlFilter\OwnershipFilterBuilder; use Doctrine\ORM\Mapping\ClassMetaData; use Doctrine\ORM\Query\Filter\SQLFilter; +use Oro\Bundle\SecurityBundle\ORM\SqlFilter\OwnershipFilterBuilder; class OwnershipFilter extends SQLFilter { diff --git a/src/Oro/Bundle/SecurityBundle/ORM/SqlFilter/OwnershipFilterBuilder.php b/src/Oro/Bundle/SecurityBundle/ORM/SqlFilter/OwnershipFilterBuilder.php index 143b52ef8c0..fc81924169a 100644 --- a/src/Oro/Bundle/SecurityBundle/ORM/SqlFilter/OwnershipFilterBuilder.php +++ b/src/Oro/Bundle/SecurityBundle/ORM/SqlFilter/OwnershipFilterBuilder.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\SecurityBundle\ORM\SqlFilter; +use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; +use Oro\Bundle\SecurityBundle\Acl\AccessLevel; +use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdAccessor; +use Oro\Bundle\SecurityBundle\Acl\Domain\OneShotIsGrantedObserver; +use Oro\Bundle\SecurityBundle\Acl\Voter\AclVoter; use Oro\Bundle\SecurityBundle\Metadata\EntitySecurityMetadataProvider; -use Symfony\Component\Security\Core\SecurityContextInterface; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; use Oro\Bundle\SecurityBundle\Owner\OwnerTree; -use Oro\Bundle\SecurityBundle\Acl\Domain\OneShotIsGrantedObserver; -use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdAccessor; -use Oro\Bundle\SecurityBundle\Acl\AccessLevel; -use Oro\Bundle\SecurityBundle\Acl\Voter\AclVoter; -use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; +use Symfony\Component\Security\Core\SecurityContextInterface; /** * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) diff --git a/src/Oro/Bundle/SecurityBundle/OroSecurityBundle.php b/src/Oro/Bundle/SecurityBundle/OroSecurityBundle.php index c09a687480e..e28b2432b9a 100644 --- a/src/Oro/Bundle/SecurityBundle/OroSecurityBundle.php +++ b/src/Oro/Bundle/SecurityBundle/OroSecurityBundle.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\SecurityBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Oro\Bundle\SecurityBundle\DependencyInjection\Compiler\AclConfigurationPass; use Oro\Bundle\SecurityBundle\DependencyInjection\Compiler\AclAnnotationProviderPass; +use Oro\Bundle\SecurityBundle\DependencyInjection\Compiler\AclConfigurationPass; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroSecurityBundle extends Bundle { diff --git a/src/Oro/Bundle/SecurityBundle/Owner/EntityOwnerAccessor.php b/src/Oro/Bundle/SecurityBundle/Owner/EntityOwnerAccessor.php index 7ac5513a032..806bcfc3e07 100644 --- a/src/Oro/Bundle/SecurityBundle/Owner/EntityOwnerAccessor.php +++ b/src/Oro/Bundle/SecurityBundle/Owner/EntityOwnerAccessor.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\SecurityBundle\Owner; +use Oro\Bundle\EntityBundle\Exception\InvalidEntityException; use Oro\Bundle\EntityBundle\ORM\EntityClassAccessor; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; -use Oro\Bundle\EntityBundle\Exception\InvalidEntityException; /** * This class allows to get the owner of an entity diff --git a/src/Oro/Bundle/SecurityBundle/Owner/EntityOwnershipDecisionMaker.php b/src/Oro/Bundle/SecurityBundle/Owner/EntityOwnershipDecisionMaker.php index 88a36e76753..fb939af4fcf 100644 --- a/src/Oro/Bundle/SecurityBundle/Owner/EntityOwnershipDecisionMaker.php +++ b/src/Oro/Bundle/SecurityBundle/Owner/EntityOwnershipDecisionMaker.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\SecurityBundle\Owner; -use Oro\Bundle\SecurityBundle\Acl\Extension\OwnershipDecisionMakerInterface; +use Oro\Bundle\EntityBundle\Exception\InvalidEntityException; use Oro\Bundle\EntityBundle\ORM\EntityClassAccessor; +use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdAccessor; +use Oro\Bundle\SecurityBundle\Acl\Extension\OwnershipDecisionMakerInterface; +use Oro\Bundle\SecurityBundle\Owner\EntityOwnerAccessor; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; -use Oro\Bundle\SecurityBundle\Owner\EntityOwnerAccessor; -use Oro\Bundle\EntityBundle\Exception\InvalidEntityException; use Symfony\Component\Security\Acl\Exception\InvalidDomainObjectException; -use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdAccessor; /** * This class implements OwnershipDecisionMakerInterface interface and allows to make ownership related diff --git a/src/Oro/Bundle/SecurityBundle/Owner/Metadata/OwnershipMetadataProvider.php b/src/Oro/Bundle/SecurityBundle/Owner/Metadata/OwnershipMetadataProvider.php index 09201c06c12..5c14b2cc892 100644 --- a/src/Oro/Bundle/SecurityBundle/Owner/Metadata/OwnershipMetadataProvider.php +++ b/src/Oro/Bundle/SecurityBundle/Owner/Metadata/OwnershipMetadataProvider.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\SecurityBundle\Owner\Metadata; use Doctrine\Common\Cache\CacheProvider; -use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; use Oro\Bundle\EntityBundle\ORM\EntityClassResolver; +use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException; /** diff --git a/src/Oro/Bundle/SecurityBundle/SecurityFacade.php b/src/Oro/Bundle/SecurityBundle/SecurityFacade.php index acc95f77afd..99c88044d27 100644 --- a/src/Oro/Bundle/SecurityBundle/SecurityFacade.php +++ b/src/Oro/Bundle/SecurityBundle/SecurityFacade.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\SecurityBundle; -use Psr\Log\LoggerInterface; -use Symfony\Component\Security\Core\SecurityContextInterface; use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdentityFactory; use Oro\Bundle\SecurityBundle\Metadata\AclAnnotationProvider; +use Psr\Log\LoggerInterface; +use Symfony\Component\Security\Core\SecurityContextInterface; class SecurityFacade { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/Fixtures/OwnershipMetadataProviderStub.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/Fixtures/OwnershipMetadataProviderStub.php index b7cb90bcdae..67d26a97ffb 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/Fixtures/OwnershipMetadataProviderStub.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/Fixtures/OwnershipMetadataProviderStub.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures; -use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; +use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; class OwnershipMetadataProviderStub extends OwnershipMetadataProvider { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/Fixtures/PermissionGrantingStrategyContext.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/Fixtures/PermissionGrantingStrategyContext.php index ea5a7f40f82..e10d0d1d9b1 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/Fixtures/PermissionGrantingStrategyContext.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/Fixtures/PermissionGrantingStrategyContext.php @@ -4,8 +4,8 @@ use Oro\Bundle\SecurityBundle\Acl\Domain\OneShotIsGrantedObserver; use Oro\Bundle\SecurityBundle\Acl\Domain\PermissionGrantingStrategyContextInterface; -use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Oro\Bundle\SecurityBundle\Acl\Extension\AclExtensionSelector; +use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; class PermissionGrantingStrategyContext implements PermissionGrantingStrategyContextInterface { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/ObjectIdentityFactoryTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/ObjectIdentityFactoryTest.php index 7bf8e9ccaea..6bc098e050d 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/ObjectIdentityFactoryTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/ObjectIdentityFactoryTest.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain; use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdentityFactory; +use Oro\Bundle\SecurityBundle\Annotation\Acl as AclAnnotation; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\TestEntity; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\TestEntityImplementsDomainObjectInterface; use Oro\Bundle\SecurityBundle\Tests\Unit\TestHelper; -use Oro\Bundle\SecurityBundle\Annotation\Acl as AclAnnotation; class ObjectIdentityFactoryTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/PermissionGrantingStrategyTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/PermissionGrantingStrategyTest.php index ba67388e489..46cd291f89e 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/PermissionGrantingStrategyTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Domain/PermissionGrantingStrategyTest.php @@ -2,26 +2,26 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain; +use Oro\Bundle\EntityBundle\ORM\EntityClassAccessor; +use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdAccessor; +use Oro\Bundle\SecurityBundle\Acl\Domain\PermissionGrantingStrategy; +use Oro\Bundle\SecurityBundle\Acl\Extension\AclExtensionSelector; +use Oro\Bundle\SecurityBundle\Acl\Permission\MaskBuilder; +use Oro\Bundle\SecurityBundle\Acl\Permission\PermissionMap; +use Oro\Bundle\SecurityBundle\Owner\EntityOwnerAccessor; +use Oro\Bundle\SecurityBundle\Owner\EntityOwnershipDecisionMaker; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; +use Oro\Bundle\SecurityBundle\Owner\OwnerTree; +use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\TestEntity; +use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\User; +use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\OwnershipMetadataProviderStub; +use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\PermissionGrantingStrategyContext; +use Oro\Bundle\SecurityBundle\Tests\Unit\TestHelper; +use Symfony\Component\Security\Acl\Domain\Acl; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; -use Symfony\Component\Security\Acl\Domain\Acl; use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity; -use Oro\Bundle\SecurityBundle\Acl\Domain\PermissionGrantingStrategy; use Symfony\Component\Security\Acl\Exception\NoAceFoundException; -use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\PermissionGrantingStrategyContext; -use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\User; -use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\TestEntity; -use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\OwnershipMetadataProviderStub; -use Oro\Bundle\SecurityBundle\Acl\Permission\PermissionMap; -use Oro\Bundle\SecurityBundle\Acl\Permission\MaskBuilder; -use Oro\Bundle\SecurityBundle\Owner\OwnerTree; -use Oro\Bundle\SecurityBundle\Owner\EntityOwnershipDecisionMaker; -use Oro\Bundle\EntityBundle\ORM\EntityClassAccessor; -use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdAccessor; -use Oro\Bundle\SecurityBundle\Owner\EntityOwnerAccessor; -use Oro\Bundle\SecurityBundle\Acl\Extension\AclExtensionSelector; -use Oro\Bundle\SecurityBundle\Tests\Unit\TestHelper; class PermissionGrantingStrategyTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Extension/EntityAclExtensionTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Extension/EntityAclExtensionTest.php index b367d12abb4..118dfaca813 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Extension/EntityAclExtensionTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Extension/EntityAclExtensionTest.php @@ -7,13 +7,13 @@ use Oro\Bundle\SecurityBundle\Acl\Extension\EntityAclExtension; use Oro\Bundle\SecurityBundle\Acl\Extension\EntityMaskBuilder; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; +use Oro\Bundle\SecurityBundle\Owner\OwnerTree; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\BusinessUnit; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\Organization; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\TestEntity; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\User; -use Oro\Bundle\SecurityBundle\Tests\Unit\TestHelper; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\OwnershipMetadataProviderStub; -use Oro\Bundle\SecurityBundle\Owner\OwnerTree; +use Oro\Bundle\SecurityBundle\Tests\Unit\TestHelper; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; class EntityAclExtensionTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Permission/PermissionMapTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Permission/PermissionMapTest.php index bebf9afe5f5..13d7fc11768 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Permission/PermissionMapTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Permission/PermissionMapTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Permission; -use Oro\Bundle\SecurityBundle\Acl\Permission\PermissionMap; -use Oro\Bundle\SecurityBundle\Acl\Extension\EntityMaskBuilder; use Oro\Bundle\SecurityBundle\Acl\Extension\ActionMaskBuilder; -use Oro\Bundle\SecurityBundle\Tests\Unit\TestHelper; +use Oro\Bundle\SecurityBundle\Acl\Extension\EntityMaskBuilder; +use Oro\Bundle\SecurityBundle\Acl\Permission\PermissionMap; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\TestEntity; +use Oro\Bundle\SecurityBundle\Tests\Unit\TestHelper; class PermissionMapTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Persistence/AclManagerTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Persistence/AclManagerTest.php index da79d889a2b..2873d2c41b1 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Persistence/AclManagerTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Persistence/AclManagerTest.php @@ -4,8 +4,8 @@ use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdentityFactory; use Oro\Bundle\SecurityBundle\Acl\Persistence\AclManager; -use Symfony\Component\Security\Acl\Domain\ObjectIdentity; use Oro\Bundle\SecurityBundle\Acl\Persistence\Batch\BatchItem; +use Symfony\Component\Security\Acl\Domain\ObjectIdentity; use Symfony\Component\Security\Acl\Exception\AclNotFoundException; use Symfony\Component\Security\Acl\Model\MutableAclInterface; diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Annotation/Fixtures/Classes/MainTestController.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Annotation/Fixtures/Classes/MainTestController.php index 48ca0582e7c..9ddfb6f4490 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Annotation/Fixtures/Classes/MainTestController.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Annotation/Fixtures/Classes/MainTestController.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Annotation\Fixtures\Classes; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpFoundation\Response; - use Oro\Bundle\SecurityBundle\Annotation\Acl; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Response; + /** * @Acl( * id = "user_test_main_controller", diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/EventListener/ControllerListenerTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/EventListener/ControllerListenerTest.php index 03ada95f3d9..3201a941768 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/EventListener/ControllerListenerTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/EventListener/ControllerListenerTest.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\EventListener; +use Oro\Bundle\SecurityBundle\Annotation\Acl as AclAnnotation; use Oro\Bundle\SecurityBundle\EventListener\ControllerListener; use Oro\Bundle\SecurityBundle\SecurityFacade; -use Symfony\Component\HttpFoundation\Request; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\TestDomainObject; -use Oro\Bundle\SecurityBundle\Annotation\Acl as AclAnnotation; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Event\FilterControllerEvent; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; -use Symfony\Component\HttpKernel\Event\FilterControllerEvent; class ControllerListenerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/AclAnnotationProviderTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/AclAnnotationProviderTest.php index 2c7f1c0dc74..05ed39bd100 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/AclAnnotationProviderTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/AclAnnotationProviderTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Metadata; +use Oro\Bundle\SecurityBundle\Annotation\Acl as AclAnnotation; use Oro\Bundle\SecurityBundle\Metadata\AclAnnotationProvider; use Oro\Bundle\SecurityBundle\Metadata\AclAnnotationStorage; -use Oro\Bundle\SecurityBundle\Annotation\Acl as AclAnnotation; class AclAnnotationProviderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/AclAnnotationStorageTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/AclAnnotationStorageTest.php index 9a26e1fda68..c928eee4b36 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/AclAnnotationStorageTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/AclAnnotationStorageTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Metadata; -use Oro\Bundle\SecurityBundle\Metadata\AclAnnotationStorage; use Oro\Bundle\SecurityBundle\Annotation\Acl as AclAnnotation; use Oro\Bundle\SecurityBundle\Annotation\AclAncestor as AclAnnotationAncestor; +use Oro\Bundle\SecurityBundle\Metadata\AclAnnotationStorage; class AclAnnotationStorageTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/ActionMetadataProviderTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/ActionMetadataProviderTest.php index ced3ed0265d..a5437632778 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/ActionMetadataProviderTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Metadata/ActionMetadataProviderTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Metadata; +use Oro\Bundle\SecurityBundle\Annotation\Acl as AclAnnotation; use Oro\Bundle\SecurityBundle\Metadata\ActionMetadata; use Oro\Bundle\SecurityBundle\Metadata\ActionMetadataProvider; -use Oro\Bundle\SecurityBundle\Annotation\Acl as AclAnnotation; class ActionMetadataProviderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Model/AclPrivilegeTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Model/AclPrivilegeTest.php index 4b8a417eac7..a1e5174386d 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Model/AclPrivilegeTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Model/AclPrivilegeTest.php @@ -3,9 +3,9 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Model; use Oro\Bundle\SecurityBundle\Acl\AccessLevel; +use Oro\Bundle\SecurityBundle\Model\AclPermission; use Oro\Bundle\SecurityBundle\Model\AclPrivilege; use Oro\Bundle\SecurityBundle\Model\AclPrivilegeIdentity; -use Oro\Bundle\SecurityBundle\Model\AclPermission; class AclPrivilegeTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/ORM/SqlFilter/OwnershipFilterBuilderTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/ORM/SqlFilter/OwnershipFilterBuilderTest.php index c0e7b3e5131..99d80b58854 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/ORM/SqlFilter/OwnershipFilterBuilderTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/ORM/SqlFilter/OwnershipFilterBuilderTest.php @@ -4,12 +4,12 @@ use Oro\Bundle\SecurityBundle\Acl\AccessLevel; use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdAccessor; +use Oro\Bundle\SecurityBundle\Acl\Domain\OneShotIsGrantedObserver; use Oro\Bundle\SecurityBundle\ORM\SqlFilter\OwnershipFilterBuilder; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; +use Oro\Bundle\SecurityBundle\Owner\OwnerTree; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\User; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\OwnershipMetadataProviderStub; -use Oro\Bundle\SecurityBundle\Owner\OwnerTree; -use Oro\Bundle\SecurityBundle\Acl\Domain\OneShotIsGrantedObserver; class OwnershipFilterBuilderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/EntityOwnerAccessorTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/EntityOwnerAccessorTest.php index c8e3fff5738..d0d0aca8c01 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/EntityOwnerAccessorTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/EntityOwnerAccessorTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Owner; -use Oro\Bundle\SecurityBundle\Owner\EntityOwnerAccessor; use Oro\Bundle\EntityBundle\ORM\EntityClassAccessor; -use Oro\Bundle\SecurityBundle\Tests\Unit\Owner\Fixtures\OwnershipMetadataProviderStub; +use Oro\Bundle\SecurityBundle\Owner\EntityOwnerAccessor; +use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; use Oro\Bundle\SecurityBundle\Tests\Unit\Owner\Fixtures\Entity\TestEntity; use Oro\Bundle\SecurityBundle\Tests\Unit\Owner\Fixtures\Entity\TestEntityWithOwnerFieldButWithoutGetOwnerMethod; -use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; +use Oro\Bundle\SecurityBundle\Tests\Unit\Owner\Fixtures\OwnershipMetadataProviderStub; class EntityOwnerAccessorTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/EntityOwnershipDecisionMakerTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/EntityOwnershipDecisionMakerTest.php index 19abdbda948..66ab6f4eafe 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/EntityOwnershipDecisionMakerTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/EntityOwnershipDecisionMakerTest.php @@ -6,13 +6,13 @@ use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdAccessor; use Oro\Bundle\SecurityBundle\Owner\EntityOwnerAccessor; use Oro\Bundle\SecurityBundle\Owner\EntityOwnershipDecisionMaker; -use Oro\Bundle\SecurityBundle\Owner\OwnerTree; -use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\OwnershipMetadataProviderStub; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; -use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\Organization; +use Oro\Bundle\SecurityBundle\Owner\OwnerTree; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\BusinessUnit; +use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\Organization; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\TestEntity; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\User; +use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\OwnershipMetadataProviderStub; class EntityOwnershipDecisionMakerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/Fixtures/OwnershipMetadataProviderStub.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/Fixtures/OwnershipMetadataProviderStub.php index 7c76297b59d..fb6ca046d68 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/Fixtures/OwnershipMetadataProviderStub.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/Fixtures/OwnershipMetadataProviderStub.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit\Owner\Fixtures; -use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; +use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; class OwnershipMetadataProviderStub extends OwnershipMetadataProvider { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/Metadata/OwnershipMetadataProviderTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/Metadata/OwnershipMetadataProviderTest.php index 8c9880d660d..ec8cc1a3b0e 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/Metadata/OwnershipMetadataProviderTest.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/Metadata/OwnershipMetadataProviderTest.php @@ -4,8 +4,8 @@ use Oro\Bundle\EntityConfigBundle\Config\Config; use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; -use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata; +use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; class OwnershipMetadataProviderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/TestHelper.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/TestHelper.php index a7bfe800195..0388fa375ff 100644 --- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/TestHelper.php +++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/TestHelper.php @@ -3,15 +3,15 @@ namespace Oro\Bundle\SecurityBundle\Tests\Unit; use Oro\Bundle\EntityBundle\ORM\EntityClassAccessor; -use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdAccessor; use Oro\Bundle\EntityBundle\ORM\EntityClassResolver; +use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdAccessor; use Oro\Bundle\SecurityBundle\Acl\Extension\AclExtensionSelector; -use Oro\Bundle\SecurityBundle\Acl\Extension\EntityAclExtension; use Oro\Bundle\SecurityBundle\Acl\Extension\ActionAclExtension; +use Oro\Bundle\SecurityBundle\Acl\Extension\EntityAclExtension; use Oro\Bundle\SecurityBundle\Owner\EntityOwnerAccessor; use Oro\Bundle\SecurityBundle\Owner\EntityOwnershipDecisionMaker; -use Oro\Bundle\SecurityBundle\Owner\OwnerTree; use Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataProvider; +use Oro\Bundle\SecurityBundle\Owner\OwnerTree; use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\OwnershipMetadataProviderStub; class TestHelper diff --git a/src/Oro/Bundle/SegmentationTreeBundle/DependencyInjection/OroSegmentationTreeExtension.php b/src/Oro/Bundle/SegmentationTreeBundle/DependencyInjection/OroSegmentationTreeExtension.php index 686081e4e55..e4eddd047d5 100644 --- a/src/Oro/Bundle/SegmentationTreeBundle/DependencyInjection/OroSegmentationTreeExtension.php +++ b/src/Oro/Bundle/SegmentationTreeBundle/DependencyInjection/OroSegmentationTreeExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\SegmentationTreeBundle\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; /** * Extension diff --git a/src/Oro/Bundle/SegmentationTreeBundle/Entity/AbstractSegment.php b/src/Oro/Bundle/SegmentationTreeBundle/Entity/AbstractSegment.php index 8a9de22224d..01f4541be7b 100644 --- a/src/Oro/Bundle/SegmentationTreeBundle/Entity/AbstractSegment.php +++ b/src/Oro/Bundle/SegmentationTreeBundle/Entity/AbstractSegment.php @@ -1,8 +1,8 @@ setDefaults( array( @@ -28,7 +28,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_tag_autocomplete'; } diff --git a/src/Oro/Bundle/TagBundle/Form/Type/TagSelectType.php b/src/Oro/Bundle/TagBundle/Form/Type/TagSelectType.php index 0c5ced90ada..36473a5a84f 100644 --- a/src/Oro/Bundle/TagBundle/Form/Type/TagSelectType.php +++ b/src/Oro/Bundle/TagBundle/Form/Type/TagSelectType.php @@ -1,12 +1,12 @@ setDefaults( array( @@ -68,7 +68,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_tag_select'; } diff --git a/src/Oro/Bundle/TagBundle/Form/Type/TagType.php b/src/Oro/Bundle/TagBundle/Form/Type/TagType.php index 2b91ce2dc8d..9175bd9b02d 100644 --- a/src/Oro/Bundle/TagBundle/Form/Type/TagType.php +++ b/src/Oro/Bundle/TagBundle/Form/Type/TagType.php @@ -3,8 +3,9 @@ namespace Oro\Bundle\TagBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class TagType extends AbstractType { @@ -15,7 +16,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( 'name', - 'text', + TextType::class, array('required' => true) ); } @@ -23,7 +24,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -36,7 +37,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_tag_tag'; } diff --git a/src/Oro/Bundle/TagBundle/OroTagBundle.php b/src/Oro/Bundle/TagBundle/OroTagBundle.php index a36b92fcf50..3c1bb5c55bf 100644 --- a/src/Oro/Bundle/TagBundle/OroTagBundle.php +++ b/src/Oro/Bundle/TagBundle/OroTagBundle.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\TagBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; +use Oro\Bundle\TagBundle\DependencyInjection\Compiler\TagManagerPass; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Oro\Bundle\TagBundle\DependencyInjection\Compiler\TagManagerPass; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroTagBundle extends Bundle { diff --git a/src/Oro/Bundle/TagBundle/Provider/SearchProvider.php b/src/Oro/Bundle/TagBundle/Provider/SearchProvider.php index f15cd57e84e..5ebec4cb717 100644 --- a/src/Oro/Bundle/TagBundle/Provider/SearchProvider.php +++ b/src/Oro/Bundle/TagBundle/Provider/SearchProvider.php @@ -4,12 +4,12 @@ use Doctrine\ORM\EntityManager; +use Oro\Bundle\SearchBundle\Engine\ObjectMapper; +use Oro\Bundle\SearchBundle\Provider\ResultStatisticsProvider; use Oro\Bundle\SearchBundle\Query\Query; use Oro\Bundle\SearchBundle\Query\Result; -use Oro\Bundle\TagBundle\Entity\Tagging; use Oro\Bundle\SearchBundle\Query\Result\Item; -use Oro\Bundle\SearchBundle\Engine\ObjectMapper; -use Oro\Bundle\SearchBundle\Provider\ResultStatisticsProvider; +use Oro\Bundle\TagBundle\Entity\Tagging; class SearchProvider extends ResultStatisticsProvider { diff --git a/src/Oro/Bundle/TagBundle/Tests/Functional/ControllersTest.php b/src/Oro/Bundle/TagBundle/Tests/Functional/ControllersTest.php index d8b1cbac1d1..338ec774f68 100644 --- a/src/Oro/Bundle/TagBundle/Tests/Functional/ControllersTest.php +++ b/src/Oro/Bundle/TagBundle/Tests/Functional/ControllersTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\TagBundle\Tests\Functional; -use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; -use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; use Oro\Bundle\TestFrameworkBundle\Test\Client; +use Oro\Bundle\TestFrameworkBundle\Test\ToolsAPI; +use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; /** * @outputBuffering enabled diff --git a/src/Oro/Bundle/TagBundle/Tests/Unit/Form/EventSubscriber/TagSubscriberTest.php b/src/Oro/Bundle/TagBundle/Tests/Unit/Form/EventSubscriber/TagSubscriberTest.php index b8b475e638a..699902e95b4 100644 --- a/src/Oro/Bundle/TagBundle/Tests/Unit/Form/EventSubscriber/TagSubscriberTest.php +++ b/src/Oro/Bundle/TagBundle/Tests/Unit/Form/EventSubscriber/TagSubscriberTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\TagBundle\Tests\Unit\Form\EventSubscriber; -use Symfony\Component\Form\FormEvents; - use Oro\Bundle\TagBundle\Entity\Tag; + use Oro\Bundle\TagBundle\Form\EventSubscriber\TagSubscriber; +use Symfony\Component\Form\FormEvents; class TagSubscriberTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/TagBundle/Tests/Unit/Form/Handler/TagHandlerTest.php b/src/Oro/Bundle/TagBundle/Tests/Unit/Form/Handler/TagHandlerTest.php index 9061160369d..b18b1604708 100644 --- a/src/Oro/Bundle/TagBundle/Tests/Unit/Form/Handler/TagHandlerTest.php +++ b/src/Oro/Bundle/TagBundle/Tests/Unit/Form/Handler/TagHandlerTest.php @@ -4,12 +4,12 @@ use Doctrine\Common\Persistence\ObjectManager; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Request; - use Oro\Bundle\TagBundle\Entity\Tag; use Oro\Bundle\TagBundle\Form\Handler\TagHandler; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\Request; + class TagHandlerTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/TagBundle/Twig/TagExtension.php b/src/Oro/Bundle/TagBundle/Twig/TagExtension.php index dda222808b9..dd234451e11 100644 --- a/src/Oro/Bundle/TagBundle/Twig/TagExtension.php +++ b/src/Oro/Bundle/TagBundle/Twig/TagExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\TagBundle\Twig; -use Symfony\Component\Routing\Router; - use Oro\Bundle\TagBundle\Entity\Taggable; + use Oro\Bundle\TagBundle\Entity\TagManager; +use Symfony\Component\Routing\Router; class TagExtension extends \Twig_Extension { diff --git a/src/Oro/Bundle/TestFrameworkBundle/DependencyInjection/OroTestFrameworkExtension.php b/src/Oro/Bundle/TestFrameworkBundle/DependencyInjection/OroTestFrameworkExtension.php index 100b56f9dfc..84699fddbce 100644 --- a/src/Oro/Bundle/TestFrameworkBundle/DependencyInjection/OroTestFrameworkExtension.php +++ b/src/Oro/Bundle/TestFrameworkBundle/DependencyInjection/OroTestFrameworkExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\TestFrameworkBundle\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; class OroTestFrameworkExtension extends Extension { diff --git a/src/Oro/Bundle/TestFrameworkBundle/Entity/Item.php b/src/Oro/Bundle/TestFrameworkBundle/Entity/Item.php index 5f5cdabe320..b86da249574 100644 --- a/src/Oro/Bundle/TestFrameworkBundle/Entity/Item.php +++ b/src/Oro/Bundle/TestFrameworkBundle/Entity/Item.php @@ -1,8 +1,8 @@ registry; diff --git a/src/Oro/Bundle/TranslationBundle/Tests/Unit/DependencyInjection/OroTranslationExtensionTest.php b/src/Oro/Bundle/TranslationBundle/Tests/Unit/DependencyInjection/OroTranslationExtensionTest.php index 53a289c9317..5b68748a18d 100644 --- a/src/Oro/Bundle/TranslationBundle/Tests/Unit/DependencyInjection/OroTranslationExtensionTest.php +++ b/src/Oro/Bundle/TranslationBundle/Tests/Unit/DependencyInjection/OroTranslationExtensionTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\TranslationBundle\Tests\Unit\DependencyInjection; -use Symfony\Component\DependencyInjection\Definition; - use Oro\Bundle\TranslationBundle\DependencyInjection\OroTranslationExtension; +use Symfony\Component\DependencyInjection\Definition; + class OroTranslationExtensionTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/TranslationBundle/Tests/Unit/Extractor/PhpCodeExtractorTest.php b/src/Oro/Bundle/TranslationBundle/Tests/Unit/Extractor/PhpCodeExtractorTest.php index 4725a0b52bb..9a4a5dce01a 100644 --- a/src/Oro/Bundle/TranslationBundle/Tests/Unit/Extractor/PhpCodeExtractorTest.php +++ b/src/Oro/Bundle/TranslationBundle/Tests/Unit/Extractor/PhpCodeExtractorTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\TranslationBundle\Tests\Unit\Extractor; -use Symfony\Component\Translation\MessageCatalogue; - use Oro\Bundle\TranslationBundle\Extractor\PhpCodeExtractor; + use Oro\Bundle\TranslationBundle\Tests\Unit\Fixtures\SomeClass; +use Symfony\Component\Translation\MessageCatalogue; class PhpCodeExtractorTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/TranslationBundle/Tests/Unit/Form/Type/TranslatableEntityTypeTest.php b/src/Oro/Bundle/TranslationBundle/Tests/Unit/Form/Type/TranslatableEntityTypeTest.php index 3c59bdb9e92..372dda46234 100644 --- a/src/Oro/Bundle/TranslationBundle/Tests/Unit/Form/Type/TranslatableEntityTypeTest.php +++ b/src/Oro/Bundle/TranslationBundle/Tests/Unit/Form/Type/TranslatableEntityTypeTest.php @@ -2,20 +2,20 @@ namespace Oro\Bundle\TranslationBundle\Tests\Unit\Form\Type; -use Symfony\Component\OptionsResolver\Options; -use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList; -use Doctrine\ORM\Mapping\ClassMetadataInfo; +use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\ORM\Configuration; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityRepository; -use Doctrine\ORM\QueryBuilder; +use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Query; -use Doctrine\Common\Persistence\ManagerRegistry; -use Doctrine\ORM\Configuration; +use Doctrine\ORM\QueryBuilder; use Gedmo\Translatable\Query\TreeWalker\TranslationWalker; - use Oro\Bundle\TranslationBundle\Form\Type\TranslatableEntityType; use Oro\Bundle\TranslationBundle\Tests\Unit\Form\Type\Stub\TestEntity; +use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList; +use Symfony\Component\OptionsResolver\Options; + class TranslatableEntityTypeTest extends \PHPUnit_Framework_TestCase { const TEST_CLASS = 'TestClass'; diff --git a/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/TranslatorTest.php b/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/TranslatorTest.php index 09340ed9a1d..1b13f892ce4 100644 --- a/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/TranslatorTest.php +++ b/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/TranslatorTest.php @@ -4,8 +4,8 @@ use Oro\Bundle\TranslationBundle\Translation\Translator; use Symfony\Component\Translation\Loader\LoaderInterface; -use Symfony\Component\Translation\MessageSelector; use Symfony\Component\Translation\MessageCatalogue; +use Symfony\Component\Translation\MessageSelector; class TranslatorTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/UIBundle/DependencyInjection/Configuration.php b/src/Oro/Bundle/UIBundle/DependencyInjection/Configuration.php index ba72d67ecb3..bc961b76e6e 100644 --- a/src/Oro/Bundle/UIBundle/DependencyInjection/Configuration.php +++ b/src/Oro/Bundle/UIBundle/DependencyInjection/Configuration.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\UIBundle\DependencyInjection; +use Oro\Bundle\ConfigBundle\DependencyInjection\SettingsBuilder; use Symfony\Component\Config\Definition\Builder\TreeBuilder; -use Symfony\Component\Config\Definition\ConfigurationInterface; -use Oro\Bundle\ConfigBundle\DependencyInjection\SettingsBuilder; +use Symfony\Component\Config\Definition\ConfigurationInterface; /** * This is the class that validates and merges configuration from your app/config files diff --git a/src/Oro/Bundle/UIBundle/DependencyInjection/OroUIExtension.php b/src/Oro/Bundle/UIBundle/DependencyInjection/OroUIExtension.php index 29eb6453866..68a1709dd52 100644 --- a/src/Oro/Bundle/UIBundle/DependencyInjection/OroUIExtension.php +++ b/src/Oro/Bundle/UIBundle/DependencyInjection/OroUIExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\UIBundle\DependencyInjection; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\Yaml\Yaml; /** diff --git a/src/Oro/Bundle/UIBundle/Event/BeforeFormRenderEvent.php b/src/Oro/Bundle/UIBundle/Event/BeforeFormRenderEvent.php index ed90a7f2307..c477da99539 100644 --- a/src/Oro/Bundle/UIBundle/Event/BeforeFormRenderEvent.php +++ b/src/Oro/Bundle/UIBundle/Event/BeforeFormRenderEvent.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\UIBundle\Event; use Symfony\Component\EventDispatcher\Event; -use Twig_Environment; use Symfony\Component\Form\FormView; +use Twig_Environment; class BeforeFormRenderEvent extends Event { diff --git a/src/Oro/Bundle/UIBundle/EventListener/TemplateListener.php b/src/Oro/Bundle/UIBundle/EventListener/TemplateListener.php index 354e49ece5d..acce0ff72de 100644 --- a/src/Oro/Bundle/UIBundle/EventListener/TemplateListener.php +++ b/src/Oro/Bundle/UIBundle/EventListener/TemplateListener.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\UIBundle\EventListener; +use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent; -use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine; use Symfony\Component\Templating\TemplateReferenceInterface; class TemplateListener diff --git a/src/Oro/Bundle/UIBundle/Route/Router.php b/src/Oro/Bundle/UIBundle/Route/Router.php index f693e0411dd..3ef712ec5ab 100644 --- a/src/Oro/Bundle/UIBundle/Route/Router.php +++ b/src/Oro/Bundle/UIBundle/Route/Router.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\UIBundle\Route; -use Symfony\Component\HttpFoundation\Request; use Symfony\Bundle\FrameworkBundle\Routing\Router as SymfonyRouter; use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; class Router diff --git a/src/Oro/Bundle/UIBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php b/src/Oro/Bundle/UIBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php index aaae64a29b2..4bff4105e55 100644 --- a/src/Oro/Bundle/UIBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php +++ b/src/Oro/Bundle/UIBundle/Tests/Unit/DependencyInjection/ConfigurationTest.php @@ -1,8 +1,8 @@ getRequest()->request->get('username'); + $username = $request->request->get('username'); $user = $this->get('oro_user.manager')->findUserByUsernameOrEmail($username); if (null === $user) { diff --git a/src/Oro/Bundle/UserBundle/Controller/RoleController.php b/src/Oro/Bundle/UserBundle/Controller/RoleController.php index 7fdba3fbd26..03389615e2c 100644 --- a/src/Oro/Bundle/UserBundle/Controller/RoleController.php +++ b/src/Oro/Bundle/UserBundle/Controller/RoleController.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\UserBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; +use Oro\Bundle\SecurityBundle\Annotation\Acl; +use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Oro\Bundle\UserBundle\Entity\Role; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Oro\Bundle\UserBundle\Entity\Role; -use Oro\Bundle\SecurityBundle\Annotation\Acl; -use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; /** * @Route("/role") diff --git a/src/Oro/Bundle/UserBundle/Controller/SecurityController.php b/src/Oro/Bundle/UserBundle/Controller/SecurityController.php index 6ef318dfa1c..54ed8a14560 100644 --- a/src/Oro/Bundle/UserBundle/Controller/SecurityController.php +++ b/src/Oro/Bundle/UserBundle/Controller/SecurityController.php @@ -2,13 +2,14 @@ namespace Oro\Bundle\UserBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\Security\Core\SecurityContext; - +use Oro\Bundle\SecurityBundle\Annotation\Acl; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Oro\Bundle\SecurityBundle\Annotation\Acl; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; + +use Symfony\Component\Security\Core\SecurityContext; class SecurityController extends Controller { @@ -16,9 +17,8 @@ class SecurityController extends Controller * @Route("/login", name="oro_user_security_login") * @Template */ - public function loginAction() + public function loginAction(Request $request) { - $request = $this->getRequest(); $session = $request->getSession(); // get the error if any (works with forward and redirect -- see below) diff --git a/src/Oro/Bundle/UserBundle/Controller/StatusController.php b/src/Oro/Bundle/UserBundle/Controller/StatusController.php index b62e7a720f1..b6ccd20fd10 100644 --- a/src/Oro/Bundle/UserBundle/Controller/StatusController.php +++ b/src/Oro/Bundle/UserBundle/Controller/StatusController.php @@ -2,12 +2,13 @@ namespace Oro\Bundle\UserBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Oro\Bundle\UserBundle\Entity\Status; +use Oro\Bundle\UserBundle\Entity\User; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Oro\Bundle\UserBundle\Entity\User; -use Oro\Bundle\UserBundle\Entity\Status; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; /** @@ -19,13 +20,13 @@ class StatusController extends Controller * @Route("/", name="oro_user_status_list", defaults={"limit"=10}) * @Template */ - public function indexAction() + public function indexAction(Request $request) { return array( 'user' => $this->getUser(), 'statuses' => $this->get('knp_paginator')->paginate( $this->getUser()->getStatuses(), - $this->getRequest()->get('page', 1), + $request->get('page', 1), $this->getRequest()->get('limit') ) @@ -36,7 +37,7 @@ public function indexAction() * @Route("/create", name="oro_user_status_create") * @Template() */ - public function createAction() + public function createAction(Request $request) { $result = false; @@ -44,7 +45,7 @@ public function createAction() $result = true; } - if ($this->getRequest()->isXmlHttpRequest()) { + if ($request->isXmlHttpRequest()) { if (!$result) { return $this->render( 'OroUserBundle:Status:statusForm.html.twig', diff --git a/src/Oro/Bundle/UserBundle/Controller/UserController.php b/src/Oro/Bundle/UserBundle/Controller/UserController.php index 9fe7979686e..c40d0acad28 100644 --- a/src/Oro/Bundle/UserBundle/Controller/UserController.php +++ b/src/Oro/Bundle/UserBundle/Controller/UserController.php @@ -4,27 +4,28 @@ use Doctrine\Common\Inflector\Inflector; use Doctrine\ORM\PersistentCollection; +use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; -use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; +use Oro\Bundle\EntityConfigBundle\Metadata\EntityMetadata; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; +use Oro\Bundle\OrganizationBundle\Entity\Manager\BusinessUnitManager; -use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; use Oro\Bundle\SecurityBundle\Annotation\Acl; +use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Oro\Bundle\UserBundle\Autocomplete\UserSearchHandler; use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\UserBundle\Entity\UserApi; -use Oro\Bundle\UserBundle\Autocomplete\UserSearchHandler; -use Oro\Bundle\OrganizationBundle\Entity\Manager\BusinessUnitManager; -use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; -use Oro\Bundle\EntityConfigBundle\Metadata\EntityMetadata; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\JsonResponse; -use Oro\Bundle\EntityExtendBundle\Extend\ExtendManager; +use Symfony\Component\HttpFoundation\Request; class UserController extends Controller { @@ -69,7 +70,7 @@ public function updateProfileAction() * @Route("/apigen/{id}", name="oro_user_apigen", requirements={"id"="\d+"}) * @AclAncestor("oro_user_user_update") */ - public function apigenAction(User $user) + public function apigenAction(Request $request, User $user) { if (!$api = $user->getApi()) { $api = new UserApi(); @@ -83,7 +84,7 @@ public function apigenAction(User $user) $em->persist($api); $em->flush(); - return $this->getRequest()->isXmlHttpRequest() + return $request->isXmlHttpRequest() ? new JsonResponse($api->getApiKey()) : $this->forward('OroUserBundle:User:view', array('user' => $user)); } diff --git a/src/Oro/Bundle/UserBundle/DataFixtures/ORM/LoadGroupData.php b/src/Oro/Bundle/UserBundle/DataFixtures/ORM/LoadGroupData.php index 4c3c68f7e09..0e84692b69e 100644 --- a/src/Oro/Bundle/UserBundle/DataFixtures/ORM/LoadGroupData.php +++ b/src/Oro/Bundle/UserBundle/DataFixtures/ORM/LoadGroupData.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\UserBundle\DataFixtures\ORM; use Doctrine\Common\DataFixtures\AbstractFixture; -use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; +use Doctrine\Common\Persistence\ObjectManager; use Oro\Bundle\UserBundle\Entity\Group; diff --git a/src/Oro/Bundle/UserBundle/DataFixtures/ORM/LoadRolesData.php b/src/Oro/Bundle/UserBundle/DataFixtures/ORM/LoadRolesData.php index ed7effe728c..5edbcfb379a 100644 --- a/src/Oro/Bundle/UserBundle/DataFixtures/ORM/LoadRolesData.php +++ b/src/Oro/Bundle/UserBundle/DataFixtures/ORM/LoadRolesData.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\UserBundle\DataFixtures\ORM; use Doctrine\Common\DataFixtures\AbstractFixture; -use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; +use Doctrine\Common\Persistence\ObjectManager; use Oro\Bundle\UserBundle\Entity\Role; diff --git a/src/Oro/Bundle/UserBundle/DependencyInjection/OroUserExtension.php b/src/Oro/Bundle/UserBundle/DependencyInjection/OroUserExtension.php index 2f3b0e6551f..80ed6393fd5 100644 --- a/src/Oro/Bundle/UserBundle/DependencyInjection/OroUserExtension.php +++ b/src/Oro/Bundle/UserBundle/DependencyInjection/OroUserExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\UserBundle\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 diff --git a/src/Oro/Bundle/UserBundle/Entity/Email.php b/src/Oro/Bundle/UserBundle/Entity/Email.php index a604ca4142a..30cc5029857 100644 --- a/src/Oro/Bundle/UserBundle/Entity/Email.php +++ b/src/Oro/Bundle/UserBundle/Entity/Email.php @@ -4,8 +4,8 @@ use Doctrine\ORM\Mapping as ORM; -use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\EmailBundle\Entity\EmailInterface; +use Oro\Bundle\UserBundle\Entity\User; /** * @ORM\Entity() diff --git a/src/Oro/Bundle/UserBundle/Entity/Group.php b/src/Oro/Bundle/UserBundle/Entity/Group.php index 9d63e7418f1..70f961e049d 100644 --- a/src/Oro/Bundle/UserBundle/Entity/Group.php +++ b/src/Oro/Bundle/UserBundle/Entity/Group.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\UserBundle\Entity; -use Doctrine\ORM\Mapping as ORM; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use JMS\Serializer\Annotation\Type; +use Doctrine\ORM\Mapping as ORM; use JMS\Serializer\Annotation\Exclude; -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use JMS\Serializer\Annotation\Type; use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; diff --git a/src/Oro/Bundle/UserBundle/Entity/Manager/GroupManager.php b/src/Oro/Bundle/UserBundle/Entity/Manager/GroupManager.php index 77f4b18b421..392246114b6 100644 --- a/src/Oro/Bundle/UserBundle/Entity/Manager/GroupManager.php +++ b/src/Oro/Bundle/UserBundle/Entity/Manager/GroupManager.php @@ -5,8 +5,8 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\QueryBuilder; -use Oro\Bundle\UserBundle\Entity\Repository\GroupRepository; use Oro\Bundle\UserBundle\Entity\Group; +use Oro\Bundle\UserBundle\Entity\Repository\GroupRepository; class GroupManager { diff --git a/src/Oro/Bundle/UserBundle/Entity/Manager/StatusManager.php b/src/Oro/Bundle/UserBundle/Entity/Manager/StatusManager.php index 0a319cd288a..656f93142fe 100644 --- a/src/Oro/Bundle/UserBundle/Entity/Manager/StatusManager.php +++ b/src/Oro/Bundle/UserBundle/Entity/Manager/StatusManager.php @@ -5,8 +5,8 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityRepository; -use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\UserBundle\Entity\Status; +use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\UserBundle\Entity\UserManager; class StatusManager diff --git a/src/Oro/Bundle/UserBundle/Entity/Provider/EmailOwnerProvider.php b/src/Oro/Bundle/UserBundle/Entity/Provider/EmailOwnerProvider.php index 50eb14e72dc..28c60cb1fa6 100644 --- a/src/Oro/Bundle/UserBundle/Entity/Provider/EmailOwnerProvider.php +++ b/src/Oro/Bundle/UserBundle/Entity/Provider/EmailOwnerProvider.php @@ -3,9 +3,9 @@ namespace Oro\Bundle\UserBundle\Entity\Provider; use Doctrine\ORM\EntityManager; -use Oro\Bundle\UserBundle\Entity\User; -use Oro\Bundle\UserBundle\Entity\Email; use Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProviderInterface; +use Oro\Bundle\UserBundle\Entity\Email; +use Oro\Bundle\UserBundle\Entity\User; class EmailOwnerProvider implements EmailOwnerProviderInterface { diff --git a/src/Oro/Bundle/UserBundle/Entity/Role.php b/src/Oro/Bundle/UserBundle/Entity/Role.php index 512043a8edf..20c3c442ca5 100644 --- a/src/Oro/Bundle/UserBundle/Entity/Role.php +++ b/src/Oro/Bundle/UserBundle/Entity/Role.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\UserBundle\Entity; -use Symfony\Component\Security\Core\Role\Role as BaseRole; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; -use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\Collection; +use Doctrine\ORM\Mapping as ORM; use JMS\Serializer\Annotation\Type; -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; -use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; +use Symfony\Component\Security\Core\Role\Role as BaseRole; /** * Role Entity diff --git a/src/Oro/Bundle/UserBundle/Entity/User.php b/src/Oro/Bundle/UserBundle/Entity/User.php index 8b1c278c84b..52a0c37e272 100644 --- a/src/Oro/Bundle/UserBundle/Entity/User.php +++ b/src/Oro/Bundle/UserBundle/Entity/User.php @@ -2,42 +2,42 @@ namespace Oro\Bundle\UserBundle\Entity; -use Symfony\Component\Security\Core\User\AdvancedUserInterface; -use Symfony\Component\HttpFoundation\File\UploadedFile; - -use Doctrine\ORM\Mapping as ORM; +use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use DateTime; use Doctrine\Common\Collections\ArrayCollection; + use Doctrine\Common\Collections\Collection; +use Doctrine\ORM\Mapping as ORM; -use JMS\Serializer\Annotation\Type; use JMS\Serializer\Annotation\Exclude; - -use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; +use JMS\Serializer\Annotation\Type; use Oro\Bundle\DataAuditBundle\Metadata\Annotation as Oro; use Oro\Bundle\EmailBundle\Entity\EmailOwnerInterface; -use Oro\Bundle\EmailBundle\Model\EmailHolderInterface; +use Oro\Bundle\EmailBundle\Model\EmailHolderInterface; use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; -use Oro\Bundle\ImapBundle\Entity\ImapEmailOrigin; use Oro\Bundle\ImapBundle\Entity\ImapConfigurationOwnerInterface; +use Oro\Bundle\ImapBundle\Entity\ImapEmailOrigin; use Oro\Bundle\LocaleBundle\Model\FullNameInterface; use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; -use Oro\Bundle\TagBundle\Entity\Taggable; use Oro\Bundle\TagBundle\Entity\Tag; -use Oro\Bundle\UserBundle\Model\ExtendUser; -use Oro\Bundle\UserBundle\Entity\Status; +use Oro\Bundle\TagBundle\Entity\Taggable; use Oro\Bundle\UserBundle\Entity\Email; + use Oro\Bundle\UserBundle\Entity\EntityUploadedImageInterface; +use Oro\Bundle\UserBundle\Entity\Status; +use Oro\Bundle\UserBundle\Model\ExtendUser; +use Symfony\Component\HttpFoundation\File\UploadedFile; -use DateTime; +use Symfony\Component\Security\Core\User\AdvancedUserInterface; /** * @SuppressWarnings(PHPMD.TooManyMethods) diff --git a/src/Oro/Bundle/UserBundle/Entity/UserManager.php b/src/Oro/Bundle/UserBundle/Entity/UserManager.php index c3f5758258f..38ee0aaa3f3 100644 --- a/src/Oro/Bundle/UserBundle/Entity/UserManager.php +++ b/src/Oro/Bundle/UserBundle/Entity/UserManager.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\UserBundle\Entity; +use Doctrine\Common\Persistence\ObjectManager; +use Doctrine\Common\Persistence\ObjectRepository; +use Doctrine\ORM\QueryBuilder; use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; use Symfony\Component\Security\Core\Exception\UnsupportedUserException; + use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; use Symfony\Component\Security\Core\User\UserInterface as SecurityUserInterface; use Symfony\Component\Security\Core\User\UserProviderInterface; -use Doctrine\ORM\QueryBuilder; -use Doctrine\Common\Persistence\ObjectRepository; -use Doctrine\Common\Persistence\ObjectManager; - class UserManager implements UserProviderInterface { /** diff --git a/src/Oro/Bundle/UserBundle/Entity/UserSoap.php b/src/Oro/Bundle/UserBundle/Entity/UserSoap.php index b045579c60d..51638e1887e 100644 --- a/src/Oro/Bundle/UserBundle/Entity/UserSoap.php +++ b/src/Oro/Bundle/UserBundle/Entity/UserSoap.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\UserBundle\Entity; use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; -use JMS\Serializer\Annotation\Exclude; use Doctrine\ORM\Mapping as ORM; +use JMS\Serializer\Annotation\Exclude; /** * @ORM\MappedSuperclass() diff --git a/src/Oro/Bundle/UserBundle/EventListener/LoginSubscriber.php b/src/Oro/Bundle/UserBundle/EventListener/LoginSubscriber.php index da0b8140262..e0163745ffb 100644 --- a/src/Oro/Bundle/UserBundle/EventListener/LoginSubscriber.php +++ b/src/Oro/Bundle/UserBundle/EventListener/LoginSubscriber.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\UserBundle\EventListener; -use Symfony\Component\Security\Http\Event\InteractiveLoginEvent; - use Oro\Bundle\UserBundle\Entity\User; + use Oro\Bundle\UserBundle\Entity\UserManager; +use Symfony\Component\Security\Http\Event\InteractiveLoginEvent; class LoginSubscriber { diff --git a/src/Oro/Bundle/UserBundle/EventListener/RoleListener.php b/src/Oro/Bundle/UserBundle/EventListener/RoleListener.php index 2a8f07a2cbe..8758c09880a 100644 --- a/src/Oro/Bundle/UserBundle/EventListener/RoleListener.php +++ b/src/Oro/Bundle/UserBundle/EventListener/RoleListener.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\UserBundle\EventListener; use Doctrine\ORM\Event\PreUpdateEventArgs; -use Oro\Bundle\SecurityBundle\Acl\Persistence\AclSidManager; use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; +use Oro\Bundle\SecurityBundle\Acl\Persistence\AclSidManager; use Oro\Bundle\UserBundle\Entity\Role; class RoleListener diff --git a/src/Oro/Bundle/UserBundle/EventListener/UserEmailGridListener.php b/src/Oro/Bundle/UserBundle/EventListener/UserEmailGridListener.php index 02dfc225ef6..08afa4777db 100644 --- a/src/Oro/Bundle/UserBundle/EventListener/UserEmailGridListener.php +++ b/src/Oro/Bundle/UserBundle/EventListener/UserEmailGridListener.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\UserBundle\EventListener; -use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\EntityManager; +use Doctrine\ORM\QueryBuilder; -use Oro\Bundle\ImapBundle\Sync\ImapEmailSynchronizer; -use Oro\Bundle\EmailBundle\Datagrid\EmailQueryFactory; use Oro\Bundle\DataGridBundle\Datagrid\RequestParameters; use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; use Oro\Bundle\DataGridBundle\Event\BuildAfter; +use Oro\Bundle\EmailBundle\Datagrid\EmailQueryFactory; +use Oro\Bundle\ImapBundle\Sync\ImapEmailSynchronizer; class UserEmailGridListener { diff --git a/src/Oro/Bundle/UserBundle/Form/EventListener/ChangePasswordSubscriber.php b/src/Oro/Bundle/UserBundle/Form/EventListener/ChangePasswordSubscriber.php index 82ad05b8cd6..07ef554ad68 100644 --- a/src/Oro/Bundle/UserBundle/Form/EventListener/ChangePasswordSubscriber.php +++ b/src/Oro/Bundle/UserBundle/Form/EventListener/ChangePasswordSubscriber.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\UserBundle\Form\EventListener; +use Oro\Bundle\UserBundle\Acl\Manager as AclManager; +use Oro\Bundle\UserBundle\Entity\User; use Symfony\Component\Form\FormEvent; + use Symfony\Component\Form\FormEvents; use Symfony\Component\Security\Core\SecurityContextInterface; -use Oro\Bundle\UserBundle\Acl\Manager as AclManager; -use Oro\Bundle\UserBundle\Entity\User; - class ChangePasswordSubscriber extends UserSubscriber { /** diff --git a/src/Oro/Bundle/UserBundle/Form/EventListener/PatchSubscriber.php b/src/Oro/Bundle/UserBundle/Form/EventListener/PatchSubscriber.php index ff70197e97a..08ebae147ea 100644 --- a/src/Oro/Bundle/UserBundle/Form/EventListener/PatchSubscriber.php +++ b/src/Oro/Bundle/UserBundle/Form/EventListener/PatchSubscriber.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\UserBundle\Form\EventListener; +use Doctrine\Common\Collections\Collection; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvent; -use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormEvents; -use Doctrine\Common\Collections\Collection; +use Symfony\Component\Form\FormInterface; /** * Changes Form->submit() behavior so that it treats not set values as if they @@ -20,7 +20,7 @@ class PatchSubscriber implements EventSubscriberInterface { public static function getSubscribedEvents() { - return array(FormEvents::PRE_BIND => 'preBind'); + return array(FormEvents::PRE_SUBMIT => 'preBind'); } public function preBind(FormEvent $event) diff --git a/src/Oro/Bundle/UserBundle/Form/EventListener/UserApiSubscriber.php b/src/Oro/Bundle/UserBundle/Form/EventListener/UserApiSubscriber.php index 6381c85f6ce..6775527371c 100644 --- a/src/Oro/Bundle/UserBundle/Form/EventListener/UserApiSubscriber.php +++ b/src/Oro/Bundle/UserBundle/Form/EventListener/UserApiSubscriber.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\UserBundle\Form\EventListener; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormFactoryInterface; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; class UserApiSubscriber implements EventSubscriberInterface { diff --git a/src/Oro/Bundle/UserBundle/Form/EventListener/UserSubscriber.php b/src/Oro/Bundle/UserBundle/Form/EventListener/UserSubscriber.php index 71c710762dc..ce0409be2a8 100644 --- a/src/Oro/Bundle/UserBundle/Form/EventListener/UserSubscriber.php +++ b/src/Oro/Bundle/UserBundle/Form/EventListener/UserSubscriber.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\UserBundle\Form\EventListener; +use Oro\Bundle\UserBundle\Entity\User; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormFactoryInterface; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Symfony\Component\Security\Core\SecurityContextInterface; -use Oro\Bundle\UserBundle\Entity\User; +use Symfony\Component\Security\Core\SecurityContextInterface; class UserSubscriber implements EventSubscriberInterface { diff --git a/src/Oro/Bundle/UserBundle/Form/Handler/AbstractUserHandler.php b/src/Oro/Bundle/UserBundle/Form/Handler/AbstractUserHandler.php index 8a69ef815fe..be3c67505d2 100644 --- a/src/Oro/Bundle/UserBundle/Form/Handler/AbstractUserHandler.php +++ b/src/Oro/Bundle/UserBundle/Form/Handler/AbstractUserHandler.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\UserBundle\Form\Handler; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Request; - use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\UserBundle\Entity\UserManager; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\Request; + abstract class AbstractUserHandler { /** diff --git a/src/Oro/Bundle/UserBundle/Form/Handler/AclRoleHandler.php b/src/Oro/Bundle/UserBundle/Form/Handler/AclRoleHandler.php index 3966f34cd14..3c1095a247a 100644 --- a/src/Oro/Bundle/UserBundle/Form/Handler/AclRoleHandler.php +++ b/src/Oro/Bundle/UserBundle/Form/Handler/AclRoleHandler.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\UserBundle\Form\Handler; use Doctrine\Common\Collections\ArrayCollection; -use Symfony\Component\Form\FormFactory; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Form\FormInterface; use Doctrine\Common\Persistence\ObjectManager; +use Oro\Bundle\SecurityBundle\Acl\Persistence\AclManager; +use Oro\Bundle\SecurityBundle\Acl\Persistence\AclPrivilegeRepository; +use Oro\Bundle\UserBundle\Entity\Role; use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\UserBundle\Form\Type\AclRoleType; -use Oro\Bundle\UserBundle\Entity\Role; +use Symfony\Component\Form\FormFactory; -use Oro\Bundle\SecurityBundle\Acl\Persistence\AclManager; -use Oro\Bundle\SecurityBundle\Acl\Persistence\AclPrivilegeRepository; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\Request; class AclRoleHandler { diff --git a/src/Oro/Bundle/UserBundle/Form/Handler/GroupHandler.php b/src/Oro/Bundle/UserBundle/Form/Handler/GroupHandler.php index bc981bed138..cbd664dedfc 100644 --- a/src/Oro/Bundle/UserBundle/Form/Handler/GroupHandler.php +++ b/src/Oro/Bundle/UserBundle/Form/Handler/GroupHandler.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\UserBundle\Form\Handler; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Request; - use Doctrine\Common\Persistence\ObjectManager; +use Oro\Bundle\UserBundle\Entity\Group; use Oro\Bundle\UserBundle\Entity\User; -use Oro\Bundle\UserBundle\Entity\Group; + +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\Request; class GroupHandler { diff --git a/src/Oro/Bundle/UserBundle/Form/Handler/RoleHandler.php b/src/Oro/Bundle/UserBundle/Form/Handler/RoleHandler.php index ed3f1b5dee6..ca3948c0059 100644 --- a/src/Oro/Bundle/UserBundle/Form/Handler/RoleHandler.php +++ b/src/Oro/Bundle/UserBundle/Form/Handler/RoleHandler.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\UserBundle\Form\Handler; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Request; - use Doctrine\Common\Persistence\ObjectManager; +use Oro\Bundle\UserBundle\Entity\Role; use Oro\Bundle\UserBundle\Entity\User; -use Oro\Bundle\UserBundle\Entity\Role; + +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\Request; /** * TODO: Remove this class after api for acl is ready diff --git a/src/Oro/Bundle/UserBundle/Form/Handler/StatusHandler.php b/src/Oro/Bundle/UserBundle/Form/Handler/StatusHandler.php index fc24f04f9b3..4e0c7ac0eae 100644 --- a/src/Oro/Bundle/UserBundle/Form/Handler/StatusHandler.php +++ b/src/Oro/Bundle/UserBundle/Form/Handler/StatusHandler.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\UserBundle\Form\Handler; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Request; use Doctrine\Common\Persistence\ObjectManager; - -use Oro\Bundle\UserBundle\Entity\User; use Oro\Bundle\UserBundle\Entity\Status; +use Oro\Bundle\UserBundle\Entity\User; + use Oro\Bundle\UserBundle\Entity\UserManager; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\Request; class StatusHandler { diff --git a/src/Oro/Bundle/UserBundle/Form/Handler/UserHandler.php b/src/Oro/Bundle/UserBundle/Form/Handler/UserHandler.php index c2a081f2aa7..c5d278b459d 100644 --- a/src/Oro/Bundle/UserBundle/Form/Handler/UserHandler.php +++ b/src/Oro/Bundle/UserBundle/Form/Handler/UserHandler.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\UserBundle\Form\Handler; +use Oro\Bundle\OrganizationBundle\Entity\Manager\BusinessUnitManager; use Oro\Bundle\TagBundle\Entity\TagManager; use Oro\Bundle\TagBundle\Form\Handler\TagHandlerInterface; -use Oro\Bundle\UserBundle\Entity\User; -use Oro\Bundle\OrganizationBundle\Entity\Manager\BusinessUnitManager; +use Oro\Bundle\UserBundle\Entity\User; class UserHandler extends AbstractUserHandler implements TagHandlerInterface { diff --git a/src/Oro/Bundle/UserBundle/Form/Type/AclRoleType.php b/src/Oro/Bundle/UserBundle/Form/Type/AclRoleType.php index 51a91d3894a..4707d8a8a52 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/AclRoleType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/AclRoleType.php @@ -2,13 +2,14 @@ namespace Oro\Bundle\UserBundle\Form\Type; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; - +use Oro\Bundle\SecurityBundle\Form\Type\AclPrivilegeType; +use Oro\Bundle\SecurityBundle\Form\Type\PrivilegeCollectionType; use Symfony\Component\Form\AbstractType; -use Oro\Bundle\SecurityBundle\Form\Type\PrivilegeCollectionType; -use Oro\Bundle\SecurityBundle\Form\Type\AclPrivilegeType; +use Symfony\Component\Form\Extension\Core\Type\TextType; + +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class AclRoleType extends AbstractType { @@ -32,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( 'label', - 'text', + TextType::class, array( 'required' => true, 'label' => 'Role' @@ -82,7 +83,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -95,7 +96,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_user_role_form'; } diff --git a/src/Oro/Bundle/UserBundle/Form/Type/ChangePasswordType.php b/src/Oro/Bundle/UserBundle/Form/Type/ChangePasswordType.php index 069de2c8662..01e2fe00416 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/ChangePasswordType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/ChangePasswordType.php @@ -3,10 +3,12 @@ namespace Oro\Bundle\UserBundle\Form\Type; use Oro\Bundle\UserBundle\Form\EventListener\ChangePasswordSubscriber; - use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\PasswordType; + +use Symfony\Component\Form\Extension\Core\Type\RepeatedType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Security\Core\Validator\Constraints\UserPassword; class ChangePasswordType extends AbstractType @@ -33,7 +35,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->add( 'currentPassword', - 'password', + PasswordType::class, array( 'required' => false, 'label' => 'Current password', @@ -45,7 +47,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ) ->add( 'plainPassword', - 'repeated', + RepeatedType::class, array( 'required' => true, 'type' => 'password', @@ -66,7 +68,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_change_password'; } @@ -74,7 +76,7 @@ public function getName() /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( diff --git a/src/Oro/Bundle/UserBundle/Form/Type/EmailType.php b/src/Oro/Bundle/UserBundle/Form/Type/EmailType.php index 041865a1d94..84a6efd3ead 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/EmailType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/EmailType.php @@ -3,8 +3,9 @@ namespace Oro\Bundle\UserBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\EmailType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class EmailType extends AbstractType { @@ -15,7 +16,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( 'email', - 'email', + EmailType::class, array( 'required' => false, ) @@ -25,7 +26,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_user_email'; } @@ -33,7 +34,7 @@ public function getName() /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( diff --git a/src/Oro/Bundle/UserBundle/Form/Type/GenderType.php b/src/Oro/Bundle/UserBundle/Form/Type/GenderType.php index f6ec1a28b6d..19e474c7e33 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/GenderType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/GenderType.php @@ -2,10 +2,11 @@ namespace Oro\Bundle\UserBundle\Form\Type; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Oro\Bundle\UserBundle\Provider\GenderProvider; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; -use Oro\Bundle\UserBundle\Provider\GenderProvider; +use Symfony\Component\OptionsResolver\OptionsResolver; class GenderType extends AbstractType { @@ -27,7 +28,7 @@ public function __construct(GenderProvider $genderProvider) /** * @return string */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -37,13 +38,13 @@ public function getName() */ public function getParent() { - return 'choice'; + return ChoiceType::class; } /** * @param OptionsResolverInterface $resolver */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( diff --git a/src/Oro/Bundle/UserBundle/Form/Type/GroupApiType.php b/src/Oro/Bundle/UserBundle/Form/Type/GroupApiType.php index 1efa5c947d4..e8ffd340256 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/GroupApiType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/GroupApiType.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\UserBundle\Form\Type; +use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; class GroupApiType extends GroupType { diff --git a/src/Oro/Bundle/UserBundle/Form/Type/GroupType.php b/src/Oro/Bundle/UserBundle/Form/Type/GroupType.php index 07e43bf8158..0174043f0d8 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/GroupType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/GroupType.php @@ -2,11 +2,12 @@ namespace Oro\Bundle\UserBundle\Form\Type; +use Oro\Bundle\UserBundle\Entity\User; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\UserBundle\Entity\User; +use Symfony\Component\OptionsResolver\OptionsResolver; class GroupType extends AbstractType { @@ -21,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add( 'name', - 'text', + TextType::class, array( 'required' => true, ) @@ -67,7 +68,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -80,7 +81,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_user_group'; } diff --git a/src/Oro/Bundle/UserBundle/Form/Type/ResetType.php b/src/Oro/Bundle/UserBundle/Form/Type/ResetType.php index 234a324312e..0fa525ee2bd 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/ResetType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/ResetType.php @@ -3,8 +3,9 @@ namespace Oro\Bundle\UserBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\RepeatedType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class ResetType extends AbstractType { @@ -26,7 +27,7 @@ public function __construct($class) */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('plainPassword', 'repeated', array( + $builder->add('plainPassword', RepeatedType::class, array( 'type' => 'password', 'required' => true, 'first_options' => array('label' => 'Password'), @@ -37,7 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( 'data_class' => $this->class, @@ -48,7 +49,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_user_reset'; } diff --git a/src/Oro/Bundle/UserBundle/Form/Type/RoleApiType.php b/src/Oro/Bundle/UserBundle/Form/Type/RoleApiType.php index 2188922689f..4315ae1ddf0 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/RoleApiType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/RoleApiType.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\UserBundle\Form\Type; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; use Symfony\Component\Form\FormBuilderInterface; -use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; class RoleApiType extends AclRoleType { diff --git a/src/Oro/Bundle/UserBundle/Form/Type/StatusType.php b/src/Oro/Bundle/UserBundle/Form/Type/StatusType.php index 683b382e2d3..291a1130b13 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/StatusType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/StatusType.php @@ -3,8 +3,9 @@ namespace Oro\Bundle\UserBundle\Form\Type; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class StatusType extends AbstractType { @@ -15,7 +16,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( 'status', - 'text', + TextType::class, array( 'required' => true, ) @@ -26,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_user_status'; } @@ -34,7 +35,7 @@ public function getName() /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( diff --git a/src/Oro/Bundle/UserBundle/Form/Type/UserApiType.php b/src/Oro/Bundle/UserBundle/Form/Type/UserApiType.php index 8751f4af703..9fb89d50143 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/UserApiType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/UserApiType.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\UserBundle\Form\Type; +use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; +use Oro\Bundle\UserBundle\Form\EventListener\UserApiSubscriber; + use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\UserBundle\Form\EventListener\UserApiSubscriber; -use Oro\Bundle\UserBundle\Form\EventListener\PatchSubscriber; - class UserApiType extends UserType { /** diff --git a/src/Oro/Bundle/UserBundle/Form/Type/UserMultiSelectType.php b/src/Oro/Bundle/UserBundle/Form/Type/UserMultiSelectType.php index 1611fb626c1..52a6bf80f6a 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/UserMultiSelectType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/UserMultiSelectType.php @@ -3,12 +3,12 @@ use Doctrine\ORM\EntityManager; +use Oro\Bundle\FormBundle\Form\DataTransformer\EntitiesToIdsTransformer; +use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Oro\Bundle\FormBundle\Form\DataTransformer\EntitiesToIdsTransformer; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; class UserMultiSelectType extends UserSelectType { diff --git a/src/Oro/Bundle/UserBundle/Form/Type/UserSelectType.php b/src/Oro/Bundle/UserBundle/Form/Type/UserSelectType.php index 55e65255fce..e8309e094c2 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/UserSelectType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/UserSelectType.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\UserBundle\Form\Type; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class UserSelectType extends AbstractType { - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -29,7 +29,7 @@ public function getParent() /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_user_select'; } diff --git a/src/Oro/Bundle/UserBundle/Form/Type/UserType.php b/src/Oro/Bundle/UserBundle/Form/Type/UserType.php index 75f171aca36..0c136aafc7f 100644 --- a/src/Oro/Bundle/UserBundle/Form/Type/UserType.php +++ b/src/Oro/Bundle/UserBundle/Form/Type/UserType.php @@ -2,19 +2,24 @@ namespace Oro\Bundle\UserBundle\Form\Type; +use Doctrine\ORM\EntityRepository; +use Oro\Bundle\UserBundle\Entity\User; +use Oro\Bundle\UserBundle\Form\EventListener\UserSubscriber; +use Oro\Bundle\UserBundle\Form\Type\EmailType; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CollectionType; +use Symfony\Component\Form\Extension\Core\Type\EmailType; +use Symfony\Component\Form\Extension\Core\Type\FileType; +use Symfony\Component\Form\Extension\Core\Type\RepeatedType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormInterface; -use Symfony\Component\Form\FormView; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\Security\Core\SecurityContextInterface; -use Symfony\Component\HttpFoundation\Request; -use Doctrine\ORM\EntityRepository; +use Symfony\Component\Form\FormView; -use Oro\Bundle\UserBundle\Form\EventListener\UserSubscriber; -use Oro\Bundle\UserBundle\Entity\User; -use Oro\Bundle\UserBundle\Form\Type\EmailType; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\Security\Core\SecurityContextInterface; class UserType extends AbstractType { @@ -96,7 +101,7 @@ public function addEntityFields(FormBuilderInterface $builder) ) ->add( 'plainPassword', - 'repeated', + RepeatedType::class, array( 'type' => 'password', 'required' => true, @@ -106,7 +111,7 @@ public function addEntityFields(FormBuilderInterface $builder) ) ->add( 'emails', - 'collection', + CollectionType::class, array( 'type' => 'oro_user_email', 'allow_add' => true, @@ -131,7 +136,7 @@ public function addEntityFields(FormBuilderInterface $builder) /** * {@inheritdoc} */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults( array( @@ -162,7 +167,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'oro_user_user'; } @@ -177,14 +182,14 @@ protected function setDefaultUserFields(FormBuilderInterface $builder) $builder ->add( 'username', - 'text', + TextType::class, array( 'required' => true, ) ) ->add( 'email', - 'email', + EmailType::class, array( 'label' => 'E-mail', 'required' => true, @@ -192,7 +197,7 @@ protected function setDefaultUserFields(FormBuilderInterface $builder) ) ->add( 'namePrefix', - 'text', + TextType::class, array( 'label' => 'Name prefix', 'required' => false, @@ -200,7 +205,7 @@ protected function setDefaultUserFields(FormBuilderInterface $builder) ) ->add( 'firstName', - 'text', + TextType::class, array( 'label' => 'First name', 'required' => true, @@ -208,7 +213,7 @@ protected function setDefaultUserFields(FormBuilderInterface $builder) ) ->add( 'middleName', - 'text', + TextType::class, array( 'label' => 'Middle name', 'required' => false, @@ -216,7 +221,7 @@ protected function setDefaultUserFields(FormBuilderInterface $builder) ) ->add( 'lastName', - 'text', + TextType::class, array( 'label' => 'Last name', 'required' => true, @@ -224,7 +229,7 @@ protected function setDefaultUserFields(FormBuilderInterface $builder) ) ->add( 'nameSuffix', - 'text', + TextType::class, array( 'label' => 'Name suffix', 'required' => false, @@ -240,7 +245,7 @@ protected function setDefaultUserFields(FormBuilderInterface $builder) ) ->add( 'imageFile', - 'file', + FileType::class, array( 'label' => 'Avatar', 'required' => false, diff --git a/src/Oro/Bundle/UserBundle/Menu/UserMenuBuilder.php b/src/Oro/Bundle/UserBundle/Menu/UserMenuBuilder.php index 7f923da0379..d1c97eed5e4 100644 --- a/src/Oro/Bundle/UserBundle/Menu/UserMenuBuilder.php +++ b/src/Oro/Bundle/UserBundle/Menu/UserMenuBuilder.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\UserBundle\Menu; -use Symfony\Component\Security\Core\SecurityContextInterface; use Knp\Menu\ItemInterface; use Oro\Bundle\NavigationBundle\Menu\BuilderInterface; +use Symfony\Component\Security\Core\SecurityContextInterface; class UserMenuBuilder implements BuilderInterface { diff --git a/src/Oro/Bundle/UserBundle/Provider/GenderProvider.php b/src/Oro/Bundle/UserBundle/Provider/GenderProvider.php index fc89d52bb18..8823bf7a553 100644 --- a/src/Oro/Bundle/UserBundle/Provider/GenderProvider.php +++ b/src/Oro/Bundle/UserBundle/Provider/GenderProvider.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\UserBundle\Provider; -use Symfony\Component\Translation\TranslatorInterface; use Oro\Bundle\UserBundle\Model\Gender; +use Symfony\Component\Translation\TranslatorInterface; class GenderProvider { diff --git a/src/Oro/Bundle/UserBundle/Security/UserProvider.php b/src/Oro/Bundle/UserBundle/Security/UserProvider.php index 02c41722d6d..a8ee39be7f9 100644 --- a/src/Oro/Bundle/UserBundle/Security/UserProvider.php +++ b/src/Oro/Bundle/UserBundle/Security/UserProvider.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\UserBundle\Security; -use Symfony\Component\Security\Core\User\UserProviderInterface; +use Oro\Bundle\UserBundle\Entity\User; +use Oro\Bundle\UserBundle\Entity\UserManager; use Symfony\Component\Security\Core\Exception\UnsupportedUserException; use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; -use Symfony\Component\Security\Core\User\UserInterface as SecurityUserInterface; -use Oro\Bundle\UserBundle\Entity\User; -use Oro\Bundle\UserBundle\Entity\UserManager; +use Symfony\Component\Security\Core\User\UserInterface as SecurityUserInterface; +use Symfony\Component\Security\Core\User\UserProviderInterface; class UserProvider implements UserProviderInterface { diff --git a/src/Oro/Bundle/UserBundle/Security/WsseAuthListener.php b/src/Oro/Bundle/UserBundle/Security/WsseAuthListener.php index 43abf43c644..94b85e7ad16 100644 --- a/src/Oro/Bundle/UserBundle/Security/WsseAuthListener.php +++ b/src/Oro/Bundle/UserBundle/Security/WsseAuthListener.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\UserBundle\Security; +use Escape\WSSEAuthenticationBundle\Security\Http\Firewall\Listener; use Symfony\Component\HttpKernel\Event\GetResponseEvent; -use Symfony\Component\Security\Core\Exception\AuthenticationException; -use Escape\WSSEAuthenticationBundle\Security\Http\Firewall\Listener; +use Symfony\Component\Security\Core\Exception\AuthenticationException; class WsseAuthListener extends Listener { diff --git a/src/Oro/Bundle/UserBundle/Security/WsseUserProvider.php b/src/Oro/Bundle/UserBundle/Security/WsseUserProvider.php index 92ef8bbed42..64a8f5a06b0 100644 --- a/src/Oro/Bundle/UserBundle/Security/WsseUserProvider.php +++ b/src/Oro/Bundle/UserBundle/Security/WsseUserProvider.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\UserBundle\Security; -use Symfony\Component\Security\Core\User\UserProviderInterface; -use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface; -use Symfony\Component\Security\Core\Exception\AuthenticationException; -use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; - use Escape\WSSEAuthenticationBundle\Security\Core\Authentication\Provider\Provider; use Escape\WSSEAuthenticationBundle\Security\Core\Authentication\Token\Token; +use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; +use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface; + +use Symfony\Component\Security\Core\Exception\AuthenticationException; +use Symfony\Component\Security\Core\User\UserProviderInterface; class WsseUserProvider extends Provider { diff --git a/src/Oro/Bundle/UserBundle/Tests/Behat/features/bootstrap/FeatureContext.php b/src/Oro/Bundle/UserBundle/Tests/Behat/features/bootstrap/FeatureContext.php index 765f55ee6ec..103c7ccbc9d 100644 --- a/src/Oro/Bundle/UserBundle/Tests/Behat/features/bootstrap/FeatureContext.php +++ b/src/Oro/Bundle/UserBundle/Tests/Behat/features/bootstrap/FeatureContext.php @@ -1,10 +1,10 @@ get('oro_workflow.http.workflow_item_validator')->validate($workflowItem); - $showStepName = $this->getRequest()->get('stepName', $workflowItem->getCurrentStepName()); + $showStepName = $request->get('stepName', $workflowItem->getCurrentStepName()); /** @var WorkflowManager $workflowManager */ $workflowManager = $this->get('oro_workflow.manager'); @@ -97,14 +98,14 @@ public function stepFormAction(WorkflowItem $workflowItem) * @param string $workflowName * @return array */ - public function startTransitionFormAction($transitionName, $workflowName) + public function startTransitionFormAction(Request $request, $transitionName, $workflowName) { /** @var WorkflowManager $workflowManager */ $workflowManager = $this->get('oro_workflow.manager'); $workflow = $workflowManager->getWorkflow($workflowName); $initData = array(); - $entityClass = $this->getRequest()->get('entityClass'); + $entityClass = $request->get('entityClass'); $entityId = $this->getRequest()->get('entityId'); if ($entityClass && $entityId) { $entity = $this->getEntityReference($entityClass, $entityId); diff --git a/src/Oro/Bundle/WorkflowBundle/Controller/WorkflowStepController.php b/src/Oro/Bundle/WorkflowBundle/Controller/WorkflowStepController.php index ed5c8b19db0..baeb8a476f9 100644 --- a/src/Oro/Bundle/WorkflowBundle/Controller/WorkflowStepController.php +++ b/src/Oro/Bundle/WorkflowBundle/Controller/WorkflowStepController.php @@ -2,16 +2,16 @@ namespace Oro\Bundle\WorkflowBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; - +use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; + use Oro\Bundle\WorkflowBundle\Model\Workflow; use Oro\Bundle\WorkflowBundle\Model\WorkflowManager; - use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; + use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; class WorkflowStepController extends Controller { diff --git a/src/Oro/Bundle/WorkflowBundle/DataFixtures/ORM/LoadWorkflowDefinitionData.php b/src/Oro/Bundle/WorkflowBundle/DataFixtures/ORM/LoadWorkflowDefinitionData.php index ec1c59d0752..16168b47b3c 100644 --- a/src/Oro/Bundle/WorkflowBundle/DataFixtures/ORM/LoadWorkflowDefinitionData.php +++ b/src/Oro/Bundle/WorkflowBundle/DataFixtures/ORM/LoadWorkflowDefinitionData.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\WorkflowBundle\DataFixtures\ORM; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\Persistence\ObjectManager; - use Oro\Bundle\WorkflowBundle\Configuration\ConfigurationProvider; use Oro\Bundle\WorkflowBundle\Configuration\ConfigurationWorkflowDefinitionBuilder; + use Oro\Bundle\WorkflowBundle\Entity\Repository\WorkflowDefinitionRepository; use Oro\Bundle\WorkflowBundle\Entity\WorkflowDefinition; +use Symfony\Component\DependencyInjection\ContainerAwareInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; class LoadWorkflowDefinitionData extends AbstractFixture implements ContainerAwareInterface { diff --git a/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddAttributeNormalizerCompilerPass.php b/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddAttributeNormalizerCompilerPass.php index 09725a7fffa..8650e2001b0 100644 --- a/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddAttributeNormalizerCompilerPass.php +++ b/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddAttributeNormalizerCompilerPass.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; class AddAttributeNormalizerCompilerPass implements CompilerPassInterface diff --git a/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddConditionAndActionCompilerPass.php b/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddConditionAndActionCompilerPass.php index 8c69d857d53..53715298edb 100644 --- a/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddConditionAndActionCompilerPass.php +++ b/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddConditionAndActionCompilerPass.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\WorkflowBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\ContainerInterface; class AddConditionAndActionCompilerPass implements CompilerPassInterface { diff --git a/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddViewAttributeTwigTemplateCompilerPass.php b/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddViewAttributeTwigTemplateCompilerPass.php index 9f7af85f1a0..b155ee0a715 100644 --- a/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddViewAttributeTwigTemplateCompilerPass.php +++ b/src/Oro/Bundle/WorkflowBundle/DependencyInjection/Compiler/AddViewAttributeTwigTemplateCompilerPass.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; /** * Adds custom template to use in rendering of Workflow's Step view attributes. diff --git a/src/Oro/Bundle/WorkflowBundle/DependencyInjection/OroWorkflowExtension.php b/src/Oro/Bundle/WorkflowBundle/DependencyInjection/OroWorkflowExtension.php index 36aeb0d6e15..a21204679a2 100644 --- a/src/Oro/Bundle/WorkflowBundle/DependencyInjection/OroWorkflowExtension.php +++ b/src/Oro/Bundle/WorkflowBundle/DependencyInjection/OroWorkflowExtension.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\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; class OroWorkflowExtension extends Extension { diff --git a/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowDefinition.php b/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowDefinition.php index bb68ed7b1d4..fc6f6287c57 100644 --- a/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowDefinition.php +++ b/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowDefinition.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\WorkflowBundle\Entity; -use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; +use Doctrine\ORM\Mapping as ORM; /** * Definition of Workflow diff --git a/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowItem.php b/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowItem.php index 5a0e5b8672b..c99f206512c 100644 --- a/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowItem.php +++ b/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowItem.php @@ -2,18 +2,18 @@ namespace Oro\Bundle\WorkflowBundle\Entity; -use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Oro\Bundle\WorkflowBundle\Serializer\WorkflowAwareSerializer; +use JMS\Serializer\Annotation as Serializer; +use Oro\Bundle\DataAuditBundle\Metadata\Annotation as Oro; use Oro\Bundle\WorkflowBundle\Exception\WorkflowException; use Oro\Bundle\WorkflowBundle\Model\WorkflowData; -use Oro\Bundle\WorkflowBundle\Model\WorkflowResult; -use JMS\Serializer\Annotation as Serializer; +use Oro\Bundle\WorkflowBundle\Model\WorkflowResult; -use Oro\Bundle\DataAuditBundle\Metadata\Annotation as Oro; +use Oro\Bundle\WorkflowBundle\Serializer\WorkflowAwareSerializer; /** * Workflow item diff --git a/src/Oro/Bundle/WorkflowBundle/EventListener/WorkflowDataSerializeSubscriber.php b/src/Oro/Bundle/WorkflowBundle/EventListener/WorkflowDataSerializeSubscriber.php index 8caff699ca1..54fe47a8616 100644 --- a/src/Oro/Bundle/WorkflowBundle/EventListener/WorkflowDataSerializeSubscriber.php +++ b/src/Oro/Bundle/WorkflowBundle/EventListener/WorkflowDataSerializeSubscriber.php @@ -4,8 +4,8 @@ use Doctrine\Common\EventSubscriber; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\Event\OnFlushEventArgs; use Doctrine\ORM\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\OnFlushEventArgs; use Doctrine\ORM\Events; use Doctrine\ORM\UnitOfWork; diff --git a/src/Oro/Bundle/WorkflowBundle/EventListener/WorkflowDefinitionSubscriber.php b/src/Oro/Bundle/WorkflowBundle/EventListener/WorkflowDefinitionSubscriber.php index ec1b5a04e00..137dd7b98c7 100644 --- a/src/Oro/Bundle/WorkflowBundle/EventListener/WorkflowDefinitionSubscriber.php +++ b/src/Oro/Bundle/WorkflowBundle/EventListener/WorkflowDefinitionSubscriber.php @@ -3,12 +3,12 @@ namespace Oro\Bundle\WorkflowBundle\EventListener; use Doctrine\Common\EventSubscriber; +use Doctrine\ORM\EntityManager; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Events; -use Doctrine\ORM\EntityManager; -use Oro\Bundle\WorkflowBundle\Exception\WorkflowException; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; +use Oro\Bundle\WorkflowBundle\Exception\WorkflowException; /** * Connects WorkflowItem with WorkflowDefinition diff --git a/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowAttributesType.php b/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowAttributesType.php index b3ea0d430e8..ac697b90768 100644 --- a/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowAttributesType.php +++ b/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowAttributesType.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\WorkflowBundle\Form\Type; +use Oro\Bundle\WorkflowBundle\Model\Attribute; +use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Oro\Bundle\WorkflowBundle\Model\WorkflowRegistry; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Exception\InvalidConfigurationException; + use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\Options; - -use Oro\Bundle\WorkflowBundle\Model\Attribute; -use Oro\Bundle\WorkflowBundle\Model\Workflow; -use Oro\Bundle\WorkflowBundle\Model\WorkflowRegistry; +use Symfony\Component\OptionsResolver\OptionsResolver; class WorkflowAttributesType extends AbstractType { @@ -57,7 +57,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -134,7 +134,7 @@ protected function prepareAttributeOptions(Attribute $attribute, array $attribut * * @param OptionsResolverInterface $resolver */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setRequired(array('attribute_fields')); diff --git a/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowStepType.php b/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowStepType.php index a4aea1f0f1c..0922e187df1 100644 --- a/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowStepType.php +++ b/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowStepType.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\WorkflowBundle\Form\Type; +use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; +use Oro\Bundle\WorkflowBundle\Model\Workflow; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Exception\InvalidConfigurationException; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\OptionsResolver\Options; -use Oro\Bundle\WorkflowBundle\Model\Workflow; -use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; +use Symfony\Component\OptionsResolver\Options; +use Symfony\Component\OptionsResolver\OptionsResolver; class WorkflowStepType extends AbstractType { @@ -17,7 +17,7 @@ class WorkflowStepType extends AbstractType /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -37,7 +37,7 @@ public function getParent() * * @param OptionsResolverInterface $resolver */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setRequired(array('workflow_item')); $resolver->setOptional(array('step_name')); diff --git a/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowTransitionType.php b/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowTransitionType.php index d4f4ff81ed7..3fa958abac6 100644 --- a/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowTransitionType.php +++ b/src/Oro/Bundle/WorkflowBundle/Form/Type/WorkflowTransitionType.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\WorkflowBundle\Form\Type; +use Oro\Bundle\WorkflowBundle\Validator\Constraints\TransitionIsAllowed; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\Options; -use Oro\Bundle\WorkflowBundle\Validator\Constraints\TransitionIsAllowed; +use Symfony\Component\OptionsResolver\OptionsResolver; class WorkflowTransitionType extends AbstractType { @@ -15,7 +15,7 @@ class WorkflowTransitionType extends AbstractType /** * {@inheritDoc} */ - public function getName() + public function getBlockPrefix() { return self::NAME; } @@ -35,7 +35,7 @@ public function getParent() * * @param OptionsResolverInterface $resolver */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setRequired(array('workflow_item', 'transition_name')); diff --git a/src/Oro/Bundle/WorkflowBundle/Http/WorkflowItemValidator.php b/src/Oro/Bundle/WorkflowBundle/Http/WorkflowItemValidator.php index b1ded0f4386..487b2ddd6b2 100644 --- a/src/Oro/Bundle/WorkflowBundle/Http/WorkflowItemValidator.php +++ b/src/Oro/Bundle/WorkflowBundle/Http/WorkflowItemValidator.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Http; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; - use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; + use Oro\Bundle\WorkflowBundle\Model\WorkflowManager; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class WorkflowItemValidator { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/Action/ActionFactory.php b/src/Oro/Bundle/WorkflowBundle/Model/Action/ActionFactory.php index 7dfbe2c3214..8125872fe05 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/Action/ActionFactory.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/Action/ActionFactory.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\WorkflowBundle\Model\Action; -use Symfony\Component\DependencyInjection\ContainerInterface; use Oro\Bundle\WorkflowBundle\Model\Action\ActionInterface; use Oro\Bundle\WorkflowBundle\Model\Condition\ConditionInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; class ActionFactory { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/Action/CallMethod.php b/src/Oro/Bundle/WorkflowBundle/Model/Action/CallMethod.php index f7edb4596f0..1ddf1983467 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/Action/CallMethod.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/Action/CallMethod.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Model\Action; -use Symfony\Component\PropertyAccess\PropertyPath; - use Oro\Bundle\WorkflowBundle\Exception\InvalidParameterException; +use Symfony\Component\PropertyAccess\PropertyPath; + class CallMethod extends AbstractAction { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Model/Action/CreateEntity.php b/src/Oro/Bundle/WorkflowBundle/Model/Action/CreateEntity.php index 6f2aad020ba..66f95800e07 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/Action/CreateEntity.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/Action/CreateEntity.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\WorkflowBundle\Model\Action; -use Symfony\Component\PropertyAccess\PropertyPath; use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManager; +use Oro\Bundle\WorkflowBundle\Exception\ActionException; use Oro\Bundle\WorkflowBundle\Exception\InvalidParameterException; use Oro\Bundle\WorkflowBundle\Exception\NotManageableEntityException; -use Oro\Bundle\WorkflowBundle\Exception\ActionException; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; +use Symfony\Component\PropertyAccess\PropertyPath; class CreateEntity extends AbstractAction { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/Action/Redirect.php b/src/Oro/Bundle/WorkflowBundle/Model/Action/Redirect.php index 5bfa55fe6fc..f990a1a3b0b 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/Action/Redirect.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/Action/Redirect.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\WorkflowBundle\Model\Action; -use Symfony\Component\Routing\RouterInterface; -use Symfony\Component\PropertyAccess\PropertyPath; - use Oro\Bundle\WorkflowBundle\Exception\InvalidParameterException; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; +use Symfony\Component\PropertyAccess\PropertyPath; +use Symfony\Component\Routing\RouterInterface; + class Redirect extends AbstractAction { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Model/Action/RedirectToWorkflow.php b/src/Oro/Bundle/WorkflowBundle/Model/Action/RedirectToWorkflow.php index 2b1ca0c28a9..db400c90d56 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/Action/RedirectToWorkflow.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/Action/RedirectToWorkflow.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\WorkflowBundle\Model\Action; -use Symfony\Component\PropertyAccess\PropertyPath; - use Oro\Bundle\WorkflowBundle\Exception\InvalidParameterException; -use Oro\Bundle\WorkflowBundle\Model\Condition\ConditionInterface; use Oro\Bundle\WorkflowBundle\Model\Action\Redirect; +use Oro\Bundle\WorkflowBundle\Model\Condition\ConditionInterface; +use Symfony\Component\PropertyAccess\PropertyPath; + class RedirectToWorkflow implements ActionInterface { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Model/Action/RequestEntity.php b/src/Oro/Bundle/WorkflowBundle/Model/Action/RequestEntity.php index 77e6477407c..a51900e6226 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/Action/RequestEntity.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/Action/RequestEntity.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\WorkflowBundle\Model\Action; -use Symfony\Component\PropertyAccess\PropertyPath; use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManager; +use Oro\Bundle\WorkflowBundle\Exception\ActionException; use Oro\Bundle\WorkflowBundle\Exception\InvalidParameterException; use Oro\Bundle\WorkflowBundle\Exception\NotManageableEntityException; -use Oro\Bundle\WorkflowBundle\Exception\ActionException; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; +use Symfony\Component\PropertyAccess\PropertyPath; class RequestEntity extends AbstractAction { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/Action/StartWorkflow.php b/src/Oro/Bundle/WorkflowBundle/Model/Action/StartWorkflow.php index 016801e5d63..fa519160ede 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/Action/StartWorkflow.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/Action/StartWorkflow.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\WorkflowBundle\Model\Action; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Exception\InvalidParameterException; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; use Oro\Bundle\WorkflowBundle\Model\WorkflowManager; -use Oro\Bundle\WorkflowBundle\Exception\InvalidParameterException; +use Symfony\Component\PropertyAccess\PropertyPath; class StartWorkflow extends AbstractAction { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/AttributeManager.php b/src/Oro/Bundle/WorkflowBundle/Model/AttributeManager.php index c7abfcef6ac..a3647711501 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/AttributeManager.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/AttributeManager.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Model; -use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; class AttributeManager { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/Condition/ConditionFactory.php b/src/Oro/Bundle/WorkflowBundle/Model/Condition/ConditionFactory.php index 87c8fdd6688..9b2221d533e 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/Condition/ConditionFactory.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/Condition/ConditionFactory.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Model\Condition; -use Symfony\Component\DependencyInjection\ContainerInterface; use Oro\Bundle\WorkflowBundle\Model\Condition\ConditionInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; class ConditionFactory { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/ContextAccessor.php b/src/Oro/Bundle/WorkflowBundle/Model/ContextAccessor.php index a426bddb08b..854f78deb37 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/ContextAccessor.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/ContextAccessor.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\WorkflowBundle\Model; -use Symfony\Component\PropertyAccess\PropertyPath; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessor; +use Symfony\Component\PropertyAccess\PropertyPath; use Symfony\Component\PropertyAccess\PropertyPathInterface; class ContextAccessor diff --git a/src/Oro/Bundle/WorkflowBundle/Model/EntityBinder.php b/src/Oro/Bundle/WorkflowBundle/Model/EntityBinder.php index 45151d80787..9e6f0825539 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/EntityBinder.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/EntityBinder.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Model; -use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; use Oro\Bundle\WorkflowBundle\Entity\WorkflowBindEntity; +use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; use Oro\Bundle\WorkflowBundle\Model\DoctrineHelper; /** diff --git a/src/Oro/Bundle/WorkflowBundle/Model/StepAssembler.php b/src/Oro/Bundle/WorkflowBundle/Model/StepAssembler.php index 4508e5bff73..c502865533b 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/StepAssembler.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/StepAssembler.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\WorkflowBundle\Model; -use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; +use Oro\Bundle\WorkflowBundle\Exception\InvalidParameterException; use Oro\Bundle\WorkflowBundle\Exception\UnknownAttributeException; use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowStepType; -use Oro\Bundle\WorkflowBundle\Exception\InvalidParameterException; class StepAssembler extends AbstractAssembler { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/StepManager.php b/src/Oro/Bundle/WorkflowBundle/Model/StepManager.php index 098750dfce2..bb2c1ac165a 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/StepManager.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/StepManager.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Model; -use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; class StepManager { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/Transition.php b/src/Oro/Bundle/WorkflowBundle/Model/Transition.php index 5fc795436eb..a2cbbd35cee 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/Transition.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/Transition.php @@ -6,8 +6,8 @@ use Doctrine\Common\Collections\Collection; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; -use Oro\Bundle\WorkflowBundle\Model\Condition\ConditionInterface; use Oro\Bundle\WorkflowBundle\Model\Action\ActionInterface; +use Oro\Bundle\WorkflowBundle\Model\Condition\ConditionInterface; class Transition { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/TransitionAssembler.php b/src/Oro/Bundle/WorkflowBundle/Model/TransitionAssembler.php index 09d7545f400..37b53039987 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/TransitionAssembler.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/TransitionAssembler.php @@ -6,10 +6,10 @@ use Oro\Bundle\WorkflowBundle\Exception\AssemblerException; use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowTransitionType; -use Oro\Bundle\WorkflowBundle\Model\Condition\ConditionFactory; use Oro\Bundle\WorkflowBundle\Model\Action\ActionFactory; -use Oro\Bundle\WorkflowBundle\Model\Condition\Configurable as ConfigurableCondition; use Oro\Bundle\WorkflowBundle\Model\Action\Configurable as ConfigurableAction; +use Oro\Bundle\WorkflowBundle\Model\Condition\ConditionFactory; +use Oro\Bundle\WorkflowBundle\Model\Condition\Configurable as ConfigurableCondition; class TransitionAssembler extends AbstractAssembler { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/TransitionManager.php b/src/Oro/Bundle/WorkflowBundle/Model/TransitionManager.php index 209b7ae5ce4..a945ef4259e 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/TransitionManager.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/TransitionManager.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Model; -use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; use Oro\Bundle\WorkflowBundle\Exception\InvalidTransitionException; diff --git a/src/Oro/Bundle/WorkflowBundle/Model/Workflow.php b/src/Oro/Bundle/WorkflowBundle/Model/Workflow.php index a5f65ce3619..1a6097d8c36 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/Workflow.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/Workflow.php @@ -2,14 +2,14 @@ namespace Oro\Bundle\WorkflowBundle\Model; -use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; use Oro\Bundle\WorkflowBundle\Entity\WorkflowTransitionRecord; use Oro\Bundle\WorkflowBundle\Exception\ForbiddenTransitionException; -use Oro\Bundle\WorkflowBundle\Exception\UnknownStepException; use Oro\Bundle\WorkflowBundle\Exception\InvalidTransitionException; +use Oro\Bundle\WorkflowBundle\Exception\UnknownStepException; class Workflow { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/WorkflowAssembler.php b/src/Oro/Bundle/WorkflowBundle/Model/WorkflowAssembler.php index f8fe6d1ec40..034695c36ff 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/WorkflowAssembler.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/WorkflowAssembler.php @@ -3,14 +3,14 @@ namespace Oro\Bundle\WorkflowBundle\Model; use Doctrine\Common\Collections\Collection; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Oro\Bundle\WorkflowBundle\Configuration\WorkflowConfiguration; -use Oro\Bundle\WorkflowBundle\Exception\UnknownStepException; -use Oro\Bundle\WorkflowBundle\Exception\AssemblerException; use Oro\Bundle\WorkflowBundle\Entity\WorkflowDefinition; -use Oro\Bundle\WorkflowBundle\Configuration\WorkflowConfiguration; -use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Oro\Bundle\WorkflowBundle\Exception\AssemblerException; +use Oro\Bundle\WorkflowBundle\Exception\UnknownStepException; use Oro\Bundle\WorkflowBundle\Model\Step; +use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Symfony\Component\DependencyInjection\ContainerInterface; class WorkflowAssembler extends AbstractAssembler { diff --git a/src/Oro/Bundle/WorkflowBundle/Model/WorkflowManager.php b/src/Oro/Bundle/WorkflowBundle/Model/WorkflowManager.php index 04268cc1715..19d9aa428b7 100644 --- a/src/Oro/Bundle/WorkflowBundle/Model/WorkflowManager.php +++ b/src/Oro/Bundle/WorkflowBundle/Model/WorkflowManager.php @@ -2,19 +2,19 @@ namespace Oro\Bundle\WorkflowBundle\Model; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\Common\Collections\Collection; +use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManager; -use Oro\Bundle\WorkflowBundle\Exception\WorkflowNotFoundException; -use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Oro\Bundle\WorkflowBundle\Entity\Repository\WorkflowItemRepository; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; use Oro\Bundle\WorkflowBundle\Exception\UnknownAttributeException; -use Oro\Bundle\WorkflowBundle\Model\WorkflowRegistry; +use Oro\Bundle\WorkflowBundle\Exception\WorkflowException; +use Oro\Bundle\WorkflowBundle\Exception\WorkflowNotFoundException; use Oro\Bundle\WorkflowBundle\Model\Attribute; -use Oro\Bundle\WorkflowBundle\Entity\Repository\WorkflowItemRepository; use Oro\Bundle\WorkflowBundle\Model\DoctrineHelper; -use Oro\Bundle\WorkflowBundle\Exception\WorkflowException; +use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Oro\Bundle\WorkflowBundle\Model\WorkflowRegistry; class WorkflowManager { diff --git a/src/Oro/Bundle/WorkflowBundle/OroWorkflowBundle.php b/src/Oro/Bundle/WorkflowBundle/OroWorkflowBundle.php index 1cda82b42b2..d72b5463810 100644 --- a/src/Oro/Bundle/WorkflowBundle/OroWorkflowBundle.php +++ b/src/Oro/Bundle/WorkflowBundle/OroWorkflowBundle.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\WorkflowBundle; -use Symfony\Component\HttpKernel\Bundle\Bundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; - -use Oro\Bundle\WorkflowBundle\DependencyInjection\Compiler\AddConditionAndActionCompilerPass; use Oro\Bundle\WorkflowBundle\DependencyInjection\Compiler\AddAttributeNormalizerCompilerPass; +use Oro\Bundle\WorkflowBundle\DependencyInjection\Compiler\AddConditionAndActionCompilerPass; + +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\HttpKernel\Bundle\Bundle; class OroWorkflowBundle extends Bundle { diff --git a/src/Oro/Bundle/WorkflowBundle/Serializer/Handler/WorkflowResultHandler.php b/src/Oro/Bundle/WorkflowBundle/Serializer/Handler/WorkflowResultHandler.php index 0544063ff99..5e5ac65e8d2 100644 --- a/src/Oro/Bundle/WorkflowBundle/Serializer/Handler/WorkflowResultHandler.php +++ b/src/Oro/Bundle/WorkflowBundle/Serializer/Handler/WorkflowResultHandler.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Serializer\Handler; -use JMS\Serializer\JsonSerializationVisitor; use JMS\Serializer\Context; +use JMS\Serializer\JsonSerializationVisitor; use Oro\Bundle\WorkflowBundle\Model\DoctrineHelper; use Oro\Bundle\WorkflowBundle\Model\WorkflowResult; diff --git a/src/Oro/Bundle/WorkflowBundle/Serializer/Normalizer/EntityAttributeNormalizer.php b/src/Oro/Bundle/WorkflowBundle/Serializer/Normalizer/EntityAttributeNormalizer.php index f6b2ea6445d..78ec632b57b 100644 --- a/src/Oro/Bundle/WorkflowBundle/Serializer/Normalizer/EntityAttributeNormalizer.php +++ b/src/Oro/Bundle/WorkflowBundle/Serializer/Normalizer/EntityAttributeNormalizer.php @@ -7,8 +7,8 @@ use Oro\Bundle\WorkflowBundle\Exception\SerializerException; use Oro\Bundle\WorkflowBundle\Model\Attribute; -use Oro\Bundle\WorkflowBundle\Model\Workflow; use Oro\Bundle\WorkflowBundle\Model\DoctrineHelper; +use Oro\Bundle\WorkflowBundle\Model\Workflow; class EntityAttributeNormalizer implements AttributeNormalizer { diff --git a/src/Oro/Bundle/WorkflowBundle/Serializer/Normalizer/WorkflowDataNormalizer.php b/src/Oro/Bundle/WorkflowBundle/Serializer/Normalizer/WorkflowDataNormalizer.php index 276ae641876..e32cee5f29e 100644 --- a/src/Oro/Bundle/WorkflowBundle/Serializer/Normalizer/WorkflowDataNormalizer.php +++ b/src/Oro/Bundle/WorkflowBundle/Serializer/Normalizer/WorkflowDataNormalizer.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\WorkflowBundle\Serializer\Normalizer; -use Symfony\Component\Serializer\Normalizer\SerializerAwareNormalizer; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; - use Oro\Bundle\WorkflowBundle\Exception\SerializerException; -use Oro\Bundle\WorkflowBundle\Serializer\WorkflowAwareSerializer; use Oro\Bundle\WorkflowBundle\Model\Attribute; use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Oro\Bundle\WorkflowBundle\Serializer\WorkflowAwareSerializer; +use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; +use Symfony\Component\Serializer\Normalizer\NormalizerInterface; +use Symfony\Component\Serializer\Normalizer\SerializerAwareNormalizer; + class WorkflowDataNormalizer extends SerializerAwareNormalizer implements NormalizerInterface, DenormalizerInterface { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Serializer/WorkflowAwareSerializer.php b/src/Oro/Bundle/WorkflowBundle/Serializer/WorkflowAwareSerializer.php index d6bd6833129..74ce9842566 100644 --- a/src/Oro/Bundle/WorkflowBundle/Serializer/WorkflowAwareSerializer.php +++ b/src/Oro/Bundle/WorkflowBundle/Serializer/WorkflowAwareSerializer.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Serializer; -use Symfony\Component\Serializer\SerializerInterface; - use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Symfony\Component\Serializer\SerializerInterface; + interface WorkflowAwareSerializer extends SerializerInterface { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Serializer/WorkflowDataSerializer.php b/src/Oro/Bundle/WorkflowBundle/Serializer/WorkflowDataSerializer.php index 51858026b4e..2c5c8a4a946 100644 --- a/src/Oro/Bundle/WorkflowBundle/Serializer/WorkflowDataSerializer.php +++ b/src/Oro/Bundle/WorkflowBundle/Serializer/WorkflowDataSerializer.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Serializer; -use Symfony\Component\Serializer\Serializer; +use Oro\Bundle\WorkflowBundle\Model\Workflow; use Oro\Bundle\WorkflowBundle\Model\WorkflowRegistry; -use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Symfony\Component\Serializer\Serializer; class WorkflowDataSerializer extends Serializer implements WorkflowAwareSerializer { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/ConfigurationProviderTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/ConfigurationProviderTest.php index 77147c82777..7191697dd9c 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/ConfigurationProviderTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/ConfigurationProviderTest.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Configuration; -use Symfony\Component\Yaml\Yaml; - use Oro\Bundle\WorkflowBundle\Configuration\ConfigurationProvider; + +use Oro\Bundle\WorkflowBundle\Configuration\WorkflowConfiguration; +use Oro\Bundle\WorkflowBundle\Configuration\WorkflowListConfiguration; use Oro\Bundle\WorkflowBundle\Tests\Unit\Configuration\Stub\CorrectConfiguration\CorrectConfigurationBundle; +use Oro\Bundle\WorkflowBundle\Tests\Unit\Configuration\Stub\DuplicateConfiguration\DuplicateConfigurationBundle; use Oro\Bundle\WorkflowBundle\Tests\Unit\Configuration\Stub\EmptyConfiguration\EmptyConfigurationBundle; use Oro\Bundle\WorkflowBundle\Tests\Unit\Configuration\Stub\IncorrectConfiguration\IncorrectConfigurationBundle; -use Oro\Bundle\WorkflowBundle\Tests\Unit\Configuration\Stub\DuplicateConfiguration\DuplicateConfigurationBundle; -use Oro\Bundle\WorkflowBundle\Configuration\WorkflowListConfiguration; -use Oro\Bundle\WorkflowBundle\Configuration\WorkflowConfiguration; +use Symfony\Component\Yaml\Yaml; class ConfigurationProviderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/ConfigurationWorkflowDefinitionBuilderTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/ConfigurationWorkflowDefinitionBuilderTest.php index 09e0205fbc6..b95754dabbc 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/ConfigurationWorkflowDefinitionBuilderTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/ConfigurationWorkflowDefinitionBuilderTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Configuration; -use Oro\Bundle\WorkflowBundle\Entity\WorkflowDefinition; -use Oro\Bundle\WorkflowBundle\Model\Workflow; use Oro\Bundle\WorkflowBundle\Configuration\ConfigurationWorkflowDefinitionBuilder; use Oro\Bundle\WorkflowBundle\Configuration\WorkflowConfiguration; +use Oro\Bundle\WorkflowBundle\Entity\WorkflowDefinition; +use Oro\Bundle\WorkflowBundle\Model\Workflow; class ConfigurationWorkflowDefinitionBuilderTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/WorkflowConfigurationTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/WorkflowConfigurationTest.php index ea794b51ea6..ad69d98c83d 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/WorkflowConfigurationTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Configuration/WorkflowConfigurationTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Configuration; -use Symfony\Component\Yaml\Yaml; - use Oro\Bundle\WorkflowBundle\Configuration\WorkflowConfiguration; +use Symfony\Component\Yaml\Yaml; + class WorkflowConfigurationTest extends \PHPUnit_Framework_TestCase { public function testProcessConfiguration() diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/DependencyInjection/Compiler/AddConditionAndActionCompilerPassTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/DependencyInjection/Compiler/AddConditionAndActionCompilerPassTest.php index 14e6bd3fce3..6fa080d6654 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/DependencyInjection/Compiler/AddConditionAndActionCompilerPassTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/DependencyInjection/Compiler/AddConditionAndActionCompilerPassTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerInterface; - use Oro\Bundle\WorkflowBundle\DependencyInjection\Compiler\AddConditionAndActionCompilerPass; +use Symfony\Component\DependencyInjection\ContainerInterface; + class AddConditionAndActionCompilerPassTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/DependencyInjection/OroWorkflowExtensionTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/DependencyInjection/OroWorkflowExtensionTest.php index 689601cc8e3..2002a975b92 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/DependencyInjection/OroWorkflowExtensionTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/DependencyInjection/OroWorkflowExtensionTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\DependencyInjection; -use Symfony\Component\DependencyInjection\Definition; - use Oro\Bundle\WorkflowBundle\DependencyInjection\OroWorkflowExtension; +use Symfony\Component\DependencyInjection\Definition; + class OroWorkflowExtensionTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Entity/WorkflowBindEntityTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Entity/WorkflowBindEntityTest.php index 63304e1d706..3065b8e5613 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Entity/WorkflowBindEntityTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Entity/WorkflowBindEntityTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Entity; -use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; use Oro\Bundle\WorkflowBundle\Entity\WorkflowBindEntity; +use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; class WorkflowBindEntityTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/EventListener/WorkflowDataSerializeSubscriberTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/EventListener/WorkflowDataSerializeSubscriberTest.php index a1e34aadaec..e417d4366f8 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/EventListener/WorkflowDataSerializeSubscriberTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/EventListener/WorkflowDataSerializeSubscriberTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\EventListener; -use Doctrine\ORM\Event\OnFlushEventArgs; use Doctrine\ORM\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\OnFlushEventArgs; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; -use Oro\Bundle\WorkflowBundle\Model\WorkflowData; use Oro\Bundle\WorkflowBundle\EventListener\WorkflowDataSerializeSubscriber; +use Oro\Bundle\WorkflowBundle\Model\WorkflowData; class WorkflowDataSerializeSubscriberTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/AbstractWorkflowAttributesTypeTestCase.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/AbstractWorkflowAttributesTypeTestCase.php index b18f60f3f8a..f803f8c5a90 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/AbstractWorkflowAttributesTypeTestCase.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/AbstractWorkflowAttributesTypeTestCase.php @@ -2,13 +2,13 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\Test\FormIntegrationTestCase; - use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; -use Oro\Bundle\WorkflowBundle\Model\Step; + use Oro\Bundle\WorkflowBundle\Model\Attribute; -use Oro\Bundle\WorkflowBundle\Model\WorkflowData; +use Oro\Bundle\WorkflowBundle\Model\Step; use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Oro\Bundle\WorkflowBundle\Model\WorkflowData; +use Symfony\Component\Form\Test\FormIntegrationTestCase; abstract class AbstractWorkflowAttributesTypeTestCase extends FormIntegrationTestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/WorkflowStepTypeTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/WorkflowStepTypeTest.php index c6d8c29bf21..10804c8b44e 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/WorkflowStepTypeTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/WorkflowStepTypeTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\PreloadedExtension; - use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowAttributesType; + use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowStepType; +use Symfony\Component\Form\PreloadedExtension; class WorkflowStepTypeTest extends AbstractWorkflowAttributesTypeTestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/WorkflowTransitionTypeTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/WorkflowTransitionTypeTest.php index 63cad70098f..eab014e17f8 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/WorkflowTransitionTypeTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Form/Type/WorkflowTransitionTypeTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Form\Type; -use Symfony\Component\Form\PreloadedExtension; -use Symfony\Component\OptionsResolver\Options; - use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowAttributesType; use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowTransitionType; +use Symfony\Component\Form\PreloadedExtension; +use Symfony\Component\OptionsResolver\Options; + class WorkflowTransitionTypeTest extends AbstractWorkflowAttributesTypeTestCase { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/ActionAssemblerTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/ActionAssemblerTest.php index 83280c88dfe..63847030215 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/ActionAssemblerTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/ActionAssemblerTest.php @@ -3,9 +3,9 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Action; use Oro\Bundle\WorkflowBundle\Model\Action\ActionAssembler; +use Oro\Bundle\WorkflowBundle\Model\Action\ActionFactory; use Oro\Bundle\WorkflowBundle\Model\Action\ActionInterface; use Oro\Bundle\WorkflowBundle\Model\Action\TreeExecutor; -use Oro\Bundle\WorkflowBundle\Model\Action\ActionFactory; use Oro\Bundle\WorkflowBundle\Model\Condition\ConditionFactory; use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Action\Stub\ArrayAction; use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Action\Stub\ArrayCondition; diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/AssignValueTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/AssignValueTest.php index 17520766aa6..1fd018bf501 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/AssignValueTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/AssignValueTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Action; -use Oro\Bundle\WorkflowBundle\Model\Action\AssignValue; use Oro\Bundle\WorkflowBundle\Model\Action\ActionInterface; +use Oro\Bundle\WorkflowBundle\Model\Action\AssignValue; class AssignValueTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CallMethodTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CallMethodTest.php index 8977544e2fb..e68e3a9d1df 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CallMethodTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CallMethodTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Action; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Model\Action\CallMethod; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; -use Oro\Bundle\WorkflowBundle\Model\Action\CallMethod; use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Stub\ItemStub; +use Symfony\Component\PropertyAccess\PropertyPath; class CallMethodTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CloseWorkflowTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CloseWorkflowTest.php index e1ab475d548..6ad94c20e9f 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CloseWorkflowTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CloseWorkflowTest.php @@ -4,8 +4,8 @@ use Doctrine\Common\Collections\ArrayCollection; -use Oro\Bundle\WorkflowBundle\Model\Action\CloseWorkflow; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; +use Oro\Bundle\WorkflowBundle\Model\Action\CloseWorkflow; class CloseWorkflowTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CreateEntityTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CreateEntityTest.php index 595bb33bae1..ee37f7af865 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CreateEntityTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/CreateEntityTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Action; -use Symfony\Component\PropertyAccess\PropertyPath; - use Oro\Bundle\WorkflowBundle\Model\Action\CreateEntity; -use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Stub\ItemStub; + use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; +use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Stub\ItemStub; +use Symfony\Component\PropertyAccess\PropertyPath; class CreateEntityTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/RedirectToWorkflowTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/RedirectToWorkflowTest.php index 11fcbfdfb5f..694aba9ab0d 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/RedirectToWorkflowTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/RedirectToWorkflowTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Action; -use Symfony\Component\PropertyAccess\PropertyPath; - use Oro\Bundle\WorkflowBundle\Model\Action\RedirectToWorkflow; +use Symfony\Component\PropertyAccess\PropertyPath; + class RedirectToWorkflowTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/RequestEntityTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/RequestEntityTest.php index 13794ca782c..ad0b592591a 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/RequestEntityTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/RequestEntityTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Action; -use Symfony\Component\PropertyAccess\PropertyPath; - use Oro\Bundle\WorkflowBundle\Model\Action\RequestEntity; -use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Stub\ItemStub; + use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; +use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Stub\ItemStub; +use Symfony\Component\PropertyAccess\PropertyPath; class RequestEntityTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/StartWorkflowTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/StartWorkflowTest.php index f8fc12331c4..88373c86829 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/StartWorkflowTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/StartWorkflowTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Action; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; use Oro\Bundle\WorkflowBundle\Model\Action\StartWorkflow; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; -use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Stub\ItemStub; +use Symfony\Component\PropertyAccess\PropertyPath; class StartWorkflowTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/UnsetValueTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/UnsetValueTest.php index 6cc299254cf..3daf4fb0d09 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/UnsetValueTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Action/UnsetValueTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Action; -use Oro\Bundle\WorkflowBundle\Model\Action\AssignValue; use Oro\Bundle\WorkflowBundle\Model\Action\ActionInterface; +use Oro\Bundle\WorkflowBundle\Model\Action\AssignValue; use Oro\Bundle\WorkflowBundle\Model\Action\UnsetValue; class UnsetValueTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/BlankTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/BlankTest.php index dffb536c627..35ab0835567 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/BlankTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/BlankTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Condition; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Model\Condition; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; -use Oro\Bundle\WorkflowBundle\Model\Condition; +use Symfony\Component\PropertyAccess\PropertyPath; class BlankTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/EqualToTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/EqualToTest.php index 7eb4ce25afe..18bd8ad112d 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/EqualToTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/EqualToTest.php @@ -5,11 +5,11 @@ use Doctrine\Common\Persistence\Mapping\ClassMetadata; use Doctrine\Common\Persistence\ObjectManager; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Model\Condition; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; -use Oro\Bundle\WorkflowBundle\Model\Condition; use Oro\Bundle\WorkflowBundle\Model\DoctrineHelper; +use Symfony\Component\PropertyAccess\PropertyPath; class EqualToTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/GreaterThanOrEqualTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/GreaterThanOrEqualTest.php index 94d847bf3b4..c87debbd189 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/GreaterThanOrEqualTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/GreaterThanOrEqualTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Condition; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Model\Condition; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; -use Oro\Bundle\WorkflowBundle\Model\Condition; +use Symfony\Component\PropertyAccess\PropertyPath; class GreaterThanOrEqualTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/GreaterThanTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/GreaterThanTest.php index 7bb1a492839..ce483f22ad6 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/GreaterThanTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/GreaterThanTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Condition; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Model\Condition; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; -use Oro\Bundle\WorkflowBundle\Model\Condition; +use Symfony\Component\PropertyAccess\PropertyPath; class GreaterThanTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/LessThanOrEqualTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/LessThanOrEqualTest.php index 80002913f26..063a1228b97 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/LessThanOrEqualTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/LessThanOrEqualTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Condition; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Model\Condition; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; -use Oro\Bundle\WorkflowBundle\Model\Condition; +use Symfony\Component\PropertyAccess\PropertyPath; class LessThanOrEqualTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/LessThanTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/LessThanTest.php index 02e7e8df5f3..ed8d9a83bb1 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/LessThanTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/Condition/LessThanTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Condition; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Model\Condition; use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; -use Oro\Bundle\WorkflowBundle\Model\Condition; +use Symfony\Component\PropertyAccess\PropertyPath; class LessThanTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/ConfigurationPass/ReplacePropertyPathTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/ConfigurationPass/ReplacePropertyPathTest.php index 317a7d110df..e73f6783bbc 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/ConfigurationPass/ReplacePropertyPathTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/ConfigurationPass/ReplacePropertyPathTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model\ConfigurationPass; -use Symfony\Component\PropertyAccess\PropertyPath; - use Oro\Bundle\WorkflowBundle\Model\ConfigurationPass\ReplacePropertyPath; +use Symfony\Component\PropertyAccess\PropertyPath; + class ReplacePropertyPathTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/ContextAccessorTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/ContextAccessorTest.php index 813fb2e7962..e8946e3b4a0 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/ContextAccessorTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/ContextAccessorTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Stub\ItemStub; -use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException; +use Symfony\Component\PropertyAccess\PropertyPath; use Zend\Server\Reflection; class ContextAccessorTest extends \PHPUnit_Framework_TestCase diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/DoctrineHelperTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/DoctrineHelperTest.php index fec7d729a9f..5febcbf1459 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/DoctrineHelperTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/DoctrineHelperTest.php @@ -5,8 +5,8 @@ use Doctrine\Common\Persistence\Proxy; use Oro\Bundle\WorkflowBundle\Model\DoctrineHelper; -use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Stub\ItemStub; use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Stub\__CG__\ItemStubProxy; +use Oro\Bundle\WorkflowBundle\Tests\Unit\Model\Stub\ItemStub; class DoctrineHelperTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/EntityBinderTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/EntityBinderTest.php index 549f109a1d7..5c3cb6a2e66 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/EntityBinderTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/EntityBinderTest.php @@ -3,8 +3,8 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model; use Oro\Bundle\WorkflowBundle\Entity\WorkflowBindEntity; -use Oro\Bundle\WorkflowBundle\Model\EntityBinder; use Oro\Bundle\WorkflowBundle\Model\AttributeManager; +use Oro\Bundle\WorkflowBundle\Model\EntityBinder; use Oro\Bundle\WorkflowBundle\Model\StepManager; use Oro\Bundle\WorkflowBundle\Model\TransitionManager; diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/StepAssemblerTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/StepAssemblerTest.php index 2d56f76954b..07eefc7bb1b 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/StepAssemblerTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/StepAssemblerTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model; -use Symfony\Component\PropertyAccess\PropertyPath; +use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowStepType; +use Oro\Bundle\WorkflowBundle\Model\Attribute; use Oro\Bundle\WorkflowBundle\Model\Step; use Oro\Bundle\WorkflowBundle\Model\StepAssembler; -use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowStepType; -use Oro\Bundle\WorkflowBundle\Model\Attribute; +use Symfony\Component\PropertyAccess\PropertyPath; class StepAssemblerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/TransitionAssemblerTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/TransitionAssemblerTest.php index 874901b1474..f0b9d3e3ccd 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/TransitionAssemblerTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/TransitionAssemblerTest.php @@ -3,10 +3,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model; use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowTransitionType; +use Oro\Bundle\WorkflowBundle\Model\Action\Configurable as ConfigurableAction; +use Oro\Bundle\WorkflowBundle\Model\Condition\Configurable as ConfigurableCondition; use Oro\Bundle\WorkflowBundle\Model\Transition; use Oro\Bundle\WorkflowBundle\Model\TransitionAssembler; -use Oro\Bundle\WorkflowBundle\Model\Condition\Configurable as ConfigurableCondition; -use Oro\Bundle\WorkflowBundle\Model\Action\Configurable as ConfigurableAction; class TransitionAssemblerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowAssemblerTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowAssemblerTest.php index 37c1af2459a..85f2259f57a 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowAssemblerTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowAssemblerTest.php @@ -2,17 +2,17 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model; -use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Doctrine\Common\Collections\Collection; +use Oro\Bundle\WorkflowBundle\Configuration\WorkflowConfiguration; use Oro\Bundle\WorkflowBundle\Entity\WorkflowDefinition; -use Oro\Bundle\WorkflowBundle\Model\Workflow; -use Oro\Bundle\WorkflowBundle\Model\WorkflowAssembler; -use Oro\Bundle\WorkflowBundle\Configuration\WorkflowConfiguration; use Oro\Bundle\WorkflowBundle\Model\AttributeAssembler; use Oro\Bundle\WorkflowBundle\Model\StepAssembler; use Oro\Bundle\WorkflowBundle\Model\TransitionAssembler; +use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Oro\Bundle\WorkflowBundle\Model\WorkflowAssembler; +use Symfony\Component\DependencyInjection\ContainerInterface; class WorkflowAssemblerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowManagerTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowManagerTest.php index 243621fffb3..1bd93feefb1 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowManagerTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowManagerTest.php @@ -4,15 +4,15 @@ use Doctrine\Common\Collections\ArrayCollection; -use Oro\Bundle\WorkflowBundle\Model\WorkflowManager; -use Oro\Bundle\WorkflowBundle\Model\Workflow; -use Oro\Bundle\WorkflowBundle\Model\Step; -use Oro\Bundle\WorkflowBundle\Model\Attribute; -use Oro\Bundle\WorkflowBundle\Model\Transition; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; +use Oro\Bundle\WorkflowBundle\Model\Attribute; use Oro\Bundle\WorkflowBundle\Model\AttributeManager; +use Oro\Bundle\WorkflowBundle\Model\Step; use Oro\Bundle\WorkflowBundle\Model\StepManager; +use Oro\Bundle\WorkflowBundle\Model\Transition; use Oro\Bundle\WorkflowBundle\Model\TransitionManager; +use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Oro\Bundle\WorkflowBundle\Model\WorkflowManager; class WorkflowManagerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowRegistryTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowRegistryTest.php index d98fc872ef5..53b7d54afc5 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowRegistryTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowRegistryTest.php @@ -2,12 +2,12 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Model; -use Symfony\Bridge\Doctrine\ManagerRegistry; - -use Oro\Bundle\WorkflowBundle\Model\WorkflowRegistry; use Oro\Bundle\WorkflowBundle\Entity\WorkflowDefinition; + use Oro\Bundle\WorkflowBundle\Model\Workflow; use Oro\Bundle\WorkflowBundle\Model\WorkflowAssembler; +use Oro\Bundle\WorkflowBundle\Model\WorkflowRegistry; +use Symfony\Bridge\Doctrine\ManagerRegistry; class WorkflowRegistryTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowTest.php index 3f08ec1c25a..a0dfd3c0aee 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowTest.php @@ -4,12 +4,12 @@ use Doctrine\Common\Collections\ArrayCollection; -use Oro\Bundle\WorkflowBundle\Model\Workflow; -use Oro\Bundle\WorkflowBundle\Model\Step; -use Oro\Bundle\WorkflowBundle\Model\Transition; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; use Oro\Bundle\WorkflowBundle\Entity\WorkflowTransitionRecord; use Oro\Bundle\WorkflowBundle\Exception\InvalidTransitionException; +use Oro\Bundle\WorkflowBundle\Model\Step; +use Oro\Bundle\WorkflowBundle\Model\Transition; +use Oro\Bundle\WorkflowBundle\Model\Workflow; /** * @SuppressWarnings(PHPMD.TooManyMethods) diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/Handler/WorkflowResultHandlerTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/Handler/WorkflowResultHandlerTest.php index 2119555e81b..928546fc059 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/Handler/WorkflowResultHandlerTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/Handler/WorkflowResultHandlerTest.php @@ -4,8 +4,8 @@ use Doctrine\Common\Collections\ArrayCollection; -use Oro\Bundle\WorkflowBundle\Serializer\Handler\WorkflowResultHandler; use Oro\Bundle\WorkflowBundle\Model\WorkflowResult; +use Oro\Bundle\WorkflowBundle\Serializer\Handler\WorkflowResultHandler; class WorkflowResultHandlerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/Normalizer/WorkflowDataNormalizerTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/Normalizer/WorkflowDataNormalizerTest.php index c5db6d701ad..b13cf0eeb9f 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/Normalizer/WorkflowDataNormalizerTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/Normalizer/WorkflowDataNormalizerTest.php @@ -2,11 +2,11 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Serializer\Normalizer; -use Oro\Bundle\WorkflowBundle\Serializer\Normalizer\WorkflowDataNormalizer; -use Oro\Bundle\WorkflowBundle\Model\WorkflowData; use Oro\Bundle\WorkflowBundle\Model\AttributeManager; use Oro\Bundle\WorkflowBundle\Model\StepManager; use Oro\Bundle\WorkflowBundle\Model\TransitionManager; +use Oro\Bundle\WorkflowBundle\Model\WorkflowData; +use Oro\Bundle\WorkflowBundle\Serializer\Normalizer\WorkflowDataNormalizer; class WorkflowDataNormalizerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/WorkflowDataSerializerTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/WorkflowDataSerializerTest.php index 3d4c58929bc..448cb44234a 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/WorkflowDataSerializerTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Serializer/WorkflowDataSerializerTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Serializer; -use Oro\Bundle\WorkflowBundle\Serializer\WorkflowDataSerializer; -use Oro\Bundle\WorkflowBundle\Model\WorkflowRegistry; use Oro\Bundle\WorkflowBundle\Model\Workflow; +use Oro\Bundle\WorkflowBundle\Model\WorkflowRegistry; +use Oro\Bundle\WorkflowBundle\Serializer\WorkflowDataSerializer; class WorkflowDataSerializerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Twig/ClassNameExtensionTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Twig/ClassNameExtensionTest.php index 6d2dc1e0b40..c177d8715cf 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Twig/ClassNameExtensionTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Twig/ClassNameExtensionTest.php @@ -2,9 +2,9 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Twig; -use Oro\Bundle\WorkflowBundle\Twig\ClassNameExtension; -use Oro\Bundle\WorkflowBundle\Tests\Unit\Twig\Stub\Entity; use Oro\Bundle\WorkflowBundle\Tests\Unit\Twig\Stub\__CG__\EntityProxy; +use Oro\Bundle\WorkflowBundle\Tests\Unit\Twig\Stub\Entity; +use Oro\Bundle\WorkflowBundle\Twig\ClassNameExtension; class ClassNameExtensionTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Twig/ViewAttributeExtensionTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Twig/ViewAttributeExtensionTest.php index f24255fba10..f9cc79564d8 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Twig/ViewAttributeExtensionTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Twig/ViewAttributeExtensionTest.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Twig; -use Oro\Bundle\WorkflowBundle\Twig\ViewAttributeExtension; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; +use Oro\Bundle\WorkflowBundle\Twig\ViewAttributeExtension; class ViewAttributeExtensionTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Validator/Constraints/TransitionIsAllowedValidatorTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Validator/Constraints/TransitionIsAllowedValidatorTest.php index 31b0d8e4848..260b8f08a25 100644 --- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Validator/Constraints/TransitionIsAllowedValidatorTest.php +++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Validator/Constraints/TransitionIsAllowedValidatorTest.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Tests\Unit\Validator\Constraints; +use Oro\Bundle\WorkflowBundle\Exception\InvalidTransitionException; use Oro\Bundle\WorkflowBundle\Model\WorkflowData; -use Oro\Bundle\WorkflowBundle\Validator\Constraints\TransitionIsAllowedValidator; use Oro\Bundle\WorkflowBundle\Validator\Constraints\TransitionIsAllowed; -use Oro\Bundle\WorkflowBundle\Exception\InvalidTransitionException; +use Oro\Bundle\WorkflowBundle\Validator\Constraints\TransitionIsAllowedValidator; class TransitionIsAllowedValidatorTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Oro/Bundle/WorkflowBundle/Twig/ViewAttributeExtension.php b/src/Oro/Bundle/WorkflowBundle/Twig/ViewAttributeExtension.php index 7807c9b9020..f6086df00ec 100644 --- a/src/Oro/Bundle/WorkflowBundle/Twig/ViewAttributeExtension.php +++ b/src/Oro/Bundle/WorkflowBundle/Twig/ViewAttributeExtension.php @@ -2,8 +2,8 @@ namespace Oro\Bundle\WorkflowBundle\Twig; -use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; +use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; class ViewAttributeExtension extends \Twig_Extension { diff --git a/src/Oro/Bundle/WorkflowBundle/Validator/Constraints/TransitionIsAllowed.php b/src/Oro/Bundle/WorkflowBundle/Validator/Constraints/TransitionIsAllowed.php index adcca65b76f..abe7089562c 100644 --- a/src/Oro/Bundle/WorkflowBundle/Validator/Constraints/TransitionIsAllowed.php +++ b/src/Oro/Bundle/WorkflowBundle/Validator/Constraints/TransitionIsAllowed.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\WorkflowBundle\Validator\Constraints; -use Symfony\Component\Validator\Constraint; - use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; +use Symfony\Component\Validator\Constraint; + class TransitionIsAllowed extends Constraint { /** diff --git a/src/Oro/Bundle/WorkflowBundle/Validator/Constraints/TransitionIsAllowedValidator.php b/src/Oro/Bundle/WorkflowBundle/Validator/Constraints/TransitionIsAllowedValidator.php index 1b61793ff12..eda1be4a4dd 100644 --- a/src/Oro/Bundle/WorkflowBundle/Validator/Constraints/TransitionIsAllowedValidator.php +++ b/src/Oro/Bundle/WorkflowBundle/Validator/Constraints/TransitionIsAllowedValidator.php @@ -2,15 +2,15 @@ namespace Oro\Bundle\WorkflowBundle\Validator\Constraints; -use Symfony\Component\Validator\Constraint; -use Symfony\Component\Validator\ConstraintValidator; - use Doctrine\Common\Collections\ArrayCollection; +use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; use Oro\Bundle\WorkflowBundle\Exception\InvalidTransitionException; -use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; + use Oro\Bundle\WorkflowBundle\Model\WorkflowData; use Oro\Bundle\WorkflowBundle\Model\WorkflowRegistry; +use Symfony\Component\Validator\Constraint; +use Symfony\Component\Validator\ConstraintValidator; class TransitionIsAllowedValidator extends ConstraintValidator {